Skip to content

fix(Video): show receiver settings for discovered streams #14993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bosism wants to merge 2 commits into
base: master
Choose a base branch
from
+50 −4
Open

fix(Video): show receiver settings for discovered streams #14993

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6804f8d
fix(Video): show receiver settings for discovered streams
Aug 30, 2026
ac0a7f7
fix(Video): simplify discovered stream visibility
Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/AppSettings/pages/Video.SettingsUI.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@
},
{
"setting": "videoSettings.disableWhenDisarmed",
"showWhen": "!autoStreamConfig && isStreamSource"
"showWhen": "isStreamSource"
},
{
"setting": "videoSettings.lowLatencyMode",
"showWhen": "!autoStreamConfig && isStreamSource && QGroundControl.settingsManager.videoSettings.lowLatencyMode.userVisible"
"showWhen": "isStreamSource && QGroundControl.settingsManager.videoSettings.lowLatencyMode.userVisible"
Comment thread
bosism marked this conversation as resolved.
Outdated
},
{
"setting": "videoSettings.rtpJitterLatencyMs",
"showWhen": "!autoStreamConfig && isStreamSource && rtpLatencyVisible && QGroundControl.settingsManager.videoSettings.rtpJitterLatencyMs.userVisible"
"showWhen": "isStreamSource && rtpLatencyVisible && QGroundControl.settingsManager.videoSettings.rtpJitterLatencyMs.userVisible"
Comment thread
bosism marked this conversation as resolved.
Outdated
},
{
"setting": "videoSettings.rtspAutoReconnect",
"showWhen": "!autoStreamConfig && isStreamSource"
"showWhen": "isStreamSource"
},
{
"setting": "videoSettings.forceCpuVideoPath",
Expand Down
46 changes: 46 additions & 0 deletions test/QmlUITests/TopLevelViewsTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,3 +289,49 @@ void TopLevelViewsTest::_testSettingsSearchExcludesHiddenSections()
searchField->setProperty("text", QString());
QTRY_VERIFY(findVisibleItem(_rootItem, QStringLiteral("settingsButton_Video"), 0));
}

void TopLevelViewsTest::_testDiscoveredCameraReceiverSettingsVisible()
{
#ifndef QGC_GST_STREAMING
QSKIP("GStreamer receiver settings are unavailable in this build");
#else
const auto restoreVideoSource = setVideoSourceWithRestore(VideoSettings::videoSourceRTSP);

Fact* const lowLatencyMode = SettingsManager::instance()->videoSettings()->lowLatencyMode();
const QVariant savedLowLatencyMode = lowLatencyMode->rawValue();
const auto restoreLowLatencyMode =
qScopeGuard([lowLatencyMode, savedLowLatencyMode] { lowLatencyMode->setRawValue(savedLowLatencyMode); });
lowLatencyMode->setRawValue(false);

startUI();
if (QTest::currentTestFailed())
return;

QVERIFY(clickToolSelectDropdownButton(QStringLiteral("toolbar_viewSettings")));
if (!_clickSettingsButton(QStringLiteral("Video"))) {
return;
}

QQuickItem* const videoPage = findVisibleItem(_rootItem, QStringLiteral("settingsPage_Video"));
QVERIFY(videoPage);
QVERIFY(videoPage->property("isStreamSource").toBool());

// autoStreamConfig mirrors the read-only VideoManager property. Override the
// page binding to isolate these UI visibility rules from camera transport.
QVERIFY(videoPage->setProperty("autoStreamConfig", true));
QTRY_VERIFY(videoPage->property("autoStreamConfig").toBool());
Comment thread
bosism marked this conversation as resolved.
Outdated

QQuickItem* const sourceGroup = findVisibleItem(_rootItem, QStringLiteral("settingsGroup_VideoSource"));
QVERIFY(sourceGroup);
QTRY_VERIFY(!sourceGroup->isEnabled());
QTRY_VERIFY(!findVisibleItem(_rootItem, QStringLiteral("settingsGroup_Connection"), 0));
QTRY_VERIFY(!findVisibleItem(_rootItem, QStringLiteral("settingsTextField_aspectRatio"), 0));

QTRY_VERIFY(findVisibleItem(_rootItem, QStringLiteral("settingsCheckBox_disableWhenDisarmed"), 0));
QTRY_VERIFY(findVisibleItem(_rootItem, QStringLiteral("settingsCheckBox_lowLatencyMode"), 0));
QTRY_VERIFY(findVisibleItem(_rootItem, QStringLiteral("settingsTextField_rtpJitterLatencyMs"), 0));
QTRY_VERIFY(findVisibleItem(_rootItem, QStringLiteral("settingsCheckBox_rtspAutoReconnect"), 0));

stopUI();
#endif
}
1 change: 1 addition & 0 deletions test/QmlUITests/TopLevelViewsTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ private slots:
void _testSettingsSectionCollapseToSingle();
void _testSettingsPageUnavailableFallback();
void _testSettingsSearchExcludesHiddenSections();
void _testDiscoveredCameraReceiverSettingsVisible();

private:
QQuickItem* _clickSettingsButton(const QString& pageName);
Expand Down
Loading