Commit 1ece58f8 authored by Andrew Voznytsa's avatar Andrew Voznytsa

Fix Taisync support

parent dc71f43f
...@@ -607,7 +607,7 @@ VideoManager::_updateVideoUri(const QString& uri) ...@@ -607,7 +607,7 @@ VideoManager::_updateVideoUri(const QString& uri)
#if defined(QGC_GST_TAISYNC_ENABLED) && (defined(__android__) || defined(__ios__)) #if defined(QGC_GST_TAISYNC_ENABLED) && (defined(__android__) || defined(__ios__))
//-- Taisync on iOS or Android sends a raw h.264 stream //-- Taisync on iOS or Android sends a raw h.264 stream
if (isTaisync()) { if (isTaisync()) {
uri = QString("tsusb://0.0.0.0:%1").arg(TAISYNC_VIDEO_UDP_PORT); return _updateVideoUri(QString("tsusb://0.0.0.0:%1").arg(TAISYNC_VIDEO_UDP_PORT));
} }
#endif #endif
if (uri == _videoUri) { if (uri == _videoUri) {
...@@ -626,8 +626,12 @@ VideoManager::_updateThermalVideoUri(const QString& uri) ...@@ -626,8 +626,12 @@ VideoManager::_updateThermalVideoUri(const QString& uri)
//-- Taisync on iOS or Android sends a raw h.264 stream //-- Taisync on iOS or Android sends a raw h.264 stream
if (isTaisync()) { if (isTaisync()) {
// FIXME: AV: TAISYNC_VIDEO_UDP_PORT is used by video stream, thermal stream should go via its own proxy // FIXME: AV: TAISYNC_VIDEO_UDP_PORT is used by video stream, thermal stream should go via its own proxy
_thermalVideoUri = QString("tsusb://0.0.0.0:%1").arg(TAISYNC_VIDEO_UDP_PORT); if (!_thermalVideoUri.isEmpty()) {
return; _thermalVideoUri.clear();
return true;
} else {
return false;
}
} }
#endif #endif
if (uri == _thermalVideoUri) { if (uri == _thermalVideoUri) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment