diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h
index 7e9793f..6395314 100644
--- a/src/multimedia/audio/qaudio.h
+++ b/src/multimedia/audio/qaudio.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;
diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h
index 92eee6f..fa781b8 100644
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -85,6 +85,16 @@ public:
ExposureBeach = 8,
ExposureLargeAperture = 9,
ExposureSmallAperture = 10,
+ ExposureAction = 11,
+ ExposureLandscape = 12,
+ ExposureNightPortrait = 13,
+ ExposureTheatre = 14,
+ ExposureSunset = 15,
+ ExposureSteadyPhoto = 16,
+ ExposureFireworks = 17,
+ ExposureParty = 18,
+ ExposureCandlelight = 19,
+ ExposureBarcode = 20,
ExposureModeVendor = 1000
};
diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index 0903bd3..11103fc 100644
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -54,7 +54,7 @@ class QCameraImageProcessingPrivate;
class Q_MULTIMEDIA_EXPORT QCameraImageProcessing : public QObject
{
Q_OBJECT
- Q_ENUMS(WhiteBalanceMode)
+ Q_ENUMS(WhiteBalanceMode ColorFilter)
public:
enum WhiteBalanceMode {
WhiteBalanceAuto = 0,
@@ -69,6 +69,19 @@ public:
WhiteBalanceVendor = 1000
};
+ enum ColorFilter {
+ ColorFilterNone,
+ ColorFilterGrayscale,
+ ColorFilterNegative,
+ ColorFilterSolarize,
+ ColorFilterSepia,
+ ColorFilterPosterize,
+ ColorFilterWhiteboard,
+ ColorFilterBlackboard,
+ ColorFilterAqua,
+ ColorFilterVendor = 1000
+ };
+
bool isAvailable() const;
WhiteBalanceMode whiteBalanceMode() const;
@@ -90,6 +103,10 @@ public:
qreal denoisingLevel() const;
void setDenoisingLevel(qreal value);
+ ColorFilter colorFilter() const;
+ void setColorFilter(ColorFilter filter);
+ bool isColorFilterSupported(ColorFilter filter) const;
+
private:
friend class QCamera;
friend class QCameraPrivate;
@@ -104,7 +121,9 @@ private:
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QCameraImageProcessing::WhiteBalanceMode)
+Q_DECLARE_METATYPE(QCameraImageProcessing::ColorFilter)
Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, WhiteBalanceMode)
+Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, ColorFilter)
#endif // QCAMERAIMAGEPROCESSING_H
diff --git a/src/multimedia/camera/qcamerainfo.h b/src/multimedia/camera/qcamerainfo.h
index f0508b3..557f584 100644
--- a/src/multimedia/camera/qcamerainfo.h
+++ b/src/multimedia/camera/qcamerainfo.h
@@ -53,7 +53,8 @@ public:
CaptureMode = 1,
ImageEncodingSettings = 2,
VideoEncodingSettings = 3,
- Viewfinder = 4
+ Viewfinder = 4,
+ ViewfinderSettings = 5
};
~QCameraControl();
diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h
index f3ee694..6f7ef46 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.h
+++ b/src/multimedia/controls/qcameraexposurecontrol.h
@@ -66,6 +66,7 @@ public:
BrightnessAdjustment,
SharpeningAdjustment,
DenoisingAdjustment,
+ ColorFilter,
ExtendedParameter = 1000
};
diff --git a/src/multimedia/controls/qcamerainfocontrol.h b/src/multimedia/controls/qcamerainfocontrol.h
index ff9c7e8..c9a564e 100644
--- a/src/multimedia/controls/qcamerainfocontrol.h
+++ b/src/multimedia/controls/qcamerainfocontrol.h
@@ -37,6 +37,7 @@
#define QCAMERAVIEWFINDERSETTINGSCONTROL_H
#include <QtMultimedia/qmediacontrol.h>
+#include <QtMultimedia/qcamera.h>
QT_BEGIN_NAMESPACE
@@ -69,6 +70,28 @@ protected:
#define QCameraViewfinderSettingsControl_iid "org.qt-project.qt.cameraviewfindersettingscontrol/5.0"
Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderSettingsControl, QCameraViewfinderSettingsControl_iid)
+
+// Required for QDoc workaround
+class QString;
+
+class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl2 : public QMediaControl
+{
+ Q_OBJECT
+public:
+ virtual ~QCameraViewfinderSettingsControl2();
+
+ virtual QList<QCameraViewfinderSettings> supportedViewfinderSettings() const = 0;
+
+ virtual QCameraViewfinderSettings viewfinderSettings() const = 0;
+ virtual void setViewfinderSettings(const QCameraViewfinderSettings &settings) = 0;
+
+protected:
+ QCameraViewfinderSettingsControl2(QObject *parent = 0);
+};
+
+#define QCameraViewfinderSettingsControl2_iid "org.qt-project.qt.cameraviewfindersettingscontrol2/5.5"
+Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderSettingsControl2, QCameraViewfinderSettingsControl2_iid)
+
QT_END_NAMESPACE
#endif // QCAMERAVIEWFINDERSETTINGSCONTROL_H
diff --git a/src/multimedia/controls/qcamerazoomcontrol.h b/src/multimedia/controls/qcamerazoomcontrol.h
index c465da3..07575a2 100644
--- a/src/multimedia/controls/qcamerazoomcontrol.h
+++ b/src/multimedia/controls/qcamerazoomcontrol.h
@@ -202,6 +202,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &))
Q_PRIVATE_SLOT(d_func(), void _q_updateMedia(const QMediaContent&))
Q_PRIVATE_SLOT(d_func(), void _q_playlistDestroyed())
+ Q_PRIVATE_SLOT(d_func(), void _q_handleMediaChanged(const QMediaContent&))
Q_PRIVATE_SLOT(d_func(), void _q_handlePlaylistLoaded())
Q_PRIVATE_SLOT(d_func(), void _q_handlePlaylistLoadFailed())
};
diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h
index 159e67d..1388ac1 100644
--- a/src/multimedia/playback/qmediaplaylist.h
+++ b/src/multimedia/playback/qmediaplaylist.h
@@ -107,6 +107,8 @@ public:
~QVideoFrame();
QVideoFrame &operator =(const QVideoFrame &other);
+ bool operator==(const QVideoFrame &other) const;
+ bool operator!=(const QVideoFrame &other) const;
bool isValid() const;
diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h
index f1475d6..5de594f 100644
--- a/src/multimedia/video/qvideoprobe.h
+++ b/src/multimedia/video/qvideoprobe.h
_______________________________________________
Development mailing list
[email protected]
http://lists.qt-project.org/mailman/listinfo/development
