mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-09-15 17:12:59 -04:00
guh
This commit is contained in:
Vendored
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
@@ -219,7 +219,7 @@ cat > /var/lib/roverd/video.env <<'ENV'
|
|||||||
# Managed by roverd; placeholder values will be overwritten at runtime.
|
# 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
|
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_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
|
VIDEO_BITRATE=2000000
|
||||||
AUDIO_ENABLE=0
|
AUDIO_ENABLE=0
|
||||||
AUDIO_DEVICE=hw:0,0
|
AUDIO_DEVICE=hw:0,0
|
||||||
|
|||||||
+1
-1
@@ -386,7 +386,7 @@ func derivePublishURL(serverURL, streamName string, port int) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func deriveReadURL(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) {
|
func deriveSRTURL(serverURL, streamName string, port int, mode string) (string, error) {
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ battery:
|
|||||||
maxWheelSpeed: 350
|
maxWheelSpeed: 350
|
||||||
media:
|
media:
|
||||||
publishUrl: srt://192.168.0.86:9000?streamid=#!::r=roomba-alpha,m=publish&latency=10&mode=caller&transtype=live&pkt_size=1316
|
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
|
publishPort: 9000
|
||||||
videoBitrate: 2000000
|
videoBitrate: 2000000
|
||||||
manage: true
|
manage: true
|
||||||
|
|||||||
@@ -73,8 +73,8 @@ function forcePublishStreamMode(rawUrl) {
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (/,m=read\b/.test(value)) {
|
if (/,m=[a-zA-Z]+\b/.test(value)) {
|
||||||
return value.replace(/,m=read\b/, ',m=publish');
|
return value.replace(/,m=[a-zA-Z]+\b/, ',m=publish');
|
||||||
}
|
}
|
||||||
|
|
||||||
// If streamid exists but mode is omitted, default it to publish.
|
// If streamid exists but mode is omitted, default it to publish.
|
||||||
|
|||||||
Reference in New Issue
Block a user