summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/camera/videosettings.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-03-05 12:54:30 +0100
committerLars Knoll <lars.knoll@qt.io>2021-03-18 12:17:57 +0000
commit3362cea38918f933f454a7b8db0c09b65fc4f1cb (patch)
tree3487d928642d2914b9145e46d9956162d8de2557 /examples/multimediawidgets/camera/videosettings.cpp
parent625ae91bddb9f920494ac80ccc1ebe9f54a1ec2a (diff)
Remove audio/video device settings from QMediaEncoder
Configure those through the capture session. Change-Id: Ic9d9e2fb3ce0446499e0c36ecd8c9dd412d1bcda Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera/videosettings.cpp')
-rw-r--r--examples/multimediawidgets/camera/videosettings.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
index 439fb774f..42f8ba65a 100644
--- a/examples/multimediawidgets/camera/videosettings.cpp
+++ b/examples/multimediawidgets/camera/videosettings.cpp
@@ -57,7 +57,9 @@
#include <QMediaEncoder>
#include <QMediaFormat>
#include <QAudioDeviceInfo>
+#include <QMediaCaptureSession>
#include <QCameraInfo>
+#include <QCamera>
VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent)
: QDialog(parent),
@@ -75,7 +77,7 @@ VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent)
}
//sample rate:
- const auto sampleRates = mediaRecorder->audioInput().supportedSampleRates();
+ const auto sampleRates = mediaRecorder->captureSession()->audioInput().supportedSampleRates();
ui->audioSampleRateBox->setRange(sampleRates.minimum, sampleRates.maximum);
//video codecs
@@ -88,7 +90,7 @@ VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent)
ui->videoResolutionBox->addItem(tr("Default"));
- auto supportedResolutions = mediaRecorder->videoInput().photoResolutions(); // ### Should use resolutions from video formats
+ auto supportedResolutions = mediaRecorder->captureSession()->camera()->cameraInfo().photoResolutions(); // ### Should use resolutions from video formats
for (const QSize &resolution : supportedResolutions) {
ui->videoResolutionBox->addItem(QString("%1x%2").arg(resolution.width()).arg(resolution.height()),
QVariant(resolution));