diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-06-30 14:22:58 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-07-08 15:16:25 +0200 |
commit | 1b479a78945070932acc11f5ded533586563943a (patch) | |
tree | f544029b8e179a05f05a9c14d07dbdfd0698f8bf /examples/multimedia | |
parent | b4e6892b64cce803d52f0e898e746bd9810501cc (diff) |
Rename QMediaCaptureSession::encoder to recorder
As the class is called QMediaRecorder this is required
for API consistency. Also cleaned up the front end code
and examples where they used encoder instead of recorder.
Cleanup of the backend will have to come in a separate change.
Change-Id: I6e63e607473e68f628b1f89ffa3edcbc5bf5c2c8
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples/multimedia')
6 files changed, 35 insertions, 35 deletions
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp index 813ec1212..3be305465 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.cpp +++ b/examples/multimedia/audiorecorder/audiorecorder.cpp @@ -72,8 +72,8 @@ AudioRecorder::AudioRecorder() { ui->setupUi(this); - m_audioEncoder = new QMediaRecorder(this); - m_captureSession.setEncoder(m_audioEncoder); + m_audioRecorder = new QMediaRecorder(this); + m_captureSession.setRecorder(m_audioRecorder); m_captureSession.setAudioInput(new QAudioInput(this)); // ### replace with a monitoring output once we have it. // m_probe = new QAudioProbe(this); @@ -124,14 +124,14 @@ AudioRecorder::AudioRecorder() ui->bitrateBox->addItem(QStringLiteral("96000"), QVariant(96000)); ui->bitrateBox->addItem(QStringLiteral("128000"), QVariant(128000)); - connect(m_audioEncoder, &QMediaRecorder::durationChanged, this, &AudioRecorder::updateProgress); - connect(m_audioEncoder, &QMediaRecorder::recorderStateChanged, this, &AudioRecorder::onStateChanged); - connect(m_audioEncoder, &QMediaRecorder::errorChanged, this, &AudioRecorder::displayErrorMessage); + connect(m_audioRecorder, &QMediaRecorder::durationChanged, this, &AudioRecorder::updateProgress); + connect(m_audioRecorder, &QMediaRecorder::recorderStateChanged, this, &AudioRecorder::onStateChanged); + connect(m_audioRecorder, &QMediaRecorder::errorChanged, this, &AudioRecorder::displayErrorMessage); } void AudioRecorder::updateProgress(qint64 duration) { - if (m_audioEncoder->error() != QMediaRecorder::NoError || duration < 2000) + if (m_audioRecorder->error() != QMediaRecorder::NoError || duration < 2000) return; ui->statusbar->showMessage(tr("Recorded %1 sec").arg(duration / 1000)); @@ -143,7 +143,7 @@ void AudioRecorder::onStateChanged(QMediaRecorder::RecorderState state) switch (state) { case QMediaRecorder::RecordingState: - statusMessage = tr("Recording to %1").arg(m_audioEncoder->actualLocation().toString()); + statusMessage = tr("Recording to %1").arg(m_audioRecorder->actualLocation().toString()); ui->recordButton->setText(tr("Stop")); ui->pauseButton->setText(tr("Pause")); break; @@ -161,8 +161,8 @@ void AudioRecorder::onStateChanged(QMediaRecorder::RecorderState state) break; } - ui->pauseButton->setEnabled(m_audioEncoder->recorderState() != QMediaRecorder::StoppedState); - if (m_audioEncoder->error() == QMediaRecorder::NoError) + ui->pauseButton->setEnabled(m_audioRecorder->recorderState() != QMediaRecorder::StoppedState); + if (m_audioRecorder->error() == QMediaRecorder::NoError) ui->statusbar->showMessage(statusMessage); } @@ -177,34 +177,34 @@ static QVariant boxValue(const QComboBox *box) void AudioRecorder::toggleRecord() { - if (m_audioEncoder->recorderState() == QMediaRecorder::StoppedState) { + if (m_audioRecorder->recorderState() == QMediaRecorder::StoppedState) { m_captureSession.audioInput()->setDevice(boxValue(ui->audioDeviceBox).value<QAudioDevice>()); 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() ? + m_audioRecorder->setMediaFormat(format); + m_audioRecorder->setAudioSampleRate(ui->sampleRateBox->value()); + m_audioRecorder->setAudioBitRate(boxValue(ui->bitrateBox).toInt()); + m_audioRecorder->setAudioChannelCount(boxValue(ui->channelsBox).toInt()); + m_audioRecorder->setQuality(QMediaRecorder::Quality(ui->qualitySlider->value())); + m_audioRecorder->setEncodingMode(ui->constantQualityRadioButton->isChecked() ? QMediaRecorder::ConstantQualityEncoding : QMediaRecorder::ConstantBitRateEncoding); - m_audioEncoder->record(); + m_audioRecorder->record(); } else { - m_audioEncoder->stop(); + m_audioRecorder->stop(); } } void AudioRecorder::togglePause() { - if (m_audioEncoder->recorderState() != QMediaRecorder::PausedState) - m_audioEncoder->pause(); + if (m_audioRecorder->recorderState() != QMediaRecorder::PausedState) + m_audioRecorder->pause(); else - m_audioEncoder->record(); + m_audioRecorder->record(); } void AudioRecorder::setOutputLocation() @@ -220,13 +220,13 @@ void AudioRecorder::setOutputLocation() #else QString fileName = QFileDialog::getSaveFileName(); #endif - m_audioEncoder->setOutputLocation(QUrl::fromLocalFile(fileName)); + m_audioRecorder->setOutputLocation(QUrl::fromLocalFile(fileName)); m_outputLocationSet = true; } void AudioRecorder::displayErrorMessage() { - ui->statusbar->showMessage(m_audioEncoder->errorString()); + ui->statusbar->showMessage(m_audioRecorder->errorString()); } void AudioRecorder::clearAudioLevels() diff --git a/examples/multimedia/audiorecorder/audiorecorder.h b/examples/multimedia/audiorecorder/audiorecorder.h index fae682c6f..97bd49688 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.h +++ b/examples/multimedia/audiorecorder/audiorecorder.h @@ -88,7 +88,7 @@ private: Ui::AudioRecorder *ui = nullptr; QMediaCaptureSession m_captureSession; - QMediaRecorder *m_audioEncoder = nullptr; + QMediaRecorder *m_audioRecorder = nullptr; QList<AudioLevel*> m_audioLevels; bool m_outputLocationSet = false; diff --git a/examples/multimedia/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml index 3fc787d30..fa1819f6e 100644 --- a/examples/multimedia/declarative-camera/VideoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml @@ -81,22 +81,22 @@ FocusScope { CameraButton { text: "Record" - visible: captureSession.encoder.status !== MediaEncoder.RecordingStatus - onClicked: captureSession.encoder.record() + visible: captureSession.recorder.status !== MediaRecorder.RecordingStatus + onClicked: captureSession.recorder.record() } CameraButton { id: stopButton text: "Stop" - visible: captureSession.encoder.status === MediaEncoder.RecordingStatus - onClicked: captureSession.encoder.stop() + visible: captureSession.recorder.status === MediaRecorder.RecordingStatus + onClicked: captureSession.recorder.stop() } CameraButton { text: "View" onClicked: captureControls.previewSelected() //don't show View button during recording - visible: captureSession.encoder.actualLocation && !stopButton.visible + visible: captureSession.recorder.actualLocation && !stopButton.visible } } diff --git a/examples/multimedia/declarative-camera/declarative-camera.qml b/examples/multimedia/declarative-camera/declarative-camera.qml index 2b4ae20ad..51efb2b5b 100644 --- a/examples/multimedia/declarative-camera/declarative-camera.qml +++ b/examples/multimedia/declarative-camera/declarative-camera.qml @@ -99,8 +99,8 @@ Rectangle { id: imageCapture } - encoder: MediaEncoder { - id: encoder + recorder: MediaRecorder { + id: recorder // resolution: "640x480" // frameRate: 30 } @@ -124,7 +124,7 @@ Rectangle { focus: visible //don't load recorded video if preview is invisible - source: visible ? encoder.actualLocation : "" + source: visible ? recorder.actualLocation : "" } VideoOutput { diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml index 3ee257ffa..26ffcc352 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml @@ -75,8 +75,8 @@ Item { id: imageCapture } - encoder: MediaEncoder { - id: encoder + recorder: MediaRecorder { + id: recorder // resolution: "640x480" // frameRate: 30 } diff --git a/examples/multimedia/video/recorder/main.qml b/examples/multimedia/video/recorder/main.qml index c9c58eaa2..13ef0cd84 100644 --- a/examples/multimedia/video/recorder/main.qml +++ b/examples/multimedia/video/recorder/main.qml @@ -73,7 +73,7 @@ Window { CaptureSession { id: captureSession - encoder: recorder + recorder: recorder audioInput: controls.audioInput camera: controls.camera videoOutput: playback.active ? null : videoOutput |