summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/camera/camera.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-03-05 12:15:59 +0100
committerLars Knoll <lars.knoll@qt.io>2021-03-17 09:27:36 +0000
commit625ae91bddb9f920494ac80ccc1ebe9f54a1ec2a (patch)
tree61db52ff51d7e0c7486ad48747ed59a3348da2cd /examples/multimediawidgets/camera/camera.h
parentc93b4b54c44ca28e34fe7e12cc2fb279f3e84b54 (diff)
Add a QMediaEncoder class
This class is currently a simply a rename of QMediaRecorder, but they will start to diverge in the next commits. QMediaRecorder is now an all-in-one class, that contains a QMediaCaptureSession and handles standard recording cases. QMediaEncoder will in the next couple of commits loose APIs that should be in other places in the capture pipeline. Change-Id: Ied1098092920610dac08e966078d44a22110bcf7 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera/camera.h')
-rw-r--r--examples/multimediawidgets/camera/camera.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index fe47acf75..c443fc195 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -53,7 +53,7 @@
#include <QCamera>
#include <QCameraImageCapture>
-#include <QMediaRecorder>
+#include <QMediaEncoder>
#include <QScopedPointer>
#include <QMediaMetaData>
#include <QMediaCaptureSession>
@@ -102,7 +102,7 @@ private slots:
void updateCameraActive(bool active);
void updateCaptureMode();
- void updateRecorderState(QMediaRecorder::State state);
+ void updateRecorderState(QMediaEncoder::State state);
void setExposureCompensation(int index);
void updateRecordTime();
@@ -132,7 +132,7 @@ private:
QMediaCaptureSession m_captureSession;
QScopedPointer<QCamera> m_camera;
QCameraImageCapture *m_imageCapture;
- QScopedPointer<QMediaRecorder> m_mediaRecorder;
+ QScopedPointer<QMediaEncoder> m_mediaEncoder;
QImageEncoderSettings m_imageSettings;
QMediaEncoderSettings m_encoderSettings;