Browse Source

VideoManager: support receiving the stream URI

With this change we support receiving the full URI for a UDP video
stream such as udp://127.0.0.1:5600. The previous case where only the
port number is sent as "URI" is still handled.
QGC4.4
Julian Oes 3 years ago committed by Don Gagne
parent
commit
a18746c2eb
  1. 6
      src/VideoManager/VideoManager.cc

6
src/VideoManager/VideoManager.cc

@ -640,7 +640,11 @@ VideoManager::_updateSettings(unsigned id) @@ -640,7 +640,11 @@ VideoManager::_updateSettings(unsigned id)
}
break;
case VIDEO_STREAM_TYPE_RTPUDP:
if ((settingsChanged |= _updateVideoUri(id, QStringLiteral("udp://0.0.0.0:%1").arg(pInfo->uri())))) {
if ((settingsChanged |= _updateVideoUri(
id,
pInfo->uri().contains("udp://")
? pInfo->uri() // Specced case
: QStringLiteral("udp://0.0.0.0:%1").arg(pInfo->uri())))) {
_toolbox->settingsManager()->videoSettings()->videoSource()->setRawValue(VideoSettings::videoSourceUDPH264);
}
break;

Loading…
Cancel
Save