From ee15cd4102d595ef7005ba043e21e780fd2f49a4 Mon Sep 17 00:00:00 2001 From: Marko Ollonen Date: Wed, 9 Jan 2013 17:03:12 +0200 Subject: [PATCH] add mutex for capture viewfinder request. Change-Id: Ica2ed9e3f0809933bf5be3e6ff28377546e2388e --- gst-libs/gst/camera/gstmfldcameracontroliface.c | 5 +++-- gst-libs/gst/camera/gstmfldcamerasrc.c | 2 ++ packaging/mfldv4l2camsrc.changes | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/camera/gstmfldcameracontroliface.c b/gst-libs/gst/camera/gstmfldcameracontroliface.c index 4130259..0a992e9 100644 --- a/gst-libs/gst/camera/gstmfldcameracontroliface.c +++ b/gst-libs/gst/camera/gstmfldcameracontroliface.c @@ -689,9 +689,10 @@ gst_camerasrc_camera_control_set_capture_command( GstCameraSrc* camerasrc, g_mutex_unlock (camerasrc->state_lock); } else { - // TODO check state_lock usage. + g_mutex_lock (camerasrc->state_lock); camerasrc->capture_mode = GST_CAMERA_SRC_CAPTURE_MODE_VIEWFINDER; - camerasrc->capture_counter = 0; + camerasrc->capture_counter = 1; bclass->set_capture_mode (camerasrc, camerasrc->capture_mode); + g_mutex_unlock (camerasrc->state_lock); } } diff --git a/gst-libs/gst/camera/gstmfldcamerasrc.c b/gst-libs/gst/camera/gstmfldcamerasrc.c index dcb1bb0..a97a476 100644 --- a/gst-libs/gst/camera/gstmfldcamerasrc.c +++ b/gst-libs/gst/camera/gstmfldcamerasrc.c @@ -1868,6 +1868,7 @@ start_over: NULL); GST_LOG_OBJECT (camerasrc, "CALL: capture callback"); + g_mutex_unlock (camerasrc->state_lock); g_signal_emit( G_OBJECT (camerasrc), gst_camerasrc_signals[SIGNAL_STILL_CAPTURE], 0, @@ -1875,6 +1876,7 @@ start_over: NULL, NULL ); GST_LOG_OBJECT (camerasrc, "RETURN: capture callback"); + g_mutex_lock (camerasrc->state_lock); if(--camerasrc->capture_counter > 0) { diff --git a/packaging/mfldv4l2camsrc.changes b/packaging/mfldv4l2camsrc.changes index 7bda35d..21c6c8e 100644 --- a/packaging/mfldv4l2camsrc.changes +++ b/packaging/mfldv4l2camsrc.changes @@ -1,3 +1,6 @@ +* Wed Jan 09 2013 Marko Ollonen submit/trunk/20130109.131903@db0f587 +- add mutex for capture viewfinder request, TZSP-4698. + * Wed Jan 09 2013 Timo Toikkanen submit/trunk/20130109.064257@a4488ba - AF status update fix TZSP-2985 -- 2.7.4