diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 09:21:35 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 09:21:35 +0200 |
commit | da35e256f5da8d93cef0ab1bed8ca3e8ccfe5a43 (patch) | |
tree | 6eafa4110806eb354f899cbd4fea2b826c9fdf2c /examples/multimediawidgets/camera/videosettings.cpp | |
parent | 3287ad8656b700f245834f09458bc1613beb9757 (diff) | |
parent | fde5d6f7cce6118cac4ce7b92cd056225737917f (diff) |
Merge remote-tracking branch 'origin/dev' into 6.2
Change-Id: I0f29cdfa94948a39a895a7678bcfe3a631d2d4ed
Diffstat (limited to 'examples/multimediawidgets/camera/videosettings.cpp')
-rw-r--r-- | examples/multimediawidgets/camera/videosettings.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp index aafd4b5f3..9bc0d0ea0 100644 --- a/examples/multimediawidgets/camera/videosettings.cpp +++ b/examples/multimediawidgets/camera/videosettings.cpp @@ -54,14 +54,15 @@ #include <QComboBox> #include <QSpinBox> #include <QDebug> -#include <QMediaEncoder> +#include <QMediaRecorder> #include <QMediaFormat> #include <QAudioDevice> #include <QMediaCaptureSession> #include <QCameraDevice> #include <QCamera> +#include <QAudioInput> -VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent) +VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) : QDialog(parent), ui(new Ui::VideoSettingsUi), mediaRecorder(mediaRecorder) @@ -77,8 +78,9 @@ VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent) } //sample rate: - ui->audioSampleRateBox->setRange(mediaRecorder->captureSession()->audioInput().minimumSampleRate(), - mediaRecorder->captureSession()->audioInput().maximumSampleRate()); + auto audioDevice = mediaRecorder->captureSession()->audioInput()->device(); + ui->audioSampleRateBox->setRange(audioDevice.minimumSampleRate(), + audioDevice.maximumSampleRate()); //video codecs ui->videoCodecBox->addItem(tr("Default video codec"), QVariant::fromValue(QMediaFormat::VideoCodec::Unspecified)); @@ -111,7 +113,7 @@ VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent) QVariant::fromValue(format)); } - ui->qualitySlider->setRange(0, int(QImageEncoderSettings::VeryHighQuality)); + ui->qualitySlider->setRange(0, int(QMediaEncoderSettings::VeryHighQuality)); } VideoSettings::~VideoSettings() |