summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/camera/dscamerasession.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/directshow/camera/dscamerasession.h')
-rw-r--r--src/plugins/directshow/camera/dscamerasession.h38
1 files changed, 18 insertions, 20 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.h b/src/plugins/directshow/camera/dscamerasession.h
index 433db8994..361a0220e 100644
--- a/src/plugins/directshow/camera/dscamerasession.h
+++ b/src/plugins/directshow/camera/dscamerasession.h
@@ -51,6 +51,7 @@
#include <QtMultimedia/qvideosurfaceformat.h>
#include <QtMultimedia/qcameraimageprocessingcontrol.h>
#include <QtMultimedia/qcameraimagecapture.h>
+#include <QtMultimedia/qmediaencodersettings.h>
#include <private/qmediastoragelocation_p.h>
#include <tchar.h>
@@ -84,7 +85,7 @@ class DSCameraSession : public QObject
Q_OBJECT
public:
DSCameraSession(QObject *parent = 0);
- ~DSCameraSession();
+ ~DSCameraSession() override;
QCamera::Status status() const { return m_status; }
@@ -129,6 +130,11 @@ public:
void addVideoProbe(DirectShowVideoProbeControl *probe);
void removeVideoProbe(DirectShowVideoProbeControl *probe);
+ QList<QSize> supportedResolutions(bool *continuous) const;
+ QImageEncoderSettings imageEncoderSettings() const { return m_imageEncoderSettings; }
+ void setImageEncoderSettings(const QImageEncoderSettings &settings)
+ { m_imageEncoderSettings = settings; }
+
Q_SIGNALS:
void statusChanged(QCamera::Status);
void imageExposed(int id);
@@ -145,25 +151,15 @@ private Q_SLOTS:
void updateReadyForCapture();
private:
- struct ImageProcessingParameterInfo {
- ImageProcessingParameterInfo()
- : minimumValue(0)
- , maximumValue(0)
- , defaultValue(0)
- , currentValue(0)
- , capsFlags(0)
- , hasBeenExplicitlySet(false)
- , videoProcAmpProperty(VideoProcAmp_Brightness)
- {
- }
-
- LONG minimumValue;
- LONG maximumValue;
- LONG defaultValue;
- LONG currentValue;
- LONG capsFlags;
- bool hasBeenExplicitlySet;
- VideoProcAmpProperty videoProcAmpProperty;
+ struct ImageProcessingParameterInfo
+ {
+ LONG minimumValue = 0;
+ LONG maximumValue = 0;
+ LONG defaultValue = 0;
+ LONG currentValue = 0;
+ LONG capsFlags = 0;
+ bool hasBeenExplicitlySet = false;
+ VideoProcAmpProperty videoProcAmpProperty = VideoProcAmp_Brightness;
};
void setStatus(QCamera::Status status);
@@ -227,6 +223,8 @@ private:
QMutex m_probeMutex;
DirectShowVideoProbeControl *m_videoProbeControl;
+ QImageEncoderSettings m_imageEncoderSettings;
+
// Internal state
QCamera::Status m_status;
QTimer m_deviceLostEventTimer;