onvif: Auto-create OBS Media Source from discovered RTSP stream

Builds on the previous WS-Discovery dialog patch: once the user picks
a camera, also offer to drop an FFmpeg-based Media Source into the
current scene pointing at the camera's RTSP stream.

The dialog grows a "Also create an OBS Media Source for this camera's
stream" checkbox (default checked) and a stream picker that lists every
RTSP URI returned by GetStreamUri so the user can choose Main vs Sub
before clicking "Use Selected Camera".

On accept, settings.cpp:
- Takes the URI from the picker (falls back to the first usable URI),
- Embeds the dialog's username/password as Basic auth into the URL so
  the source still works after the per-session token in the camera's
  reply expires,
- Creates an "ffmpeg_source" with restart_on_activate and hw_decode,
- Adds it to the currently active scene.

If the user unchecks the box, only the PTZ device is created. If
GetStreamUri came back empty (anonymous probe was rejected, or the
camera has no streamable profile), the Media Source step silently
no-ops.

Signed-off-by: Jonatã Bolzan Loss <jonata@jonata.org>

Author: jonata

data/locale/en-GB.ini

@@ -96,6 +96,7 @@ PTZ.ONVIF.Discovery.AuthFailed="Authentication failed. Check the username and pa
 PTZ.ONVIF.Discovery.ManualPrompt="Don't see your camera? Add manually:"
 PTZ.ONVIF.Discovery.ManualAdd="Add"
 PTZ.ONVIF.Discovery.ManualLabel="(manual)"
+PTZ.ONVIF.Discovery.CreateMediaSource="Also create an OBS Media Source for this camera's stream"
 PTZ.ONVIF.SpeedBoost="Speed Boost (multiplies normalized ONVIF velocity; spec max is 1.0)"
 PTZ.ONVIF.MediaProfile="Media Profile"
 PTZ.ONVIF.NoProfilesYet="(not loaded yet — apply and reopen)"

src/onvif-discovery.cpp

@@ -11,6 +11,8 @@
 
 #include <QCryptographicHash>
 #include <QDateTime>
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDialogButtonBox>
 #include <QFile>
 #include <QFormLayout>
@@ -682,6 +684,16 @@ OnvifDiscoveryDialog::OnvifDiscoveryDialog(QWidget *parent) : QDialog(parent)
 	connect(m_manualHostEdit, &QLineEdit::returnPressed, this, &OnvifDiscoveryDialog::onAddManualClicked);
 	connect(m_manualPortEdit, &QLineEdit::returnPressed, this, &OnvifDiscoveryDialog::onAddManualClicked);
 
+	auto *mediaSourceRow = new QHBoxLayout();
+	m_addMediaSourceCheck = new QCheckBox(obs_module_text("PTZ.ONVIF.Discovery.CreateMediaSource"), this);
+	m_addMediaSourceCheck->setChecked(true);
+	m_streamCombo = new QComboBox(this);
+	m_streamCombo->setEnabled(false);
+	m_streamCombo->setMinimumContentsLength(20);
+	mediaSourceRow->addWidget(m_addMediaSourceCheck);
+	mediaSourceRow->addWidget(m_streamCombo, 1);
+	layout->addLayout(mediaSourceRow);
+
 	auto *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
 	m_okButton = buttons->button(QDialogButtonBox::Ok);
 	m_okButton->setText(obs_module_text("PTZ.ONVIF.Discovery.UseCamera"));
@@ -769,6 +781,8 @@ void OnvifDiscoveryDialog::onSelectionChanged()
 		m_selected = OnvifCameraInfo();
 		m_streams.clear();
 		m_streamStatus.clear();
+		m_streamCombo->clear();
+		m_streamCombo->setEnabled(false);
 		m_detailView->clear();
 		return;
 	}
@@ -779,6 +793,8 @@ void OnvifDiscoveryDialog::onSelectionChanged()
 	m_okButton->setEnabled(true);
 	m_streams.clear();
 	m_streamStatus.clear();
+	m_streamCombo->clear();
+	m_streamCombo->setEnabled(false);
 	rebuildDetail();
 	maybeProbeStreams();
 }
@@ -811,6 +827,15 @@ void OnvifDiscoveryDialog::onStreamsReady(const QList<OnvifMediaProbe::StreamInf
 	m_streams = streams;
 	m_streamStatus.clear();
 	rebuildDetail();
+	/* Re-populate the stream picker so the user can choose Main vs Sub
+	 * for the auto-created Media Source. Falls back to disabled when no
+	 * streams are available. */
+	m_streamCombo->clear();
+	for (const auto &s : m_streams) {
+		QString label = s.profileName.isEmpty() ? s.profileToken : s.profileName;
+		m_streamCombo->addItem(label, s.uri);
+	}
+	m_streamCombo->setEnabled(m_streamCombo->count() > 0);
 }
 
 void OnvifDiscoveryDialog::onStreamProbeError(const QString &msg)
@@ -882,3 +907,22 @@ QString OnvifDiscoveryDialog::selectedPassword() const
 {
 	return m_passEdit ? m_passEdit->text() : QString();
 }
+
+QString OnvifDiscoveryDialog::selectedStreamUri() const
+{
+	if (m_streamCombo && m_streamCombo->currentIndex() >= 0) {
+		QString uri = m_streamCombo->currentData().toString();
+		if (!uri.isEmpty())
+			return uri;
+	}
+	for (const auto &s : m_streams) {
+		if (!s.uri.isEmpty())
+			return s.uri;
+	}
+	return QString();
+}
+
+bool OnvifDiscoveryDialog::createMediaSourceRequested() const
+{
+	return m_addMediaSourceCheck && m_addMediaSourceCheck->isChecked();
+}

src/onvif-discovery.hpp

@@ -17,6 +17,8 @@
 #include <QList>
 #include <QMetaType>
 
+class QCheckBox;
+class QComboBox;
 class QNetworkReply;
 class QTableWidget;
 class QLineEdit;
@@ -132,6 +134,12 @@ class OnvifDiscoveryDialog : public QDialog {
 	OnvifCameraInfo selectedCamera() const { return m_selected; }
 	QString selectedUsername() const;
 	QString selectedPassword() const;
+	/* Returns the first usable RTSP stream URI we fetched (empty if
+	 * streams weren't probed or all came back empty). */
+	QString selectedStreamUri() const;
+	/* True if the user wants us to also create an OBS Media Source from
+	 * the picked stream. */
+	bool createMediaSourceRequested() const;
 
 private slots:
 	void onRescanClicked();
@@ -160,6 +168,8 @@ private slots:
 	QLineEdit *m_manualHostEdit;
 	QLineEdit *m_manualPortEdit;
 	QPushButton *m_addManualButton;
+	QCheckBox *m_addMediaSourceCheck;
+	QComboBox *m_streamCombo;
 	QPlainTextEdit *m_detailView;
 	QList<OnvifCameraInfo> m_cameras;
 	OnvifCameraInfo m_selected;

src/ptz-onvif.cpp

@@ -333,8 +333,7 @@ void PTZOnvif::handleResponse(QString response)
 	 * GetStreamUri responses with `&channel=`/`&protocol=`). That's
 	 * invalid XML and Qt's QDomDocument rejects the whole document.
 	 * Replace any bare '&' not starting a known entity with '&'. */
-	static const QRegularExpression ampFix(
-		QStringLiteral("&(?!(?:amp|lt|gt|quot|apos|#[0-9]+|#x[0-9a-fA-F]+);)"));
+	static const QRegularExpression ampFix(QStringLiteral("&(?!(?:amp|lt|gt|quot|apos|#[0-9]+|#x[0-9a-fA-F]+);)"));
 	response.replace(ampFix, "&");
 
 	QDomDocument doc;
@@ -865,8 +864,8 @@ obs_properties_t *PTZOnvif::get_obs_properties()
 	obs_properties_add_float_slider(config, "speed_boost", obs_module_text("PTZ.ONVIF.SpeedBoost"), 0.1, 10.0,
 					0.01);
 	obs_property_t *prof = obs_properties_add_list(config, "profile_token",
-						       obs_module_text("PTZ.ONVIF.MediaProfile"),
-						       OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+						       obs_module_text("PTZ.ONVIF.MediaProfile"), OBS_COMBO_TYPE_LIST,
+						       OBS_COMBO_FORMAT_STRING);
 	if (m_mediaProfiles.isEmpty()) {
 		obs_property_list_add_string(prof, obs_module_text("PTZ.ONVIF.NoProfilesYet"), "");
 		obs_property_set_enabled(prof, false);

src/settings.cpp

@@ -429,6 +429,37 @@ void PTZSettings::on_addPTZ_clicked()
 			if (!p.isEmpty())
 				obs_data_set_string(cfg, "password", QT_TO_UTF8(p));
 			ptzDeviceList.make_device(cfg);
+
+			/* Optionally create an OBS Media Source from the
+			 * camera's first RTSP stream URI and drop it into
+			 * the current scene. Embeds Basic-auth credentials
+			 * into the URL so it survives token expiry. */
+			QString uri = dlg.selectedStreamUri();
+			if (dlg.createMediaSourceRequested() && !uri.isEmpty()) {
+				QUrl url(uri);
+				if (url.isValid() && !u.isEmpty()) {
+					url.setUserName(u);
+					if (!p.isEmpty())
+						url.setPassword(p);
+				}
+				QString sourceName = cam.name.isEmpty() ? QString("ONVIF %1").arg(cam.host) : cam.name;
+				OBSData settings = obs_data_create();
+				obs_data_release(settings);
+				obs_data_set_string(settings, "input", QT_TO_UTF8(url.toString()));
+				obs_data_set_bool(settings, "is_local_file", false);
+				obs_data_set_bool(settings, "restart_on_activate", true);
+				obs_data_set_bool(settings, "hw_decode", true);
+				obs_data_set_string(settings, "input_format", "");
+
+				OBSSourceAutoRelease source =
+					obs_source_create("ffmpeg_source", QT_TO_UTF8(sourceName), settings, nullptr);
+				if (source) {
+					OBSSourceAutoRelease sceneSrc = obs_frontend_get_current_scene();
+					obs_scene_t *scene = sceneSrc ? obs_scene_from_source(sceneSrc) : nullptr;
+					if (scene)
+						obs_scene_add(scene, source);
+				}
+			}
 		}
 	}
 #endif