[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
This commit is contained in:
Mohammed Hassan
2015-06-03 17:44:23 +03:00
committed by Martin Jones
parent 9a1e40c211
commit 4806e55411

View File

@@ -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;
}
}
}