From 4806e55411d408b98f44e26a12910bfffedf10a6 Mon Sep 17 00:00:00 2001 From: Mohammed Hassan Date: Wed, 3 Jun 2015 17:44:23 +0300 Subject: [PATCH] [qtmultimedia] MER: Disable exposure and white balance locks for now. Fixes JB#29490 They are unsupported and cause the search and lock status to always be set to unlocked We disable it now until we implement it later in droidcamsrc Conflicts: src/plugins/gstreamer/camerabin/camerabinlocks.cpp --- src/plugins/gstreamer/camerabin/camerabinlocks.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/gstreamer/camerabin/camerabinlocks.cpp b/src/plugins/gstreamer/camerabin/camerabinlocks.cpp index 2f44ec05..ed2d0811 100644 --- a/src/plugins/gstreamer/camerabin/camerabinlocks.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinlocks.cpp @@ -63,13 +63,13 @@ QCamera::LockTypes CameraBinLocks::supportedLocks() const #if GST_CHECK_VERSION(1, 2, 0) if (GstPhotography *photography = m_session->photography()) { - if (gst_photography_get_capabilities(photography) & GST_PHOTOGRAPHY_CAPS_WB_MODE) - locks |= QCamera::LockWhiteBalance; +// if (gst_photography_get_capabilities(photography) & GST_PHOTOGRAPHY_CAPS_WB_MODE) +// locks |= QCamera::LockWhiteBalance; if (GstElement *source = m_session->cameraSource()) { if (g_object_class_find_property( G_OBJECT_GET_CLASS(source), "exposure-mode")) { - locks |= QCamera::LockExposure; +// locks |= QCamera::LockExposure; } } }