summaryrefslogtreecommitdiffstats
path: root/examples/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'examples/multimedia')
-rw-r--r--examples/multimedia/audiorecorder/audiorecorder.cpp25
-rw-r--r--examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc22
-rw-r--r--examples/multimedia/declarative-camera/PhotoCaptureControls.qml2
-rw-r--r--examples/multimedia/declarative-camera/VideoCaptureControls.qml2
-rw-r--r--examples/multimedia/devices/main.cpp18
5 files changed, 35 insertions, 34 deletions
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index 4983fa97c..63efc4ba8 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -59,6 +59,7 @@
#include <QMediaRecorder>
#include <QStandardPaths>
#include <qmediadevices.h>
+#include <qmediaformat.h>
#include <qaudiodevice.h>
#include <qaudiobuffer.h>
#include <qaudioinput.h>
@@ -194,18 +195,18 @@ void AudioRecorder::toggleRecord()
if (m_audioEncoder->recorderState() == QMediaRecorder::StoppedState) {
m_captureSession.audioInput()->setDevice(boxValue(ui->audioDeviceBox).value<QAudioDevice>());
- QMediaEncoderSettings settings;
- settings.setFileFormat(boxValue(ui->containerBox).value<QMediaFormat::FileFormat>());
- settings.setAudioCodec(boxValue(ui->audioCodecBox).value<QMediaFormat::AudioCodec>());
- settings.setAudioSampleRate(ui->sampleRateBox->value());
- settings.setAudioBitRate(boxValue(ui->bitrateBox).toInt());
- settings.setAudioChannelCount(boxValue(ui->channelsBox).toInt());
- settings.setQuality(QMediaEncoderSettings::Quality(ui->qualitySlider->value()));
- settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
- QMediaEncoderSettings::ConstantQualityEncoding :
- QMediaEncoderSettings::ConstantBitRateEncoding);
-
- m_audioEncoder->setEncoderSettings(settings);
+ QMediaFormat format;
+ format.setFileFormat(boxValue(ui->containerBox).value<QMediaFormat::FileFormat>());
+ format.setAudioCodec(boxValue(ui->audioCodecBox).value<QMediaFormat::AudioCodec>());
+ m_audioEncoder->setMediaFormat(format);
+ m_audioEncoder->setAudioSampleRate(ui->sampleRateBox->value());
+ m_audioEncoder->setAudioBitRate(boxValue(ui->bitrateBox).toInt());
+ m_audioEncoder->setAudioChannelCount(boxValue(ui->channelsBox).toInt());
+ m_audioEncoder->setQuality(QMediaRecorder::Quality(ui->qualitySlider->value()));
+ m_audioEncoder->setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
+ QMediaRecorder::ConstantQualityEncoding :
+ QMediaRecorder::ConstantBitRateEncoding);
+
m_audioEncoder->record();
}
else {
diff --git a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
index d5d49e723..723f7742f 100644
--- a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
+++ b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
@@ -51,8 +51,8 @@
\l{QAudioRecorder::supportedContainers()}{supportedContainers()}, and
\l{QAudioRecorder::supportedAudioSampleRates()}{supportedAudioSampleRates()}
methods. The quality slider is setup from 0 (zero) to
- \l{QMediaEncoderSettings::VeryHighQuality} with a default value of
- \l{QMediaEncoderSettings::NormalQuality}, while the bitrates are hardcoded
+ \l{QMediaRecorder::VeryHighQuality} with a default value of
+ \l{QMediaRecorder::NormalQuality}, while the bitrates are hardcoded
into the list.
\section1 Recording Audio
@@ -79,18 +79,18 @@
\l{QMediaRecorder::record()}{record()} method.
\code
- QAudioEncoderSettings settings;
- settings.setCodec(boxValue(ui->audioCodecBox).toString());
- settings.setSampleRate(boxValue(ui->sampleRateBox).toInt());
- settings.setBitRate(boxValue(ui->bitrateBox).toInt());
- settings.setQuality(QMediaEncoderSettings::EncodingQuality(ui->qualitySlider->value()));
- settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
- QMediaEncoderSettings::ConstantQualityEncoding :
- QMediaEncoderSettings::ConstantBitRateEncoding);
+ QMediaFormat format;
+ format.setCodec(boxValue(ui->audioCodecBox).toString());
+ audioRecorder->setMediaFormat(format);
+ audioRecorder->setSampleRate(boxValue(ui->sampleRateBox).toInt());
+ audioRecorder->setBitRate(boxValue(ui->bitrateBox).toInt());
+ audioRecorder->setQuality(QMediaRecorder::EncodingQuality(ui->qualitySlider->value()));
+ audioRecorder->setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
+ QMediaRecorder::ConstantQualityEncoding :
+ QMediaRecorder::ConstantBitRateEncoding);
QString container = boxValue(ui->containerBox).toString();
- audioRecorder->setEncodingSettings(settings, QVideoEncoderSettings(), container);
audioRecorder->record();
\endcode
diff --git a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
index bfe539468..72a502684 100644
--- a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
+++ b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
@@ -137,7 +137,7 @@ FocusScope {
CameraListButton {
model: MediaDevices.videoInputs
- onValueChanged: captureSession.camera.cameraInfo = value
+ onValueChanged: captureSession.camera.cameraDevice = value
}
CameraButton {
diff --git a/examples/multimedia/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
index ac3cbe3e0..3fc787d30 100644
--- a/examples/multimedia/declarative-camera/VideoCaptureControls.qml
+++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
@@ -112,7 +112,7 @@ FocusScope {
CameraListButton {
model: MediaDevices.videoInputs
- onValueChanged: captureSession.camera.cameraInfo = value
+ onValueChanged: captureSession.camera.cameraDevice = value
}
CameraButton {
diff --git a/examples/multimedia/devices/main.cpp b/examples/multimedia/devices/main.cpp
index a9d1537d3..a07e7c468 100644
--- a/examples/multimedia/devices/main.cpp
+++ b/examples/multimedia/devices/main.cpp
@@ -119,18 +119,18 @@ void printAudioDeviceInfo(QTextStream &out, const QAudioDevice &deviceInfo)
out << Qt::endl;
}
-void printVideoDeviceInfo(QTextStream &out, const QCameraDevice &cameraInfo)
+void printVideoDeviceInfo(QTextStream &out, const QCameraDevice &cameraDevice)
{
- const auto isDefault = cameraInfo.isDefault() ? "Yes" : "No";
- const auto position = cameraInfo.position();
- const auto photoResolutions = cameraInfo.photoResolutions();
- const auto videoFormats = cameraInfo.videoFormats();
+ const auto isDefault = cameraDevice.isDefault() ? "Yes" : "No";
+ const auto position = cameraDevice.position();
+ const auto photoResolutions = cameraDevice.photoResolutions();
+ const auto videoFormats = cameraDevice.videoFormats();
out.setFieldWidth(30);
out.setFieldAlignment(QTextStream::AlignLeft);
- out << "Name: " << cameraInfo.description() << qSetFieldWidth(0) << Qt::endl;
+ out << "Name: " << cameraDevice.description() << qSetFieldWidth(0) << Qt::endl;
out.setFieldWidth(30);
- out << "Id: " << QString::fromLatin1(cameraInfo.id()) << qSetFieldWidth(0) << Qt::endl;
+ out << "Id: " << QString::fromLatin1(cameraDevice.id()) << qSetFieldWidth(0) << Qt::endl;
out.setFieldWidth(30);
out << "Default: " << isDefault << qSetFieldWidth(0) << Qt::endl;
out.setFieldWidth(30);
@@ -173,8 +173,8 @@ int main()
printAudioDeviceInfo(out, deviceInfo);
out << Qt::endl << "Video devices detected: " << Qt::endl;
- for (auto &cameraInfo: videoInputDevices)
- printVideoDeviceInfo(out, cameraInfo);
+ for (auto &cameraDevice : videoInputDevices)
+ printVideoDeviceInfo(out, cameraDevice);
return 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 07:04:55 +0000