New camera viewfinder settings API.

There already was a control interface for the viewfinder settings
but no real public C++ API and a partial QML API.

This patch adds a new C++ API and improves the QML API.

Supported viewfinder settings are resolution, minimumFrameRate,
maximumFrameRate and pixelFormat. The camera can be queried for
the supported values for each of these settings.

A new control interface was created to match the new API.

Change-Id: I289fea038fe46277a5516c956a64280da09ed985
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>

1 files changed, 18 insertions, 0 deletions

diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 9c6fc8f8a..0c5881a3e 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -47,6 +47,7 @@
 #include <QtMultimedia/qcameraexposure.h>
 #include <QtMultimedia/qcamerafocus.h>
 #include <QtMultimedia/qcameraimageprocessing.h>
+#include <QtMultimedia/qcameraviewfindersettings.h>
 
 #include <QtMultimedia/qmediaenumdebug.h>
 
@@ -76,6 +77,8 @@ class Q_MULTIMEDIA_EXPORT QCamera : public QMediaObject
     Q_ENUMS(LockType)
     Q_ENUMS(Position)
 public:
+    typedef QPair<qreal, qreal> FrameRateRange;
+
     enum Status {
         UnavailableStatus,
         UnloadedStatus,
@@ -169,6 +172,21 @@ public:
     void setViewfinder(QGraphicsVideoItem *viewfinder);
     void setViewfinder(QAbstractVideoSurface *surface);
 
+    QCameraViewfinderSettings viewfinderSettings() const;
+    void setViewfinderSettings(const QCameraViewfinderSettings &settings);
+
+    QList<QCameraViewfinderSettings> supportedViewfinderSettings(
+            const QCameraViewfinderSettings &settings = QCameraViewfinderSettings()) const;
+
+    QList<QSize> supportedViewfinderResolutions(
+            const QCameraViewfinderSettings &settings = QCameraViewfinderSettings()) const;
+
+    QList<FrameRateRange> supportedViewfinderFrameRateRanges(
+            const QCameraViewfinderSettings &settings = QCameraViewfinderSettings()) const;
+
+    QList<QVideoFrame::PixelFormat> supportedViewfinderPixelFormats(
+            const QCameraViewfinderSettings &settings = QCameraViewfinderSettings()) const;
+
     Error error() const;
     QString errorString() const;