summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer/camerabin/camerabinsession.h
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-02-05 16:37:58 +0100
committerYoann Lopes <yoann.lopes@theqtcompany.com>2015-02-18 13:15:45 +0000
commit178c0401685a56541995ca1ac9b5f6a4b543626d (patch)
tree701b9c4c0691930fcce98981e4d71194cdfc872c /src/plugins/gstreamer/camerabin/camerabinsession.h
parent656da3d4d60f21914e7f5ea004e8ec924f79ef03 (diff)
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 <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinsession.h')
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinsession.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.h b/src/plugins/gstreamer/camerabin/camerabinsession.h
index f957c55de..71590a7dc 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.h
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.h
@@ -179,6 +179,7 @@ public slots:
private slots:
void handleViewfinderChange();
+ void setupCaptureResolution();
private:
void load();
@@ -191,8 +192,8 @@ private:
void setError(int error, const QString &errorString);
bool setupCameraBin();
- void setupCaptureResolution();
void setAudioCaptureCaps();
+ GstCaps *supportedCaps(QCamera::CaptureModes mode) const;
void updateSupportedViewfinderSettings();
static void updateBusyStatus(GObject *o, GParamSpec *p, gpointer d);