slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[camerabin] Fixup work with v4l

Browse Source
This commit is contained in:
Chupligin Sergey
2020-07-17 11:41:47 +03:00
parent c819b90fa7
commit 33de714fdb
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/gstreamer/camerabin/camerabinsession.cpp
View File

@@ -458,6 +458,7 @@ void CameraBinSession::setAudioCaptureCaps()
GstElement *CameraBinSession::buildCameraSource() GstElement *CameraBinSession::buildCameraSource()
{ {
bool connectReadyForCapture = false;
#if CAMERABIN_DEBUG #if CAMERABIN_DEBUG
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
#endif #endif
@@ -525,6 +526,14 @@ GstElement *CameraBinSession::buildCameraSource()
if (m_videoSrc) if (m_videoSrc)
g_object_set(G_OBJECT(m_cameraSrc), "video-source", m_videoSrc, NULL); g_object_set(G_OBJECT(m_cameraSrc), "video-source", m_videoSrc, NULL);
// CameraBin doesn't emit ready-for-capture notify signal
// in the same manner that gst-droid does, thus making
// Qt report "Camera not ready error" due to changes in
// 46c29f5b and b04854b4. Workaround this by assuming that
// camera is ready.
m_reportedReadyForCapture = true;
m_readyForCapture = true;
} }
if (m_videoSrc) if (m_videoSrc)
@@ -536,12 +545,21 @@ GstElement *CameraBinSession::buildCameraSource()
} else { } else {
g_object_set(G_OBJECT(m_cameraSrc), "camera-device", 0, NULL); g_object_set(G_OBJECT(m_cameraSrc), "camera-device", 0, NULL);
} }
// Explicitly reset those values in case of
// camera changing from v4l to this
m_reportedReadyForCapture = false;
m_readyForCapture = false;
connectReadyForCapture = true;
} }
} }
if (m_cameraSrc != camSrc) { if (m_cameraSrc != camSrc) {
g_object_set(G_OBJECT(m_camerabin), CAMERA_SOURCE_PROPERTY, m_cameraSrc, NULL); g_object_set(G_OBJECT(m_camerabin), CAMERA_SOURCE_PROPERTY, m_cameraSrc, NULL);
if (connectReadyForCapture) {
g_signal_connect(G_OBJECT(m_cameraSrc), "notify::ready-for-capture", G_CALLBACK(updateReadyForCapture), this); g_signal_connect(G_OBJECT(m_cameraSrc), "notify::ready-for-capture", G_CALLBACK(updateReadyForCapture), this);
}
} }