diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2017-12-04 15:42:16 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2017-12-05 11:25:29 +0000 |
| commit | f089c870c73999b767400fcb8c315e678b38bf2e (patch) | |
| tree | 6f73d46cf73cb3e54a7de9ea9d0764a0ab8b06cf | |
| parent | 45deae83fdb245bfb94cc5b880f1740d3bf33b30 (diff) | |
| download | qtmultimedia-f089c870c73999b767400fcb8c315e678b38bf2e.tar.gz | |
GStreamer: Emit an error if no input device provided for QCamera
Prevents building a camera source if no input device name is provided.
And emit an error immediately.
Task-number: QTBUG-64155
Change-Id: I509bee1df0acb372d26f45fd27057f8b7e141c2a
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index 4941c6ef6..823cfe408 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -466,6 +466,9 @@ GstElement *CameraBinSession::buildCameraSource() #if CAMERABIN_DEBUG qDebug() << Q_FUNC_INFO; #endif + if (m_inputDevice.isEmpty()) + return nullptr; + if (!m_inputDeviceHasChanged) return m_cameraSrc; @@ -482,7 +485,7 @@ GstElement *CameraBinSession::buildCameraSource() if (!m_cameraSrc) m_cameraSrc = camSrc; - if (m_cameraSrc && !m_inputDevice.isEmpty()) { + if (m_cameraSrc) { #if CAMERABIN_DEBUG qDebug() << "set camera device" << m_inputDevice; #endif |