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

Merge branch 'jb45747' into 'mer-5.6'

Browse Source 
[camera] Emit imageExposed signal at the right time. JB#45747

See merge request mer-core/qtmultimedia!25
This commit is contained in:
Matti Lehtimäki
2019-05-10 20:01:10 +00:00
parent 4e11de452b 35cc837acf
commit 0e267b073f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -960,11 +960,6 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
gst_buffer_unref(buffer); gst_buffer_unref(buffer);
#endif #endif
if (!image.isNull()) { if (!image.isNull()) {
static QMetaMethod exposedSignal = QMetaMethod::fromSignal(&CameraBinSession::imageExposed);
exposedSignal.invoke(this,
Qt::QueuedConnection,
Q_ARG(int,m_requestId));
static QMetaMethod capturedSignal = QMetaMethod::fromSignal(&CameraBinSession::imageCaptured); static QMetaMethod capturedSignal = QMetaMethod::fromSignal(&CameraBinSession::imageCaptured);
capturedSignal.invoke(this, capturedSignal.invoke(this,
Qt::QueuedConnection, Qt::QueuedConnection,
@@ -987,6 +982,15 @@ bool CameraBinSession::processBusMessage(const QGstreamerMessage &message)
GstMessage* gm = message.rawMessage(); GstMessage* gm = message.rawMessage();
if (gm) { if (gm) {
if (GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ELEMENT &&
gst_structure_has_name(gst_message_get_structure(gm), "photo-capture-start")) {
static QMetaMethod exposedSignal =
QMetaMethod::fromSignal(&CameraBinSession::imageExposed);
exposedSignal.invoke(this,
Qt::QueuedConnection,
Q_ARG(int,m_requestId));
}
if (GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ERROR) { if (GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ERROR) {
GError *err; GError *err;
gchar *debug; gchar *debug;