From 178c0401685a56541995ca1ac9b5f6a4b543626d Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 5 Feb 2015 16:37:58 +0100 Subject: GStreamer: some improvements with the camerabin's capture settings. - Don't pretend we support changing the image or video capture settings while the camera is active. The pipeline needs to be restarted in order to renegotiate caps. - Improved retrieving the supported capture resolutions and frame rates when using wrappercamerabinsrc. We now always get the supported values directly from the video source. Change-Id: I107193288e370af105a25d16568a8f5a76022ada Reviewed-by: Christian Stromme --- src/plugins/gstreamer/camerabin/camerabincontrol.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/plugins/gstreamer/camerabin/camerabincontrol.cpp') diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp index 8d1f9fd42..bc60d3a58 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp +++ b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp @@ -249,16 +249,14 @@ bool CameraBinControl::canChangeProperty(PropertyChangeType changeType, QCamera: Q_UNUSED(status); switch (changeType) { + case QCameraControl::Viewfinder: + return true; case QCameraControl::CaptureMode: - return status != QCamera::ActiveStatus; - break; case QCameraControl::ImageEncodingSettings: case QCameraControl::VideoEncodingSettings: - case QCameraControl::Viewfinder: - return true; case QCameraControl::ViewfinderSettings: default: - return false; + return status != QCamera::ActiveStatus; } } -- cgit v1.2.3