diff --git a/dist/hornverifier b/dist/hornverifier index a3df4331..8a3fabbc 100755 Binary files a/dist/hornverifier and b/dist/hornverifier differ diff --git a/dist/roverd b/dist/roverd index 01ed5326..d144e8e5 100755 Binary files a/dist/roverd and b/dist/roverd differ diff --git a/dist/servoverifier b/dist/servoverifier index cd2d0960..0848fea0 100755 Binary files a/dist/servoverifier and b/dist/servoverifier differ diff --git a/pi/install_roverd.sh b/pi/install_roverd.sh index f293ab56..9e0b6b5f 100755 --- a/pi/install_roverd.sh +++ b/pi/install_roverd.sh @@ -219,7 +219,7 @@ cat > /var/lib/roverd/video.env <<'ENV' # Managed by roverd; placeholder values will be overwritten at runtime. PUBLISH_URL=srt://192.168.0.86:9000?streamid=#!::r=CHANGE_ME,m=publish&latency=10&mode=caller&transtype=live&pkt_size=1316 AUDIO_PUBLISH_URL=srt://192.168.0.86:9000?streamid=#!::r=CHANGE_ME-audio,m=publish&latency=10&mode=caller&transtype=live&pkt_size=1316 -AUDIO_FORWARD_URL=srt://192.168.0.86:9000?streamid=#!::r=CHANGE_ME-fwd,m=read&latency=10&mode=caller&transtype=live&pkt_size=1316 +AUDIO_FORWARD_URL=srt://192.168.0.86:9000?streamid=#!::r=CHANGE_ME-fwd,m=request&latency=10&mode=caller&transtype=live&pkt_size=1316 VIDEO_BITRATE=2000000 AUDIO_ENABLE=0 AUDIO_DEVICE=hw:0,0 diff --git a/pi/roverd/config.go b/pi/roverd/config.go index 23181434..bbf44564 100644 --- a/pi/roverd/config.go +++ b/pi/roverd/config.go @@ -386,7 +386,7 @@ func derivePublishURL(serverURL, streamName string, port int) (string, error) { } func deriveReadURL(serverURL, streamName string, port int) (string, error) { - return deriveSRTURL(serverURL, streamName, port, "read") + return deriveSRTURL(serverURL, streamName, port, "request") } func deriveSRTURL(serverURL, streamName string, port int, mode string) (string, error) { diff --git a/pi/roverd/roverd.sample.yaml b/pi/roverd/roverd.sample.yaml index dbb7f7ab..439f733d 100644 --- a/pi/roverd/roverd.sample.yaml +++ b/pi/roverd/roverd.sample.yaml @@ -16,7 +16,7 @@ battery: maxWheelSpeed: 350 media: publishUrl: srt://192.168.0.86:9000?streamid=#!::r=roomba-alpha,m=publish&latency=10&mode=caller&transtype=live&pkt_size=1316 - audioForwardUrl: srt://192.168.0.86:9000?streamid=#!::r=roomba-alpha-fwd,m=read&latency=10&mode=caller&transtype=live&pkt_size=1316 + audioForwardUrl: srt://192.168.0.86:9000?streamid=#!::r=roomba-alpha-fwd,m=request&latency=10&mode=caller&transtype=live&pkt_size=1316 publishPort: 9000 videoBitrate: 2000000 manage: true diff --git a/server/src/services/audioForwardService.js b/server/src/services/audioForwardService.js index 172ab904..835ca107 100644 --- a/server/src/services/audioForwardService.js +++ b/server/src/services/audioForwardService.js @@ -73,8 +73,8 @@ function forcePublishStreamMode(rawUrl) { return value; } - if (/,m=read\b/.test(value)) { - return value.replace(/,m=read\b/, ',m=publish'); + if (/,m=[a-zA-Z]+\b/.test(value)) { + return value.replace(/,m=[a-zA-Z]+\b/, ',m=publish'); } // If streamid exists but mode is omitted, default it to publish.