diff options
61 files changed, 536 insertions, 542 deletions
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp index 9286cf987..4983fa97c 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.cpp +++ b/examples/multimedia/audiorecorder/audiorecorder.cpp @@ -53,10 +53,10 @@ #include "ui_audiorecorder.h" -#include <QMediaEncoder> +#include <QMediaRecorder> #include <QDir> #include <QFileDialog> -#include <QMediaEncoder> +#include <QMediaRecorder> #include <QStandardPaths> #include <qmediadevices.h> #include <qaudiodevice.h> @@ -71,7 +71,7 @@ AudioRecorder::AudioRecorder() { ui->setupUi(this); - m_audioEncoder = new QMediaEncoder(this); + m_audioEncoder = new QMediaRecorder(this); m_captureSession.setEncoder(m_audioEncoder); m_captureSession.setAudioInput(new QAudioInput(this)); // ### replace with a monitoring output once we have it. @@ -123,61 +123,61 @@ AudioRecorder::AudioRecorder() ui->bitrateBox->addItem(QStringLiteral("96000"), QVariant(96000)); ui->bitrateBox->addItem(QStringLiteral("128000"), QVariant(128000)); - connect(m_audioEncoder, &QMediaEncoder::durationChanged, this, &AudioRecorder::updateProgress); - connect(m_audioEncoder, &QMediaEncoder::statusChanged, this, &AudioRecorder::updateStatus); - connect(m_audioEncoder, &QMediaEncoder::recorderStateChanged, this, &AudioRecorder::onStateChanged); - connect(m_audioEncoder, &QMediaEncoder::errorChanged, this, &AudioRecorder::displayErrorMessage); + connect(m_audioEncoder, &QMediaRecorder::durationChanged, this, &AudioRecorder::updateProgress); + connect(m_audioEncoder, &QMediaRecorder::statusChanged, this, &AudioRecorder::updateStatus); + connect(m_audioEncoder, &QMediaRecorder::recorderStateChanged, this, &AudioRecorder::onStateChanged); + connect(m_audioEncoder, &QMediaRecorder::errorChanged, this, &AudioRecorder::displayErrorMessage); } void AudioRecorder::updateProgress(qint64 duration) { - if (m_audioEncoder->error() != QMediaEncoder::NoError || duration < 2000) + if (m_audioEncoder->error() != QMediaRecorder::NoError || duration < 2000) return; ui->statusbar->showMessage(tr("Recorded %1 sec").arg(duration / 1000)); } -void AudioRecorder::updateStatus(QMediaEncoder::Status status) +void AudioRecorder::updateStatus(QMediaRecorder::Status status) { QString statusMessage; switch (status) { - case QMediaEncoder::RecordingStatus: + case QMediaRecorder::RecordingStatus: statusMessage = tr("Recording to %1").arg(m_audioEncoder->actualLocation().toString()); break; - case QMediaEncoder::PausedStatus: + case QMediaRecorder::PausedStatus: clearAudioLevels(); statusMessage = tr("Paused"); break; - case QMediaEncoder::StoppedStatus: + case QMediaRecorder::StoppedStatus: clearAudioLevels(); statusMessage = tr("Stopped"); default: break; } - if (m_audioEncoder->error() == QMediaEncoder::NoError) + if (m_audioEncoder->error() == QMediaRecorder::NoError) ui->statusbar->showMessage(statusMessage); } -void AudioRecorder::onStateChanged(QMediaEncoder::RecorderState state) +void AudioRecorder::onStateChanged(QMediaRecorder::RecorderState state) { switch (state) { - case QMediaEncoder::RecordingState: + case QMediaRecorder::RecordingState: ui->recordButton->setText(tr("Stop")); ui->pauseButton->setText(tr("Pause")); break; - case QMediaEncoder::PausedState: + case QMediaRecorder::PausedState: ui->recordButton->setText(tr("Stop")); ui->pauseButton->setText(tr("Resume")); break; - case QMediaEncoder::StoppedState: + case QMediaRecorder::StoppedState: ui->recordButton->setText(tr("Record")); ui->pauseButton->setText(tr("Pause")); break; } - ui->pauseButton->setEnabled(m_audioEncoder->recorderState() != QMediaEncoder::StoppedState); + ui->pauseButton->setEnabled(m_audioEncoder->recorderState() != QMediaRecorder::StoppedState); } static QVariant boxValue(const QComboBox *box) @@ -191,7 +191,7 @@ static QVariant boxValue(const QComboBox *box) void AudioRecorder::toggleRecord() { - if (m_audioEncoder->recorderState() == QMediaEncoder::StoppedState) { + if (m_audioEncoder->recorderState() == QMediaRecorder::StoppedState) { m_captureSession.audioInput()->setDevice(boxValue(ui->audioDeviceBox).value<QAudioDevice>()); QMediaEncoderSettings settings; @@ -215,7 +215,7 @@ void AudioRecorder::toggleRecord() void AudioRecorder::togglePause() { - if (m_audioEncoder->recorderState() != QMediaEncoder::PausedState) + if (m_audioEncoder->recorderState() != QMediaRecorder::PausedState) m_audioEncoder->pause(); else m_audioEncoder->record(); diff --git a/examples/multimedia/audiorecorder/audiorecorder.h b/examples/multimedia/audiorecorder/audiorecorder.h index 61cbd17f5..55dd37a8d 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.h +++ b/examples/multimedia/audiorecorder/audiorecorder.h @@ -52,7 +52,7 @@ #define AUDIORECORDER_H #include <QMainWindow> -#include <QMediaEncoder> +#include <QMediaRecorder> #include <QMediaCaptureSession> #include <QUrl> @@ -78,8 +78,8 @@ private slots: void togglePause(); void toggleRecord(); - void updateStatus(QMediaEncoder::Status); - void onStateChanged(QMediaEncoder::RecorderState); + void updateStatus(QMediaRecorder::Status); + void onStateChanged(QMediaRecorder::RecorderState); void updateProgress(qint64 pos); void displayErrorMessage(); @@ -89,7 +89,7 @@ private: Ui::AudioRecorder *ui = nullptr; QMediaCaptureSession m_captureSession; - QMediaEncoder *m_audioEncoder = nullptr; + QMediaRecorder *m_audioEncoder = nullptr; QList<AudioLevel*> m_audioLevels; bool m_outputLocationSet = false; diff --git a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc index 2ec189c42..d5d49e723 100644 --- a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc +++ b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc @@ -64,11 +64,11 @@ \endcode And setup the lists as described above. The text on the record and pause - buttons are toggled depending on the \l{QMediaEncoder::RecorderState}{state} of + buttons are toggled depending on the \l{QMediaRecorder::RecorderState}{state} of the \c audioRecorder object. This means that if the state is - \l{QMediaEncoder::StoppedState} then the button text will be "Record" and - "Pause". In \l{QMediaEncoder::RecordingState} the record button will have - the text "Stop", and in \l{QMediaEncoder::PausedState} the pause button + \l{QMediaRecorder::StoppedState} then the button text will be "Record" and + "Pause". In \l{QMediaRecorder::RecordingState} the record button will have + the text "Stop", and in \l{QMediaRecorder::PausedState} the pause button will have the text "Resume". Pressing the buttons will also result in a toggle based on the state. If @@ -76,7 +76,7 @@ \l{QAudioEncoderSettings} based on the values of the selection lists, will set the encoding settings and container on the \c audioRecorder object, and start recording using the - \l{QMediaEncoder::record()}{record()} method. + \l{QMediaRecorder::record()}{record()} method. \code QAudioEncoderSettings settings; @@ -95,7 +95,7 @@ \endcode While recording, the status bar of the application is updated with duration information - from the \l{QMediaEncoder::durationChanged()}{durationChanged} signal from the + from the \l{QMediaRecorder::durationChanged()}{durationChanged} signal from the \c audioRecorder object. \code diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp index 796f37f42..f45971e9f 100644 --- a/examples/multimediawidgets/camera/camera.cpp +++ b/examples/multimediawidgets/camera/camera.cpp @@ -54,7 +54,7 @@ #include "imagesettings.h" #include "metadatadialog.h" -#include <QMediaEncoder> +#include <QMediaRecorder> #include <QVideoWidget> #include <QCameraDevice> #include <QMediaMetaData> @@ -101,15 +101,15 @@ void Camera::setCamera(const QCameraDevice &cameraInfo) connect(m_camera.data(), &QCamera::activeChanged, this, &Camera::updateCameraActive); connect(m_camera.data(), &QCamera::errorOccurred, this, &Camera::displayCameraError); - m_mediaEncoder.reset(new QMediaEncoder); + m_mediaEncoder.reset(new QMediaRecorder); m_captureSession.setEncoder(m_mediaEncoder.data()); - connect(m_mediaEncoder.data(), &QMediaEncoder::recorderStateChanged, this, &Camera::updateRecorderState); + connect(m_mediaEncoder.data(), &QMediaRecorder::recorderStateChanged, this, &Camera::updateRecorderState); m_imageCapture = new QCameraImageCapture; m_captureSession.setImageCapture(m_imageCapture); - connect(m_mediaEncoder.data(), &QMediaEncoder::durationChanged, this, &Camera::updateRecordTime); - connect(m_mediaEncoder.data(), &QMediaEncoder::errorChanged, this, &Camera::displayRecorderError); + connect(m_mediaEncoder.data(), &QMediaRecorder::durationChanged, this, &Camera::updateRecordTime); + connect(m_mediaEncoder.data(), &QMediaRecorder::errorChanged, this, &Camera::displayRecorderError); connect(ui->exposureCompensation, &QAbstractSlider::valueChanged, this, &Camera::setExposureCompensation); @@ -142,7 +142,7 @@ void Camera::keyPressEvent(QKeyEvent * event) if (m_doImageCapture) { takeImage(); } else { - if (m_mediaEncoder->recorderState() == QMediaEncoder::RecordingState) + if (m_mediaEncoder->recorderState() == QMediaRecorder::RecordingState) stop(); else record(); @@ -277,22 +277,22 @@ void Camera::updateCameraActive(bool active) } } -void Camera::updateRecorderState(QMediaEncoder::RecorderState state) +void Camera::updateRecorderState(QMediaRecorder::RecorderState state) { switch (state) { - case QMediaEncoder::StoppedState: + case QMediaRecorder::StoppedState: ui->recordButton->setEnabled(true); ui->pauseButton->setEnabled(true); ui->stopButton->setEnabled(false); ui->metaDataButton->setEnabled(true); break; - case QMediaEncoder::PausedState: + case QMediaRecorder::PausedState: ui->recordButton->setEnabled(true); ui->pauseButton->setEnabled(false); ui->stopButton->setEnabled(true); ui->metaDataButton->setEnabled(false); break; - case QMediaEncoder::RecordingState: + case QMediaRecorder::RecordingState: ui->recordButton->setEnabled(false); ui->pauseButton->setEnabled(true); ui->stopButton->setEnabled(true); @@ -308,7 +308,7 @@ void Camera::setExposureCompensation(int index) void Camera::displayRecorderError() { - if (m_mediaEncoder->error() != QMediaEncoder::NoError) + if (m_mediaEncoder->error() != QMediaRecorder::NoError) QMessageBox::warning(this, tr("Capture Error"), m_mediaEncoder->errorString()); } diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h index 48ea876d9..6a55f42b3 100644 --- a/examples/multimediawidgets/camera/camera.h +++ b/examples/multimediawidgets/camera/camera.h @@ -53,7 +53,7 @@ #include <QCamera> #include <QCameraImageCapture> -#include <QMediaEncoder> +#include <QMediaRecorder> #include <QScopedPointer> #include <QMediaMetaData> #include <QMediaCaptureSession> @@ -104,7 +104,7 @@ private slots: void updateCameraActive(bool active); void updateCaptureMode(); - void updateRecorderState(QMediaEncoder::RecorderState state); + void updateRecorderState(QMediaRecorder::RecorderState state); void setExposureCompensation(int index); void updateRecordTime(); @@ -136,7 +136,7 @@ private: QScopedPointer<QCamera> m_camera; QScopedPointer<QAudioInput> m_audioInput; QCameraImageCapture *m_imageCapture; - QScopedPointer<QMediaEncoder> m_mediaEncoder; + QScopedPointer<QMediaRecorder> m_mediaEncoder; QMediaEncoderSettings m_encoderSettings; bool m_isCapturingImage = false; diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc index 8792674b8..68e19aac3 100644 --- a/examples/multimediawidgets/camera/doc/src/camera.qdoc +++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc @@ -49,7 +49,7 @@ settings. The Camera class contains an instance of \l {QCamera}, the API class interface to the hardware. It also has an instance of \l {QCameraImageCapture} to take still images -and an instance of \l {QMediaEncoder} to record video. It also contains the user +and an instance of \l {QMediaRecorder} to record video. It also contains the user interface object. The Camera constructor does some basic initialization. The camera object is @@ -59,7 +59,7 @@ the \e{setCamera()} function is called, passing in a \l {QByteArray}. \e{setCamera()} sets up various connections between the user interface and the functionality of the Camera class using signals and slots. It also instantiates and initializes the \l {QCamera}, -\l {QCameraImageCapture} and \l {QMediaEncoder} objects mentioned above. The still +\l {QCameraImageCapture} and \l {QMediaRecorder} objects mentioned above. The still and video recording visual tabs are enabled and finally the \l {QCamera::start()}{start()} function of the \l{QCamera} object is called. @@ -72,7 +72,7 @@ is QCamera::CaptureStillImage, or if the capture mode is for video then one of two actions will occur. If the recording state shows that we are currently recording then the \e{stop()} function is called resulting in a call to \l {QCamera::stop()}, whereas if we are not recording then a video recording -is started with a call to \l {QMediaEncoder::record()}. +is started with a call to \l {QMediaRecorder::record()}. \image camera-example.png diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp index cb17fda57..9bc0d0ea0 100644 --- a/examples/multimediawidgets/camera/videosettings.cpp +++ b/examples/multimediawidgets/camera/videosettings.cpp @@ -54,7 +54,7 @@ #include <QComboBox> #include <QSpinBox> #include <QDebug> -#include <QMediaEncoder> +#include <QMediaRecorder> #include <QMediaFormat> #include <QAudioDevice> #include <QMediaCaptureSession> @@ -62,7 +62,7 @@ #include <QCamera> #include <QAudioInput> -VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent) +VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) : QDialog(parent), ui(new Ui::VideoSettingsUi), mediaRecorder(mediaRecorder) diff --git a/examples/multimediawidgets/camera/videosettings.h b/examples/multimediawidgets/camera/videosettings.h index 05a21b4e4..2cb690d27 100644 --- a/examples/multimediawidgets/camera/videosettings.h +++ b/examples/multimediawidgets/camera/videosettings.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QComboBox; -class QMediaEncoder; +class QMediaRecorder; namespace Ui { class VideoSettingsUi; } QT_END_NAMESPACE @@ -65,7 +65,7 @@ class VideoSettings : public QDialog Q_OBJECT public: - explicit VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent = nullptr); + explicit VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent = nullptr); ~VideoSettings(); QMediaEncoderSettings encoderSettings() const; @@ -79,7 +79,7 @@ private: void selectComboBoxItem(QComboBox *box, const QVariant &value); Ui::VideoSettingsUi *ui; - QMediaEncoder *mediaRecorder; + QMediaRecorder *mediaRecorder; }; #endif // VIDEOSETTINGS_H diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index a23342355..7e979863b 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -55,7 +55,7 @@ qt_internal_add_module(Multimedia qmultimediautils.cpp qmultimediautils_p.h qtmultimediaglobal.h qtmultimediaglobal_p.h recording/qmediacapturesession.cpp recording/qmediacapturesession.h - recording/qmediaencoder.cpp recording/qmediaencoder.h recording/qmediaencoder_p.h + recording/qmediarecorder.cpp recording/qmediarecorder.h recording/qmediarecorder_p.h recording/qmediaencodersettings.cpp recording/qmediaencodersettings.h video/qabstractvideobuffer.cpp video/qabstractvideobuffer_p.h video/qmemoryvideobuffer.cpp video/qmemoryvideobuffer_p.h diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/audio/qaudio.cpp index 6fe722514..e45a67868 100644 --- a/src/multimedia/audio/qaudio.cpp +++ b/src/multimedia/audio/qaudio.cpp @@ -151,7 +151,7 @@ namespace QAudio \since 5.8 \sa VolumeScale, QMediaPlayer::setVolume(), QAudioSink::setVolume(), - QAudioSource::setVolume(), QSoundEffect::setVolume(), QMediaEncoder::setVolume() + QAudioSource::setVolume(), QSoundEffect::setVolume(), QMediaRecorder::setVolume() */ qreal convertVolume(qreal volume, VolumeScale from, VolumeScale to) { diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp index af0724ed7..2306265b7 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp @@ -41,7 +41,7 @@ #include "qcamera.h" #include "qcameradevice.h" -#include "qmediaencoder.h" +#include "qmediarecorder.h" #include "qmediadevices.h" #include "qmediacapturesession.h" #include "qcameraimagecapture.h" @@ -53,7 +53,7 @@ /* Globals so that everything is consistent. */ QCamera *camera = 0; -QMediaEncoder *encoder = 0; +QMediaRecorder *encoder = 0; QCameraImageCapture *imageCapture = 0; //! [Camera overview check] @@ -151,7 +151,7 @@ void overview_movie() QMediaCaptureSession captureSession; camera = new QCamera; captureSession.setCamera(camera); - encoder = new QMediaEncoder(camera); + encoder = new QMediaRecorder(camera); captureSession.setEncoder(encoder); camera->start(); diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp index 82f6ba6a6..f2ed71cf7 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp @@ -43,7 +43,7 @@ #include <QBuffer> #include "qmediaplaylist.h" -#include "qmediaencoder.h" +#include "qmediarecorder.h" #include "qplatformmediaplayer_p.h" #include "qmediaplayer.h" #include "qvideowidget.h" @@ -71,7 +71,7 @@ private: QMediaPlayer *player; QMediaPlaylist *playlist; QMediaContent video; - QMediaEncoder *recorder; + QMediaRecorder *recorder; QCamera *camera; QCameraViewfinder *viewfinder; QCameraImageCapture *imageCapture; @@ -132,7 +132,7 @@ void MediaExample::MediaPlayer() void MediaExample::MediaRecorder() { //! [Media recorder] - recorder = new QMediaEncoder(camera); + recorder = new QMediaRecorder(camera); QMediaEncoderSettings audioSettings(QMediaFormat::MP3); audioSettings.setQuality(QMediaEncoderSettings::HighQuality); @@ -147,8 +147,8 @@ void MediaExample::MediaRecorder() void MediaExample::AudioRecorder() { //! [Audio recorder] - QMediaEncoder recorder; - recorder.setCaptureMode(QMediaEncoder::AudioOnly); + QMediaRecorder recorder; + recorder.setCaptureMode(QMediaRecorder::AudioOnly); QMediaEncoderSettings audioSettings(QMediaFormat::MP3); audioSettings.setQuality(QMediaEncoderSettings::HighQuality); diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc index 8adbf8beb..ce49e1e98 100644 --- a/src/multimedia/doc/src/audiooverview.qdoc +++ b/src/multimedia/doc/src/audiooverview.qdoc @@ -53,7 +53,7 @@ You can also put files (even remote URLs) into a playlist: \snippet multimedia-snippets/media.cpp Audio playlist \section2 Recording Audio to a File -For recording audio to a file, the \l {QMediaEncoder} class allows you +For recording audio to a file, the \l {QMediaRecorder} class allows you to compress audio data from an input device and record it. \snippet multimedia-snippets/media.cpp Audio recorder diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc index c15916fb7..f1f33d79a 100644 --- a/src/multimedia/doc/src/cameraoverview.qdoc +++ b/src/multimedia/doc/src/cameraoverview.qdoc @@ -204,7 +204,7 @@ object. All that is then needed is to start the camera and capture the image. \section2 Movies Previously we saw code that allowed the capture of a still image. Recording -video requires the use of a \l QMediaEncoder object. +video requires the use of a \l QMediaRecorder object. To record video we need to create a camera object as before but this time as well as creating a viewfinder, we will also initialize a media recorder object. @@ -213,13 +213,13 @@ well as creating a viewfinder, we will also initialize a media recorder object. Signals from the \e mediaEncoder can be connected to slots to react to changes in the state of the encoding process or error events. Recording itself -starts with the \l {QMediaEncoder::record()}{record()} function of +starts with the \l {QMediaRecorder::record()}{record()} function of mediaEncoder being called, this causes the signal \l -{QMediaEncoder::recorderStateChanged()}{recorderStateChanged()} to be emitted. The -recording process can be changed with the \l {QMediaEncoder::record()}{record()}, -\l {QMediaEncoder::stop()}{stop()} slots in \l QMediaEncoder. +{QMediaRecorder::recorderStateChanged()}{recorderStateChanged()} to be emitted. The +recording process can be changed with the \l {QMediaRecorder::record()}{record()}, +\l {QMediaRecorder::stop()}{stop()} slots in \l QMediaRecorder. -On top of the above, QMediaEncoder provides a simple to use, but more limited all-in-one class +On top of the above, QMediaRecorder provides a simple to use, but more limited all-in-one class for recording audio and video content. \section2 Controlling the Imaging Pipeline diff --git a/src/multimedia/doc/src/changes.qdoc b/src/multimedia/doc/src/changes.qdoc index 62e4c72b4..4855620a4 100644 --- a/src/multimedia/doc/src/changes.qdoc +++ b/src/multimedia/doc/src/changes.qdoc @@ -41,8 +41,8 @@ Existing code that uses Qt Multimedia from Qt 5 can be ported with limited effor There are a number of new features in Qt Multimedia: \list \li QMediaCaptureSession class as the central object for media capture -\li Changed QMediaEncoder class to be a high level class for audio/video recording -\li new QMediaEncoder class to handle encoding of data produced in a capture session +\li Changed QMediaRecorder class to be a high level class for audio/video recording +\li new QMediaRecorder class to handle encoding of data produced in a capture session \li Setting up the desired encodings when recording has changed significantly, see QMediaEncoderSettings for details \li Support for selection of audio, video and subtitle tracks when playing back media files @@ -67,7 +67,7 @@ QMediaEncoderSettings for details and video outputs may be added in a future release. \row \li QAudioRecorder and the Audio QML type - \li QMediaEncoder and the MediaRecorder QML type provide the same functionality + \li QMediaRecorder and the MediaRecorder QML type provide the same functionality \row \li QMediaObject and QMediaBindableInterface \li These classes have been removed in favor of a more direct API for setting up connections diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc index 4dbf2f2d8..c554d5898 100644 --- a/src/multimedia/doc/src/multimedia.qdoc +++ b/src/multimedia/doc/src/multimedia.qdoc @@ -138,7 +138,7 @@ For some quick recipes, look at the overviews above and consult this table: \li \l {Camera Example}{camera}, \l {QML Camera Example}{declarative-camera} \li \l Camera - \li QCamera, QMediaEncoder + \li QCamera, QMediaRecorder \row \li 3D sound sources \li diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index 86c1dc8c3..5e2f4d98f 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -120,7 +120,7 @@ \li QCameraImageCapture \li Capture still images with a camera. \row - \li QMediaEncoder + \li QMediaRecorder \li Record media content from a camera source. \row \li QMediaPlayer diff --git a/src/multimedia/doc/src/videooverview.qdoc b/src/multimedia/doc/src/videooverview.qdoc index ced829a1e..e3fe0175e 100644 --- a/src/multimedia/doc/src/videooverview.qdoc +++ b/src/multimedia/doc/src/videooverview.qdoc @@ -75,7 +75,7 @@ allows you to receive these frames from \l QMediaPlayer and \l QCamera. \section2 Recording Video -You can use the \l QMediaEncoder class as a simple way to record video to disk. +You can use the \l QMediaRecorder class as a simple way to record video to disk. For more advances use cases \l QMediaCaptureSession provides a more flexible API. \section1 Examples diff --git a/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp index 287ec17bc..021159b32 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcapturesession.cpp @@ -58,8 +58,8 @@ QAndroidCaptureSession::QAndroidCaptureSession(QAndroidCameraSession *cameraSess , m_cameraSession(cameraSession) , m_audioSource(AndroidMediaRecorder::DefaultAudioSource) , m_duration(0) - , m_state(QMediaEncoder::StoppedState) - , m_status(QMediaEncoder::StoppedStatus) + , m_state(QMediaRecorder::StoppedState) + , m_status(QMediaRecorder::StoppedStatus) , m_encoderSettingsDirty(true) , m_outputFormat(AndroidMediaRecorder::DefaultOutputFormat) , m_audioEncoder(AndroidMediaRecorder::DefaultAudioEncoder) @@ -78,26 +78,26 @@ QAndroidCaptureSession::QAndroidCaptureSession(QAndroidCameraSession *cameraSess connect(cameraSession, &QAndroidCameraSession::statusChanged, this, [this](QCamera::Status status) { if (status == QCamera::UnavailableStatus) { - setState(QMediaEncoder::StoppedState); - setStatus(QMediaEncoder::UnavailableStatus); + setState(QMediaRecorder::StoppedState); + setStatus(QMediaRecorder::UnavailableStatus); return; } // Stop recording when stopping the camera. if (status == QCamera::StoppingStatus) { - setState(QMediaEncoder::StoppedState); - setStatus(QMediaEncoder::StoppedStatus); + setState(QMediaRecorder::StoppedState); + setStatus(QMediaRecorder::StoppedStatus); return; } }); connect(cameraSession, &QAndroidCameraSession::readyForCaptureChanged, this, [this](bool ready) { if (ready) - setStatus(QMediaEncoder::StoppedStatus); + setStatus(QMediaRecorder::StoppedStatus); }); } else { // Audio-only recording. - setStatus(QMediaEncoder::StoppedStatus); + setStatus(QMediaRecorder::StoppedStatus); } m_notifyTimer.setInterval(1000); @@ -159,36 +159,36 @@ bool QAndroidCaptureSession::setOutputLocation(const QUrl &location) return false; } -QMediaEncoder::RecorderState QAndroidCaptureSession::state() const +QMediaRecorder::RecorderState QAndroidCaptureSession::state() const { return m_state; } -void QAndroidCaptureSession::setState(QMediaEncoder::RecorderState state) +void QAndroidCaptureSession::setState(QMediaRecorder::RecorderState state) { if (m_state == state) return; switch (state) { - case QMediaEncoder::StoppedState: + case QMediaRecorder::StoppedState: stop(); break; - case QMediaEncoder::RecordingState: + case QMediaRecorder::RecordingState: start(); break; - case QMediaEncoder::PausedState: + case QMediaRecorder::PausedState: // Not supported by Android API - qWarning("QMediaEncoder::PausedState is not supported on Android"); + qWarning("QMediaRecorder::PausedState is not supported on Android"); break; } } void QAndroidCaptureSession::start() { - if (m_state == QMediaEncoder::RecordingState || m_status != QMediaEncoder::StoppedStatus) + if (m_state == QMediaRecorder::RecordingState || m_status != QMediaRecorder::StoppedStatus) return; - setStatus(QMediaEncoder::StartingStatus); + setStatus(QMediaRecorder::StartingStatus); if (m_mediaRecorder) { m_mediaRecorder->release(); @@ -199,8 +199,8 @@ void QAndroidCaptureSession::start() ? m_cameraSession->requestRecordingPermission() : qt_androidRequestRecordingPermission(); if (!granted) { - setStatus(QMediaEncoder::UnavailableStatus); - Q_EMIT error(QMediaEncoder::ResourceError, QLatin1String("Permission denied.")); + setStatus(QMediaRecorder::UnavailableStatus); + Q_EMIT error(QMediaRecorder::ResourceError, QLatin1String("Permission denied.")); return; } @@ -268,14 +268,14 @@ void QAndroidCaptureSession::start() } if (!m_mediaRecorder->prepare()) { - emit error(QMediaEncoder::FormatError, QLatin1String("Unable to prepare the media recorder.")); + emit error(QMediaRecorder::FormatError, QLatin1String("Unable to prepare the media recorder.")); if (m_cameraSession) restartViewfinder(); return; } if (!m_mediaRecorder->start()) { - emit error(QMediaEncoder::FormatError, QLatin1String("Unable to start the media recorder.")); + emit error(QMediaRecorder::FormatError, QLatin1String("Unable to start the media recorder.")); if (m_cameraSession) restartViewfinder(); return; @@ -293,17 +293,17 @@ void QAndroidCaptureSession::start() m_cameraSession->camera()->setupPreviewFrameCallback(); } - m_state = QMediaEncoder::RecordingState; + m_state = QMediaRecorder::RecordingState; emit stateChanged(m_state); - setStatus(QMediaEncoder::RecordingStatus); + setStatus(QMediaRecorder::RecordingStatus); } void QAndroidCaptureSession::stop(bool error) { - if (m_state == QMediaEncoder::StoppedState || m_mediaRecorder == 0) + if (m_state == QMediaRecorder::StoppedState || m_mediaRecorder == 0) return; - setStatus(QMediaEncoder::FinalizingStatus); + setStatus(QMediaRecorder::FinalizingStatus); m_mediaRecorder->stop(); m_notifyTimer.stop(); @@ -332,12 +332,12 @@ void QAndroidCaptureSession::stop(bool error) emit actualLocationChanged(m_actualOutputLocation); } - m_state = QMediaEncoder::StoppedState; + m_state = QMediaRecorder::StoppedState; emit stateChanged(m_state); - setStatus(QMediaEncoder::StoppedStatus); + setStatus(QMediaRecorder::StoppedStatus); } -void QAndroidCaptureSession::setStatus(QMediaEncoder::Status status) +void QAndroidCaptureSession::setStatus(QMediaRecorder::Status status) { if (m_status == status) return; @@ -346,7 +346,7 @@ void QAndroidCaptureSession::setStatus(QMediaEncoder::Status status) emit statusChanged(m_status); } -QMediaEncoder::Status QAndroidCaptureSession::status() const +QMediaRecorder::Status QAndroidCaptureSession::status() const { return m_status; } @@ -537,7 +537,7 @@ void QAndroidCaptureSession::onError(int what, int extra) Q_UNUSED(what); Q_UNUSED(extra); stop(true); - emit error(QMediaEncoder::ResourceError, QLatin1String("Unknown error.")); + emit error(QMediaRecorder::ResourceError, QLatin1String("Unknown error.")); } void QAndroidCaptureSession::onInfo(int what, int extra) @@ -545,12 +545,12 @@ void QAndroidCaptureSession::onInfo(int what, int extra) Q_UNUSED(extra); if (what == 800) { // MEDIA_RECORDER_INFO_MAX_DURATION_REACHED - setState(QMediaEncoder::StoppedState); - emit error(QMediaEncoder::OutOfSpaceError, QLatin1String("Maximum duration reached.")); + setState(QMediaRecorder::StoppedState); + emit error(QMediaRecorder::OutOfSpaceError, QLatin1String("Maximum duration reached.")); } else if (what == 801) { // MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED - setState(QMediaEncoder::StoppedState); - emit error(QMediaEncoder::OutOfSpaceError, QLatin1String("Maximum file size reached.")); + setState(QMediaRecorder::StoppedState); + emit error(QMediaRecorder::OutOfSpaceError, QLatin1String("Maximum file size reached.")); } } diff --git a/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h b/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h index 995e70abf..43f26969b 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcapturesession_p.h @@ -52,7 +52,7 @@ // #include <qobject.h> -#include <qmediaencoder.h> +#include <qmediarecorder.h> #include <qurl.h> #include <qelapsedtimer.h> #include <qtimer.h> @@ -80,10 +80,10 @@ public: QUrl outputLocation() const; bool setOutputLocation(const QUrl &location); - QMediaEncoder::RecorderState state() const; - void setState(QMediaEncoder::RecorderState state); + QMediaRecorder::RecorderState state() const; + void setState(QMediaRecorder::RecorderState state); - QMediaEncoder::Status status() const; + QMediaRecorder::Status status() const; qint64 duration() const; @@ -94,11 +94,11 @@ public: void applySettings(); - void stateChanged(QMediaEncoder::RecorderState state) { + void stateChanged(QMediaRecorder::RecorderState state) { if (m_mediaEncoder) m_mediaEncoder->stateChanged(state); } - void statusChanged(QMediaEncoder::Status status) + void statusChanged(QMediaRecorder::Status status) { if (m_mediaEncoder) m_mediaEncoder->statusChanged(status); @@ -116,7 +116,7 @@ public: void error(int error, const QString &errorString) { if (m_mediaEncoder) - m_mediaEncoder->error(QMediaEncoder::Error(error), errorString); + m_mediaEncoder->error(QMediaRecorder::Error(error), errorString); } private Q_SLOTS: @@ -163,7 +163,7 @@ private: void start(); void stop(bool error = false); - void setStatus(QMediaEncoder::Status status); + void setStatus(QMediaRecorder::Status status); void updateResolution(); void restartViewfinder(); @@ -181,8 +181,8 @@ private: QTimer m_notifyTimer; qint64 m_duration; - QMediaEncoder::RecorderState m_state; - QMediaEncoder::Status m_status; + QMediaRecorder::RecorderState m_state; + QMediaRecorder::Status m_status; QUrl m_requestedOutputLocation; QUrl m_usedOutputLocation; QUrl m_actualOutputLocation; diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp index 175528ed4..5b51d9281 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -QAndroidMediaEncoder::QAndroidMediaEncoder(QMediaEncoder *parent) +QAndroidMediaEncoder::QAndroidMediaEncoder(QMediaRecorder *parent) : QPlatformMediaEncoder(parent) { } @@ -59,12 +59,12 @@ bool QAndroidMediaEncoder::setOutputLocation(const QUrl &location) return m_session->setOutputLocation(location); } -QMediaEncoder::RecorderState QAndroidMediaEncoder::state() const +QMediaRecorder::RecorderState QAndroidMediaEncoder::state() const { return m_session->state(); } -QMediaEncoder::Status QAndroidMediaEncoder::status() const +QMediaRecorder::Status QAndroidMediaEncoder::status() const { return m_session->status(); } @@ -79,7 +79,7 @@ void QAndroidMediaEncoder::applySettings() m_session->applySettings(); } -void QAndroidMediaEncoder::setState(QMediaEncoder::RecorderState state) +void QAndroidMediaEncoder::setState(QMediaRecorder::RecorderState state) { m_session->setState(state); } @@ -96,7 +96,7 @@ void QAndroidMediaEncoder::setCaptureSession(QPlatformMediaCaptureSession *sessi return; if (m_service) - setState(QMediaEncoder::StoppedState); + setState(QMediaRecorder::StoppedState); if (m_session) m_session->setMediaEncoder(nullptr); diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h index c2a74366e..237f1a5b4 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h @@ -62,12 +62,12 @@ class QAndroidCaptureService; class QAndroidMediaEncoder : public QPlatformMediaEncoder { public: - explicit QAndroidMediaEncoder(QMediaEncoder *parent); + explicit QAndroidMediaEncoder(QMediaRecorder *parent); QUrl outputLocation() const override; bool setOutputLocation(const QUrl &location) override; - QMediaEncoder::RecorderState state() const override; - QMediaEncoder::Status status() const override; + QMediaRecorder::RecorderState state() const override; + QMediaRecorder::Status status() const override; qint64 duration() const override; void applySettings() override; @@ -75,7 +75,7 @@ public: void setCaptureSession(QPlatformMediaCaptureSession *session); - void setState(QMediaEncoder::RecorderState state) override; + void setState(QMediaRecorder::RecorderState state) override; private: friend class QAndroidCaptureSession; diff --git a/src/multimedia/platform/android/qandroidintegration.cpp b/src/multimedia/platform/android/qandroidintegration.cpp index 167caea43..1a8a10a43 100644 --- a/src/multimedia/platform/android/qandroidintegration.cpp +++ b/src/multimedia/platform/android/qandroidintegration.cpp @@ -99,7 +99,7 @@ QPlatformCamera *QAndroidIntegration::createCamera(QCamera *camera) return new QAndroidCameraControl(camera); } -QPlatformMediaEncoder *QAndroidIntegration::createEncoder(QMediaEncoder *encoder) +QPlatformMediaEncoder *QAndroidIntegration::createEncoder(QMediaRecorder *encoder) { return new QAndroidMediaEncoder(encoder); } diff --git a/src/multimedia/platform/android/qandroidintegration_p.h b/src/multimedia/platform/android/qandroidintegration_p.h index b1ab26cfe..6df40672c 100644 --- a/src/multimedia/platform/android/qandroidintegration_p.h +++ b/src/multimedia/platform/android/qandroidintegration_p.h @@ -69,7 +69,7 @@ public: QPlatformMediaCaptureSession *createCaptureSession() override; QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override; QPlatformCamera *createCamera(QCamera *camera) override; - QPlatformMediaEncoder *createEncoder(QMediaEncoder *encoder) override; + QPlatformMediaEncoder *createEncoder(QMediaRecorder *encoder) override; QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *imageCapture) override; QPlatformAudioOutput *createAudioOutput(QAudioOutput *q) override; diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm index f1872cb09..916d9fe7e 100644 --- a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm +++ b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm @@ -85,11 +85,11 @@ bool qt_file_exists(NSURL *fileURL) } -AVFMediaEncoder::AVFMediaEncoder(QMediaEncoder *parent) +AVFMediaEncoder::AVFMediaEncoder(QMediaRecorder *parent) : QObject(parent) , QPlatformMediaEncoder(parent) - , m_state(QMediaEncoder::StoppedState) - , m_lastStatus(QMediaEncoder::StoppedStatus) + , m_state(QMediaRecorder::StoppedState) + , m_lastStatus(QMediaRecorder::StoppedStatus) , m_audioSettings(nil) , m_videoSettings(nil) //, m_restoreFPS(-1, -1) @@ -122,12 +122,12 @@ bool AVFMediaEncoder::setOutputLocation(const QUrl &location) return location.scheme() == QLatin1String("file") || location.scheme().isEmpty(); } -QMediaEncoder::RecorderState AVFMediaEncoder::state() const +QMediaRecorder::RecorderState AVFMediaEncoder::state() const { return m_state; } -QMediaEncoder::Status AVFMediaEncoder::status() const +QMediaRecorder::Status AVFMediaEncoder::status() const { return m_lastStatus; } @@ -368,7 +368,7 @@ void AVFMediaEncoder::applySettings() return; AVFCameraSession *session = m_service->session(); - if (m_state != QMediaEncoder::StoppedState) + if (m_state != QMediaRecorder::StoppedState) return; const auto flag = (session->activeCameraInfo().isNull()) @@ -427,7 +427,7 @@ void AVFMediaEncoder::setCaptureSession(QPlatformMediaCaptureSession *session) return; if (m_service) - setState(QMediaEncoder::StoppedState); + setState(QMediaRecorder::StoppedState); m_service = captureSession; if (!m_service) @@ -437,7 +437,7 @@ void AVFMediaEncoder::setCaptureSession(QPlatformMediaCaptureSession *session) onCameraChanged(); } -void AVFMediaEncoder::setState(QMediaEncoder::RecorderState state) +void AVFMediaEncoder::setState(QMediaRecorder::RecorderState state) { if (!m_service || !m_service->session()) { qWarning() << Q_FUNC_INFO << "Encoder is not set to a capture session"; @@ -453,14 +453,14 @@ void AVFMediaEncoder::setState(QMediaEncoder::RecorderState state) return; switch (state) { - case QMediaEncoder::RecordingState: + case QMediaRecorder::RecordingState: m_service->session()->setActive(true); record(); break; - case QMediaEncoder::PausedState: - Q_EMIT error(QMediaEncoder::FormatError, tr("Recording pause not supported")); + case QMediaRecorder::PausedState: + Q_EMIT error(QMediaRecorder::FormatError, tr("Recording pause not supported")); return; - case QMediaEncoder::StoppedState: + case QMediaRecorder::StoppedState: // Do not check the camera status, we can stop if we started. stopWriter(); } @@ -476,7 +476,7 @@ void AVFMediaEncoder::record() AVFCamera *cameraControl = m_service->avfCameraControl(); if (!cameraControl || cameraControl->status() != QCamera::ActiveStatus) { qDebugCamera() << Q_FUNC_INFO << "can not start record while camera is not active"; - Q_EMIT error(QMediaEncoder::ResourceError, tr("Failed to start recording")); + Q_EMIT error(QMediaRecorder::ResourceError, tr("Failed to start recording")); return; } @@ -503,13 +503,13 @@ void AVFMediaEncoder::record() NSURL *nsFileURL = fileURL.toNSURL(); if (!nsFileURL) { qWarning() << Q_FUNC_INFO << "invalid output URL:" << fileURL; - Q_EMIT error(QMediaEncoder::ResourceError, tr("Invalid output file URL")); + Q_EMIT error(QMediaRecorder::ResourceError, tr("Invalid output file URL")); return; } if (!qt_is_writable_file_URL(nsFileURL)) { qWarning() << Q_FUNC_INFO << "invalid output URL:" << fileURL << "(the location is not writable)"; - Q_EMIT error(QMediaEncoder::ResourceError, tr("Non-writeable file location")); + Q_EMIT error(QMediaRecorder::ResourceError, tr("Non-writeable file location")); return; } if (qt_file_exists(nsFileURL)) { @@ -517,7 +517,7 @@ void AVFMediaEncoder::record() // Objective-C exception, which is not good at all. qWarning() << Q_FUNC_INFO << "invalid output URL:" << fileURL << "(file already exists)"; - Q_EMIT error(QMediaEncoder::ResourceError, tr("File already exists")); + Q_EMIT error(QMediaRecorder::ResourceError, tr("File already exists")); return; } @@ -533,8 +533,8 @@ void AVFMediaEncoder::record() videoSettings:m_videoSettings transform:CGAffineTransformMakeRotation(qDegreesToRadians(rotation))]) { - m_state = QMediaEncoder::RecordingState; - m_lastStatus = QMediaEncoder::StartingStatus; + m_state = QMediaRecorder::RecordingState; + m_lastStatus = QMediaRecorder::StartingStatus; Q_EMIT actualLocationChanged(fileURL); Q_EMIT stateChanged(m_state); @@ -551,14 +551,14 @@ void AVFMediaEncoder::record() [m_writer start]; } else { [session startRunning]; - Q_EMIT error(QMediaEncoder::FormatError, tr("Failed to start recording")); + Q_EMIT error(QMediaRecorder::FormatError, tr("Failed to start recording")); } } void AVFMediaEncoder::assetWriterStarted() { - m_lastStatus = QMediaEncoder::RecordingStatus; - Q_EMIT statusChanged(QMediaEncoder::RecordingStatus); + m_lastStatus = QMediaRecorder::RecordingStatus; + Q_EMIT statusChanged(QMediaRecorder::RecordingStatus); } void AVFMediaEncoder::assetWriterFinished() @@ -566,8 +566,8 @@ void AVFMediaEncoder::assetWriterFinished() Q_ASSERT(m_service && m_service->session()); AVFCameraSession *session = m_service->session(); - const QMediaEncoder::Status lastStatus = m_lastStatus; - const QMediaEncoder::RecorderState lastState = m_state; + const QMediaRecorder::Status lastStatus = m_lastStatus; + const QMediaRecorder::RecorderState lastState = m_state; unapplySettings(); @@ -576,8 +576,8 @@ void AVFMediaEncoder::assetWriterFinished() } [session->captureSession() startRunning]; - m_state = QMediaEncoder::StoppedState; - m_lastStatus = QMediaEncoder::StoppedStatus; + m_state = QMediaRecorder::StoppedState; + m_lastStatus = QMediaRecorder::StoppedStatus; if (m_lastStatus != lastStatus) Q_EMIT statusChanged(m_lastStatus); if (m_state != lastState) @@ -599,12 +599,12 @@ void AVFMediaEncoder::cameraActiveChanged(bool active) AVFCamera *cameraControl = m_service->avfCameraControl(); Q_ASSERT(cameraControl); - const QMediaEncoder::Status lastStatus = m_lastStatus; + const QMediaRecorder::Status lastStatus = m_lastStatus; if (!active) { - if (m_lastStatus == QMediaEncoder::RecordingStatus) + if (m_lastStatus == QMediaRecorder::RecordingStatus) return stopWriter(); - m_lastStatus = QMediaEncoder::StoppedStatus; + m_lastStatus = QMediaRecorder::StoppedStatus; } if (lastStatus != m_lastStatus) @@ -613,8 +613,8 @@ void AVFMediaEncoder::cameraActiveChanged(bool active) void AVFMediaEncoder::stopWriter() { - if (m_lastStatus == QMediaEncoder::RecordingStatus) { - m_lastStatus = QMediaEncoder::FinalizingStatus; + if (m_lastStatus == QMediaRecorder::RecordingStatus) { + m_lastStatus = QMediaRecorder::FinalizingStatus; Q_EMIT statusChanged(m_lastStatus); diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h b/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h index 53369cb70..bd9588e27 100644 --- a/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h +++ b/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h @@ -74,14 +74,14 @@ class AVFMediaEncoder : public QObject, public QPlatformMediaEncoder { Q_OBJECT public: - AVFMediaEncoder(QMediaEncoder *parent); + AVFMediaEncoder(QMediaRecorder *parent); ~AVFMediaEncoder() override; QUrl outputLocation() const override; bool setOutputLocation(const QUrl &location) override; - QMediaEncoder::RecorderState state() const override; - QMediaEncoder::Status status() const override; + QMediaRecorder::RecorderState state() const override; + QMediaRecorder::Status status() const override; qint64 duration() const override; @@ -96,7 +96,7 @@ public: void setCaptureSession(QPlatformMediaCaptureSession *session); public Q_SLOTS: - void setState(QMediaEncoder::RecorderState state) override; + void setState(QMediaRecorder::RecorderState state) override; private: @@ -117,8 +117,8 @@ private: QUrl m_outputLocation; AVFStorageLocation m_storageLocation; - QMediaEncoder::RecorderState m_state; - QMediaEncoder::Status m_lastStatus; + QMediaRecorder::RecorderState m_state; + QMediaRecorder::Status m_lastStatus; QMediaEncoderSettings m_settings; NSDictionary *m_audioSettings; diff --git a/src/multimedia/platform/darwin/qdarwinintegration.mm b/src/multimedia/platform/darwin/qdarwinintegration.mm index 4f6061b62..753dabff4 100644 --- a/src/multimedia/platform/darwin/qdarwinintegration.mm +++ b/src/multimedia/platform/darwin/qdarwinintegration.mm @@ -95,7 +95,7 @@ QPlatformCamera *QDarwinIntegration::createCamera(QCamera *camera) return new AVFCamera(camera); } -QPlatformMediaEncoder *QDarwinIntegration::createEncoder(QMediaEncoder *encoder) +QPlatformMediaEncoder *QDarwinIntegration::createEncoder(QMediaRecorder *encoder) { return new AVFMediaEncoder(encoder); } diff --git a/src/multimedia/platform/darwin/qdarwinintegration_p.h b/src/multimedia/platform/darwin/qdarwinintegration_p.h index b8f8b0c3d..52832585e 100644 --- a/src/multimedia/platform/darwin/qdarwinintegration_p.h +++ b/src/multimedia/platform/darwin/qdarwinintegration_p.h @@ -70,7 +70,7 @@ public: QPlatformMediaCaptureSession *createCaptureSession() override; QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override; QPlatformCamera *createCamera(QCamera *camera) override; - QPlatformMediaEncoder *createEncoder(QMediaEncoder *) override; + QPlatformMediaEncoder *createEncoder(QMediaRecorder *) override; QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) override; QPlatformVideoSink *createVideoSink(QVideoSink *) override; diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp index 41592b1d8..81fcecc2e 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp @@ -56,7 +56,7 @@ Q_LOGGING_CATEGORY(qLcMediaEncoder, "qt.multimedia.encoder") -QGstreamerMediaEncoder::QGstreamerMediaEncoder(QMediaEncoder *parent) +QGstreamerMediaEncoder::QGstreamerMediaEncoder(QMediaRecorder *parent) : QPlatformMediaEncoder(parent) { gstEncoder = QGstElement("encodebin", "encodebin"); @@ -84,27 +84,27 @@ bool QGstreamerMediaEncoder::setOutputLocation(const QUrl &sink) void QGstreamerMediaEncoder::updateStatus() { - static QMediaEncoder::Status statusTable[3][3] = { + static QMediaRecorder::Status statusTable[3][3] = { //Stopped recorder state: - { QMediaEncoder::StoppedStatus, QMediaEncoder::FinalizingStatus, QMediaEncoder::FinalizingStatus }, + { QMediaRecorder::StoppedStatus, QMediaRecorder::FinalizingStatus, QMediaRecorder::FinalizingStatus }, //Recording recorder state: - { QMediaEncoder::StartingStatus, QMediaEncoder::RecordingStatus, QMediaEncoder::PausedStatus }, + { QMediaRecorder::StartingStatus, QMediaRecorder::RecordingStatus, QMediaRecorder::PausedStatus }, //Paused recorder state: - { QMediaEncoder::StartingStatus, QMediaEncoder::RecordingStatus, QMediaEncoder::PausedStatus } + { QMediaRecorder::StartingStatus, QMediaRecorder::RecordingStatus, QMediaRecorder::PausedStatus } }; - QMediaEncoder::RecorderState sessionState = QMediaEncoder::StoppedState; + QMediaRecorder::RecorderState sessionState = QMediaRecorder::StoppedState; auto gstState = gstEncoder.isNull() ? GST_STATE_NULL : gstEncoder.state(); switch (gstState) { case GST_STATE_PLAYING: - sessionState = QMediaEncoder::RecordingState; + sessionState = QMediaRecorder::RecordingState; break; case GST_STATE_PAUSED: - sessionState = QMediaEncoder::PausedState; + sessionState = QMediaRecorder::PausedState; break; default: - sessionState = QMediaEncoder::StoppedState; + sessionState = QMediaRecorder::StoppedState; break; } @@ -114,7 +114,7 @@ void QGstreamerMediaEncoder::updateStatus() statusChanged(newStatus); } -void QGstreamerMediaEncoder::handleSessionError(QMediaEncoder::Error code, const QString &description) +void QGstreamerMediaEncoder::handleSessionError(QMediaRecorder::Error code, const QString &description) { error(code, description); stop(); @@ -153,7 +153,7 @@ bool QGstreamerMediaEncoder::processBusMessage(const QGstreamerMessage &message) GError *err; gchar *debug; gst_message_parse_error(gm, &err, &debug); - error(QMediaEncoder::ResourceError, QString::fromUtf8(err->message)); + error(QMediaRecorder::ResourceError, QString::fromUtf8(err->message)); g_error_free(err); g_free(debug); } @@ -264,19 +264,19 @@ static GstEncodingContainerProfile *createEncodingProfile(const QMediaEncoderSet return containerProfile; } -void QGstreamerMediaEncoder::setState(QMediaEncoder::RecorderState s) +void QGstreamerMediaEncoder::setState(QMediaRecorder::RecorderState s) { if (s == state()) return; switch (s) { - case QMediaEncoder::StoppedState: + case QMediaRecorder::StoppedState: stop(); break; - case QMediaEncoder::PausedState: + case QMediaRecorder::PausedState: pause(); break; - case QMediaEncoder::RecordingState: + case QMediaRecorder::RecordingState: record(); break; } @@ -288,11 +288,11 @@ void QGstreamerMediaEncoder::record() if (!m_session) return; auto oldState = state(); - stateChanged(QMediaEncoder::RecordingState); + stateChanged(QMediaRecorder::RecordingState); - if (oldState == QMediaEncoder::PausedState) { + if (oldState == QMediaRecorder::PausedState) { // coming from paused state - stateChanged(QMediaEncoder::RecordingState); + stateChanged(QMediaRecorder::RecordingState); gstEncoder.setState(GST_STATE_PLAYING); updateStatus(); return; @@ -350,7 +350,7 @@ void QGstreamerMediaEncoder::pause() gstPipeline.dumpGraph("before-pause"); gstEncoder.setState(GST_STATE_PAUSED); - stateChanged(QMediaEncoder::PausedState); + stateChanged(QMediaRecorder::PausedState); updateStatus(); } @@ -374,7 +374,7 @@ void QGstreamerMediaEncoder::stop() qCDebug(qLcMediaEncoder) << ">>>>>>>>>>>>> sending EOS"; gstEncoder.sendEos(); - stateChanged(QMediaEncoder::StoppedState); + stateChanged(QMediaRecorder::StoppedState); updateStatus(); } diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h index b566566fe..3c0238c02 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h @@ -69,7 +69,7 @@ class QGstreamerMessage; class QGstreamerMediaEncoder : public QPlatformMediaEncoder, QGstreamerBusMessageFilter { public: - QGstreamerMediaEncoder(QMediaEncoder *parent); + QGstreamerMediaEncoder(QMediaRecorder *parent); virtual ~QGstreamerMediaEncoder(); QUrl outputLocation() const override; @@ -90,7 +90,7 @@ public: private: bool processBusMessage(const QGstreamerMessage& message) override; public: - void setState(QMediaEncoder::RecorderState state) override; + void setState(QMediaRecorder::RecorderState state) override; void record(); void pause(); void stop(); @@ -98,7 +98,7 @@ public: private: void updateStatus(); - void handleSessionError(QMediaEncoder::Error code, const QString &description); + void handleSessionError(QMediaRecorder::Error code, const QString &description); void finalize(); QDir defaultDir() const; QString generateFileName(const QDir &dir, const QString &ext) const; diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp index 574fdd079..06a0f6af8 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp +++ b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp @@ -96,7 +96,7 @@ QPlatformCamera *QGstreamerIntegration::createCamera(QCamera *camera) return new QGstreamerCamera(camera); } -QPlatformMediaEncoder *QGstreamerIntegration::createEncoder(QMediaEncoder *encoder) +QPlatformMediaEncoder *QGstreamerIntegration::createEncoder(QMediaRecorder *encoder) { return new QGstreamerMediaEncoder(encoder); } diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h index 2ffd73925..0bd21ead4 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h +++ b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h @@ -73,7 +73,7 @@ public: QPlatformMediaCaptureSession *createCaptureSession() override; QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override; QPlatformCamera *createCamera(QCamera *) override; - QPlatformMediaEncoder *createEncoder(QMediaEncoder *) override; + QPlatformMediaEncoder *createEncoder(QMediaRecorder *) override; QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) override; QPlatformVideoSink *createVideoSink(QVideoSink *sink) override; diff --git a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp index 11c486953..cdd4793af 100644 --- a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp +++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp @@ -65,8 +65,8 @@ BbCameraMediaRecorderControl::BbCameraMediaRecorderControl(BbCameraSession *sess : QPlatformMediaEncoder(parent) , m_session(session) { - connect(m_session, SIGNAL(videoStateChanged(QMediaEncoder::RecorderState)), this, SIGNAL(stateChanged(QMediaEncoder::RecorderState))); - connect(m_session, SIGNAL(videoStatusChanged(QMediaEncoder::Status)), this, SIGNAL(statusChanged(QMediaEncoder::Status))); + connect(m_session, SIGNAL(videoStateChanged(QMediaRecorder::RecorderState)), this, SIGNAL(stateChanged(QMediaRecorder::RecorderState))); + connect(m_session, SIGNAL(videoStatusChanged(QMediaRecorder::Status)), this, SIGNAL(statusChanged(QMediaRecorder::Status))); connect(m_session, SIGNAL(durationChanged(qint64)), this, SIGNAL(durationChanged(qint64))); connect(m_session, SIGNAL(actualLocationChanged(QUrl)), this, SIGNAL(actualLocationChanged(QUrl))); connect(m_session, SIGNAL(videoError(int,QString)), this, SIGNAL(error(int,QString))); @@ -82,12 +82,12 @@ bool BbCameraMediaRecorderControl::setOutputLocation(const QUrl &location) return m_session->setOutputLocation(location); } -QMediaEncoder::RecorderState BbCameraMediaRecorderControl::state() const +QMediaRecorder::RecorderState BbCameraMediaRecorderControl::state() const { return m_session->videoState(); } -QMediaEncoder::Status BbCameraMediaRecorderControl::status() const +QMediaRecorder::Status BbCameraMediaRecorderControl::status() const { return m_session->videoStatus(); } @@ -103,7 +103,7 @@ bool BbCameraMediaRecorderControl::isMuted() const const int result = audio_manager_get_input_mute(currentAudioInputDevice(), &muted); if (result != EOK) { - emit const_cast<BbCameraMediaRecorderControl*>(this)->error(QMediaEncoder::ResourceError, tr("Unable to retrieve mute status")); + emit const_cast<BbCameraMediaRecorderControl*>(this)->error(QMediaRecorder::ResourceError, tr("Unable to retrieve mute status")); return false; } @@ -116,7 +116,7 @@ qreal BbCameraMediaRecorderControl::volume() const const int result = audio_manager_get_input_level(currentAudioInputDevice(), &level); if (result != EOK) { - emit const_cast<BbCameraMediaRecorderControl*>(this)->error(QMediaEncoder::ResourceError, tr("Unable to retrieve audio input volume")); + emit const_cast<BbCameraMediaRecorderControl*>(this)->error(QMediaRecorder::ResourceError, tr("Unable to retrieve audio input volume")); return 0.0; } @@ -128,7 +128,7 @@ void BbCameraMediaRecorderControl::applySettings() m_session->applyVideoSettings(); } -void BbCameraMediaRecorderControl::setState(QMediaEncoder::RecorderState state) +void BbCameraMediaRecorderControl::setState(QMediaRecorder::RecorderState state) { m_session->setVideoState(state); } @@ -137,7 +137,7 @@ void BbCameraMediaRecorderControl::setMuted(bool muted) { const int result = audio_manager_set_input_mute(currentAudioInputDevice(), muted); if (result != EOK) { - emit error(QMediaEncoder::ResourceError, tr("Unable to set mute status")); + emit error(QMediaRecorder::ResourceError, tr("Unable to set mute status")); } else { emit mutedChanged(muted); } @@ -147,7 +147,7 @@ void BbCameraMediaRecorderControl::setVolume(qreal volume) { const int result = audio_manager_set_input_level(currentAudioInputDevice(), (volume * 100)); if (result != EOK) { - emit error(QMediaEncoder::ResourceError, tr("Unable to set audio input volume")); + emit error(QMediaRecorder::ResourceError, tr("Unable to set audio input volume")); } else { emit volumeChanged(volume); } diff --git a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h index c485988ca..7b9d11ecc 100644 --- a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h +++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h @@ -64,15 +64,15 @@ public: QUrl outputLocation() const override; bool setOutputLocation(const QUrl &location) override; - QMediaEncoder::RecorderState state() const override; - QMediaEncoder::Status status() const override; + QMediaRecorder::RecorderState state() const override; + QMediaRecorder::Status status() const override; qint64 duration() const override; bool isMuted() const override; qreal volume() const override; void applySettings() override; public Q_SLOTS: - void setState(QMediaEncoder::RecorderState state) override; + void setState(QMediaRecorder::RecorderState state) override; void setMuted(bool muted) override; void setVolume(qreal volume) override; diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp index 5f0e5d843..1856fa48c 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp +++ b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp @@ -123,8 +123,8 @@ BbCameraSession::BbCameraSession(QObject *parent) , m_previewIsVideo(true) , m_surface(0) , m_lastImageCaptureId(0) - , m_videoState(QMediaEncoder::StoppedState) - , m_videoStatus(QMediaEncoder::StoppedStatus) + , m_videoState(QMediaRecorder::StoppedState) + , m_videoStatus(QMediaRecorder::StoppedStatus) , m_handle(CAMERA_HANDLE_INVALID) , m_windowGrabber(new WindowGrabber(this)) { @@ -418,38 +418,38 @@ bool BbCameraSession::setOutputLocation(const QUrl &location) return true; } -QMediaEncoder::RecorderState BbCameraSession::videoState() const +QMediaRecorder::RecorderState BbCameraSession::videoState() const { return m_videoState; } -void BbCameraSession::setVideoState(QMediaEncoder::RecorderState state) +void BbCameraSession::setVideoState(QMediaRecorder::RecorderState state) { if (m_videoState == state) return; - const QMediaEncoder::RecorderState previousState = m_videoState; + const QMediaRecorder::RecorderState previousState = m_videoState; - if (previousState == QMediaEncoder::StoppedState) { - if (state == QMediaEncoder::RecordingState) { + if (previousState == QMediaRecorder::StoppedState) { + if (state == QMediaRecorder::RecordingState) { if (startVideoRecording()) { m_videoState = state; } - } else if (state == QMediaEncoder::PausedState) { + } else if (state == QMediaRecorder::PausedState) { // do nothing } - } else if (previousState == QMediaEncoder::RecordingState) { - if (state == QMediaEncoder::StoppedState) { + } else if (previousState == QMediaRecorder::RecordingState) { + if (state == QMediaRecorder::StoppedState) { stopVideoRecording(); m_videoState = state; - } else if (state == QMediaEncoder::PausedState) { + } else if (state == QMediaRecorder::PausedState) { //TODO: (pause) not supported by BB10 API yet } - } else if (previousState == QMediaEncoder::PausedState) { - if (state == QMediaEncoder::StoppedState) { + } else if (previousState == QMediaRecorder::PausedState) { + if (state == QMediaRecorder::StoppedState) { stopVideoRecording(); m_videoState = state; - } else if (state == QMediaEncoder::RecordingState) { + } else if (state == QMediaRecorder::RecordingState) { //TODO: (resume) not supported by BB10 API yet } } @@ -457,7 +457,7 @@ void BbCameraSession::setVideoState(QMediaEncoder::RecorderState state) emit videoStateChanged(m_videoState); } -QMediaEncoder::Status BbCameraSession::videoStatus() const +QMediaRecorder::Status BbCameraSession::videoStatus() const { return m_videoStatus; } @@ -563,7 +563,7 @@ void BbCameraSession::applyVideoSettings() if (result != CAMERA_EOK) { qWarning() << "Unable to apply video settings:" << result; - emit videoError(QMediaEncoder::ResourceError, tr("Unable to apply video settings")); + emit videoError(QMediaRecorder::ResourceError, tr("Unable to apply video settings")); } } @@ -693,8 +693,8 @@ void BbCameraSession::handleVideoRecordingPaused() void BbCameraSession::handleVideoRecordingResumed() { - if (m_videoStatus == QMediaEncoder::StartingStatus) { - m_videoStatus = QMediaEncoder::RecordingStatus; + if (m_videoStatus == QMediaRecorder::StartingStatus) { + m_videoStatus = QMediaRecorder::RecordingStatus; emit videoStatusChanged(m_videoStatus); m_videoRecordingDuration.restart(); @@ -990,7 +990,7 @@ bool BbCameraSession::startVideoRecording() { m_videoRecordingDuration.invalidate(); - m_videoStatus = QMediaEncoder::StartingStatus; + m_videoStatus = QMediaRecorder::StartingStatus; emit videoStatusChanged(m_videoStatus); if (m_videoOutputLocation.isEmpty()) @@ -1000,10 +1000,10 @@ bool BbCameraSession::startVideoRecording() const camera_error_t result = camera_start_video(m_handle, QFile::encodeName(m_videoOutputLocation), 0, videoRecordingStatusCallback, this); if (result != CAMERA_EOK) { - m_videoStatus = QMediaEncoder::StoppedStatus; + m_videoStatus = QMediaRecorder::StoppedStatus; emit videoStatusChanged(m_videoStatus); - emit videoError(QMediaEncoder::ResourceError, tr("Unable to start video recording")); + emit videoError(QMediaRecorder::ResourceError, tr("Unable to start video recording")); return false; } @@ -1012,15 +1012,15 @@ bool BbCameraSession::startVideoRecording() void BbCameraSession::stopVideoRecording() { - m_videoStatus = QMediaEncoder::FinalizingStatus; + m_videoStatus = QMediaRecorder::FinalizingStatus; emit videoStatusChanged(m_videoStatus); const camera_error_t result = camera_stop_video(m_handle); if (result != CAMERA_EOK) { - emit videoError(QMediaEncoder::ResourceError, tr("Unable to stop video recording")); + emit videoError(QMediaRecorder::ResourceError, tr("Unable to stop video recording")); } - m_videoStatus = QMediaEncoder::StoppedStatus; + m_videoStatus = QMediaRecorder::StoppedStatus; emit videoStatusChanged(m_videoStatus); m_videoRecordingDuration.invalidate(); diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h index 67a2f1685..c92c2ac2d 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h +++ b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h @@ -55,7 +55,7 @@ #include <QCamera> #include <QCameraImageCapture> #include <QElapsedTimer> -#include <QMediaEncoder> +#include <QMediaRecorder> #include <QMutex> #include <QObject> #include <QPointer> @@ -109,9 +109,9 @@ public: // media recorder control QUrl outputLocation() const; bool setOutputLocation(const QUrl &location); - QMediaEncoder::RecorderState videoState() const; - void setVideoState(QMediaEncoder::RecorderState state); - QMediaEncoder::Status videoStatus() const; + QMediaRecorder::RecorderState videoState() const; + void setVideoState(QMediaRecorder::RecorderState state); + QMediaRecorder::Status videoStatus() const; qint64 duration() const; void applyVideoSettings(); @@ -142,8 +142,8 @@ Q_SIGNALS: void imageCaptureError(int id, int error, const QString &errorString); // media recorder control - void videoStateChanged(QMediaEncoder::RecorderState state); - void videoStatusChanged(QMediaEncoder::Status status); + void videoStateChanged(QMediaRecorder::RecorderState state); + void videoStatusChanged(QMediaRecorder::Status status); void durationChanged(qint64 duration); void actualLocationChanged(const QUrl &location); void videoError(int error, const QString &errorString); @@ -192,8 +192,8 @@ private: QImageEncoderSettings m_imageEncoderSettings; QString m_videoOutputLocation; - QMediaEncoder::RecorderState m_videoState; - QMediaEncoder::Status m_videoStatus; + QMediaRecorder::RecorderState m_videoState; + QMediaRecorder::Status m_videoStatus; QElapsedTimer m_videoRecordingDuration; QVideoEncoderSettings m_videoEncoderSettings; diff --git a/src/multimedia/platform/qplatformmediaencoder.cpp b/src/multimedia/platform/qplatformmediaencoder.cpp index cca014c1b..3e4e150d7 100644 --- a/src/multimedia/platform/qplatformmediaencoder.cpp +++ b/src/multimedia/platform/qplatformmediaencoder.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE and record, pause and stop recording via the \l setState() method. It also provides feedback on the \l {duration()}{duration} of the recording. - \sa QMediaEncoder + \sa QMediaRecorder */ @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE Constructs a media recorder control with the given \a parent. */ -QPlatformMediaEncoder::QPlatformMediaEncoder(QMediaEncoder *parent) +QPlatformMediaEncoder::QPlatformMediaEncoder(QMediaRecorder *parent) : q(parent) { } @@ -90,13 +90,13 @@ QPlatformMediaEncoder::QPlatformMediaEncoder(QMediaEncoder *parent) */ /*! - \fn QMediaEncoder::RecorderState QPlatformMediaEncoder::state() const + \fn QMediaRecorder::RecorderState QPlatformMediaEncoder::state() const Return the current recording state. */ /*! - \fn QMediaEncoder::Status QPlatformMediaEncoder::status() const + \fn QMediaRecorder::Status QPlatformMediaEncoder::status() const Return the current recording status. */ @@ -108,7 +108,7 @@ QPlatformMediaEncoder::QPlatformMediaEncoder(QMediaEncoder *parent) */ /*! - \fn void QPlatformMediaEncoder::setState(QMediaEncoder::RecorderState state) + \fn void QPlatformMediaEncoder::setState(QMediaRecorder::RecorderState state) Set the media recorder \a state. */ @@ -127,11 +127,11 @@ QPlatformMediaEncoder::QPlatformMediaEncoder(QMediaEncoder *parent) */ /*! - \fn void QPlatformMediaEncoder::stateChanged(QMediaEncoder::RecorderState state) + \fn void QPlatformMediaEncoder::stateChanged(QMediaRecorder::RecorderState state) Signals that the \a state of a media recorder has changed. */ -void QPlatformMediaEncoder::stateChanged(QMediaEncoder::RecorderState state) +void QPlatformMediaEncoder::stateChanged(QMediaRecorder::RecorderState state) { if (m_state == state) return; @@ -140,11 +140,11 @@ void QPlatformMediaEncoder::stateChanged(QMediaEncoder::RecorderState state) } /*! - \fn void QPlatformMediaEncoder::statusChanged(QMediaEncoder::Status status) + \fn void QPlatformMediaEncoder::statusChanged(QMediaRecorder::Status status) Signals that the \a status of a media recorder has changed. */ -void QPlatformMediaEncoder::statusChanged(QMediaEncoder::Status status) +void QPlatformMediaEncoder::statusChanged(QMediaRecorder::Status status) { if (m_status == status) return; @@ -183,13 +183,13 @@ void QPlatformMediaEncoder::actualLocationChanged(const QUrl &location) Signals that an \a error has occurred. The \a errorString describes the error. */ -void QPlatformMediaEncoder::error(QMediaEncoder::Error error, const QString &errorString) +void QPlatformMediaEncoder::error(QMediaRecorder::Error error, const QString &errorString) { if (error == m_error && errorString == m_errorString) return; m_error = error; m_errorString = errorString; - if (error != QMediaEncoder::NoError) + if (error != QMediaRecorder::NoError) emit q->errorOccurred(error, errorString); emit q->errorChanged(); } diff --git a/src/multimedia/platform/qplatformmediaencoder_p.h b/src/multimedia/platform/qplatformmediaencoder_p.h index 8e399dc56..102842dc1 100644 --- a/src/multimedia/platform/qplatformmediaencoder_p.h +++ b/src/multimedia/platform/qplatformmediaencoder_p.h @@ -53,7 +53,7 @@ #include <QtCore/qurl.h> -#include <QtMultimedia/qmediaencoder.h> +#include <QtMultimedia/qmediarecorder.h> #include <QtMultimedia/qmediametadata.h> QT_BEGIN_NAMESPACE @@ -73,10 +73,10 @@ public: virtual QUrl outputLocation() const = 0; virtual bool setOutputLocation(const QUrl &location) = 0; - virtual QMediaEncoder::RecorderState state() const { return m_state; } - virtual void setState(QMediaEncoder::RecorderState state) = 0; + virtual QMediaRecorder::RecorderState state() const { return m_state; } + virtual void setState(QMediaRecorder::RecorderState state) = 0; - virtual QMediaEncoder::Status status() const { return m_status; } + virtual QMediaRecorder::Status status() const { return m_status; } virtual qint64 duration() const = 0; @@ -86,30 +86,30 @@ public: virtual void setMetaData(const QMediaMetaData &) {} virtual QMediaMetaData metaData() const { return {}; } - QMediaEncoder::Error error() const { return m_error;} + QMediaRecorder::Error error() const { return m_error;} QString errorString() const { return m_errorString; } QUrl actualLocation() const { return m_actualLocation; } void clearActualLocation() { m_actualLocation.clear(); } - void clearError() { error(QMediaEncoder::NoError, QString()); } + void clearError() { error(QMediaRecorder::NoError, QString()); } protected: - explicit QPlatformMediaEncoder(QMediaEncoder *parent); + explicit QPlatformMediaEncoder(QMediaRecorder *parent); - void stateChanged(QMediaEncoder::RecorderState state); - void statusChanged(QMediaEncoder::Status status); + void stateChanged(QMediaRecorder::RecorderState state); + void statusChanged(QMediaRecorder::Status status); void durationChanged(qint64 position); void actualLocationChanged(const QUrl &location); - void error(QMediaEncoder::Error error, const QString &errorString); + void error(QMediaRecorder::Error error, const QString &errorString); void metaDataChanged(); private: - QMediaEncoder *q = nullptr; - QMediaEncoder::Error m_error = QMediaEncoder::NoError; + QMediaRecorder *q = nullptr; + QMediaRecorder::Error m_error = QMediaRecorder::NoError; QString m_errorString; QUrl m_actualLocation; - QMediaEncoder::RecorderState m_state = QMediaEncoder::StoppedState; - QMediaEncoder::Status m_status = QMediaEncoder::StoppedStatus; + QMediaRecorder::RecorderState m_state = QMediaRecorder::StoppedState; + QMediaRecorder::Status m_status = QMediaRecorder::StoppedStatus; }; QT_END_NAMESPACE diff --git a/src/multimedia/platform/qplatformmediaintegration_p.h b/src/multimedia/platform/qplatformmediaintegration_p.h index 2a4fc740a..9d28a9528 100644 --- a/src/multimedia/platform/qplatformmediaintegration_p.h +++ b/src/multimedia/platform/qplatformmediaintegration_p.h @@ -51,14 +51,14 @@ // #include <private/qtmultimediaglobal_p.h> -#include <qmediaencoder.h> +#include <qmediarecorder.h> QT_BEGIN_NAMESPACE class QMediaPlayer; class QAudioDecoder; class QCamera; -class QMediaEncoder; +class QMediaRecorder; class QCameraImageCapture; class QMediaDevices; class QPlatformMediaDevices; @@ -93,7 +93,7 @@ public: virtual QPlatformMediaCaptureSession *createCaptureSession() { return nullptr; } virtual QPlatformMediaPlayer *createPlayer(QMediaPlayer *) { return nullptr; } virtual QPlatformCamera *createCamera(QCamera *) { return nullptr; } - virtual QPlatformMediaEncoder *createEncoder(QMediaEncoder *) { return nullptr; } + virtual QPlatformMediaEncoder *createEncoder(QMediaRecorder *) { return nullptr; } virtual QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) { return nullptr; } virtual QPlatformAudioInput *createAudioInput(QAudioInput *); diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp index 536ba0176..1ecd8af0b 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp +++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -QWindowsMediaEncoder::QWindowsMediaEncoder(QMediaEncoder *parent) +QWindowsMediaEncoder::QWindowsMediaEncoder(QMediaRecorder *parent) : QObject(parent), QPlatformMediaEncoder(parent) { @@ -67,12 +67,12 @@ bool QWindowsMediaEncoder::setOutputLocation(const QUrl &location) return location.scheme() == QLatin1String("file") || location.scheme().isEmpty(); } -QMediaEncoder::RecorderState QWindowsMediaEncoder::state() const +QMediaRecorder::RecorderState QWindowsMediaEncoder::state() const { return m_state; } -QMediaEncoder::Status QWindowsMediaEncoder::status() const +QMediaRecorder::Status QWindowsMediaEncoder::status() const { return m_lastStatus; } @@ -95,7 +95,7 @@ void QWindowsMediaEncoder::applySettings() m_mediaDeviceSession->setVideoSettings(m_settings); } -void QWindowsMediaEncoder::setState(QMediaEncoder::RecorderState state) +void QWindowsMediaEncoder::setState(QMediaRecorder::RecorderState state) { if (!m_captureService || !m_mediaDeviceSession) { qWarning() << Q_FUNC_INFO << "Encoder is not set to a capture session"; @@ -106,21 +106,21 @@ void QWindowsMediaEncoder::setState(QMediaEncoder::RecorderState state) return; switch (state) { - case QMediaEncoder::RecordingState: + case QMediaRecorder::RecordingState: { m_mediaDeviceSession->setActive(true); if (!m_mediaDeviceSession->isActive() && !m_mediaDeviceSession->isActivating()) { - error(QMediaEncoder::ResourceError, tr("Failed to start recording")); + error(QMediaRecorder::ResourceError, tr("Failed to start recording")); return; } - if (m_state == QMediaEncoder::PausedState) { + if (m_state == QMediaRecorder::PausedState) { if (m_mediaDeviceSession->resumeRecording()) { - m_state = QMediaEncoder::RecordingState; + m_state = QMediaRecorder::RecordingState; stateChanged(m_state); } else { - error(QMediaEncoder::FormatError, tr("Failed to resume recording")); + error(QMediaRecorder::FormatError, tr("Failed to resume recording")); } } else { @@ -139,33 +139,33 @@ void QWindowsMediaEncoder::setState(QMediaEncoder::RecorderState state) if (m_mediaDeviceSession->startRecording(fileName, audioOnly)) { - m_state = QMediaEncoder::RecordingState; - m_lastStatus = QMediaEncoder::StartingStatus; + m_state = QMediaRecorder::RecordingState; + m_lastStatus = QMediaRecorder::StartingStatus; actualLocationChanged(QUrl::fromLocalFile(fileName)); stateChanged(m_state); statusChanged(m_lastStatus); } else { - error(QMediaEncoder::FormatError, tr("Failed to start recording")); + error(QMediaRecorder::FormatError, tr("Failed to start recording")); } } } break; - case QMediaEncoder::PausedState: + case QMediaRecorder::PausedState: { - if (m_state == QMediaEncoder::RecordingState) { + if (m_state == QMediaRecorder::RecordingState) { if (m_mediaDeviceSession->pauseRecording()) { - m_state = QMediaEncoder::PausedState; + m_state = QMediaRecorder::PausedState; stateChanged(m_state); } else { - error(QMediaEncoder::FormatError, tr("Failed to pause recording")); + error(QMediaRecorder::FormatError, tr("Failed to pause recording")); } } } break; - case QMediaEncoder::StoppedState: + case QMediaRecorder::StoppedState: { m_mediaDeviceSession->stopRecording(); - m_lastStatus = QMediaEncoder::FinalizingStatus; + m_lastStatus = QMediaRecorder::FinalizingStatus; statusChanged(m_lastStatus); // state will change in onRecordingStopped() } break; @@ -184,7 +184,7 @@ void QWindowsMediaEncoder::setCaptureSession(QPlatformMediaCaptureSession *sessi return; if (m_captureService) - setState(QMediaEncoder::StoppedState); + setState(QMediaRecorder::StoppedState); m_captureService = captureSession; if (!m_captureService) { @@ -212,13 +212,13 @@ void QWindowsMediaEncoder::onDurationChanged(qint64 duration) void QWindowsMediaEncoder::onStreamingError(int errorCode) { if (errorCode == MF_E_VIDEO_RECORDING_DEVICE_INVALIDATED) - error(QMediaEncoder::ResourceError, tr("Camera is no longer present")); + error(QMediaRecorder::ResourceError, tr("Camera is no longer present")); else - error(QMediaEncoder::ResourceError, tr("Streaming error")); + error(QMediaRecorder::ResourceError, tr("Streaming error")); - if (m_state != QMediaEncoder::StoppedState) { + if (m_state != QMediaRecorder::StoppedState) { m_mediaDeviceSession->stopRecording(); - m_lastStatus = QMediaEncoder::FinalizingStatus; + m_lastStatus = QMediaRecorder::FinalizingStatus; statusChanged(m_lastStatus); } } @@ -229,7 +229,7 @@ void QWindowsMediaEncoder::onCameraChanged() void QWindowsMediaEncoder::onRecordingStarted() { - m_lastStatus = QMediaEncoder::RecordingStatus; + m_lastStatus = QMediaRecorder::RecordingStatus; statusChanged(m_lastStatus); } @@ -237,8 +237,8 @@ void QWindowsMediaEncoder::onRecordingStopped() { auto lastState = m_state; auto lastStatus = m_lastStatus; - m_state = QMediaEncoder::StoppedState; - m_lastStatus = QMediaEncoder::StoppedStatus; + m_state = QMediaRecorder::StoppedState; + m_lastStatus = QMediaRecorder::StoppedStatus; if (m_state != lastState) stateChanged(m_state); if (m_lastStatus != lastStatus) diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h index e70e74ef2..ffa73b428 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h +++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h @@ -68,12 +68,12 @@ class QWindowsMediaEncoder : public QObject, public QPlatformMediaEncoder { Q_OBJECT public: - explicit QWindowsMediaEncoder(QMediaEncoder *parent); + explicit QWindowsMediaEncoder(QMediaRecorder *parent); QUrl outputLocation() const override; bool setOutputLocation(const QUrl &location) override; - QMediaEncoder::RecorderState state() const override; - QMediaEncoder::Status status() const override; + QMediaRecorder::RecorderState state() const override; + QMediaRecorder::Status status() const override; qint64 duration() const override; void applySettings() override; @@ -82,7 +82,7 @@ public: void setCaptureSession(QPlatformMediaCaptureSession *session); public Q_SLOTS: - void setState(QMediaEncoder::RecorderState state) override; + void setState(QMediaRecorder::RecorderState state) override; private Q_SLOTS: void onCameraChanged(); @@ -95,8 +95,8 @@ private: QWindowsMediaCaptureService *m_captureService = nullptr; QWindowsMediaDeviceSession *m_mediaDeviceSession = nullptr; QUrl m_outputLocation; - QMediaEncoder::RecorderState m_state = QMediaEncoder::StoppedState; - QMediaEncoder::Status m_lastStatus = QMediaEncoder::StoppedStatus; + QMediaRecorder::RecorderState m_state = QMediaRecorder::StoppedState; + QMediaRecorder::Status m_lastStatus = QMediaRecorder::StoppedStatus; QMediaEncoderSettings m_settings; QWindowsStorageLocation m_storageLocation; qint64 m_duration = 0; diff --git a/src/multimedia/platform/windows/qwindowsintegration.cpp b/src/multimedia/platform/windows/qwindowsintegration.cpp index 7a183b43a..7509205a4 100644 --- a/src/multimedia/platform/windows/qwindowsintegration.cpp +++ b/src/multimedia/platform/windows/qwindowsintegration.cpp @@ -108,7 +108,7 @@ QPlatformCamera *QWindowsIntegration::createCamera(QCamera *camera) return new QWindowsCamera(camera); } -QPlatformMediaEncoder *QWindowsIntegration::createEncoder(QMediaEncoder *encoder) +QPlatformMediaEncoder *QWindowsIntegration::createEncoder(QMediaRecorder *encoder) { return new QWindowsMediaEncoder(encoder); } diff --git a/src/multimedia/platform/windows/qwindowsintegration_p.h b/src/multimedia/platform/windows/qwindowsintegration_p.h index 03684720f..9d3c9b836 100644 --- a/src/multimedia/platform/windows/qwindowsintegration_p.h +++ b/src/multimedia/platform/windows/qwindowsintegration_p.h @@ -75,7 +75,7 @@ public: QPlatformAudioDecoder *createAudioDecoder(QAudioDecoder *decoder) override; QPlatformMediaPlayer *createPlayer(QMediaPlayer *parent) override; QPlatformCamera *createCamera(QCamera *camera) override; - QPlatformMediaEncoder *createEncoder(QMediaEncoder *encoder) override; + QPlatformMediaEncoder *createEncoder(QMediaRecorder *encoder) override; QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *imageCapture) override; QPlatformVideoSink *createVideoSink(QVideoSink *sink) override; diff --git a/src/multimedia/qmediaformat.cpp b/src/multimedia/qmediaformat.cpp index 4c4596cee..c91b23425 100644 --- a/src/multimedia/qmediaformat.cpp +++ b/src/multimedia/qmediaformat.cpp @@ -143,7 +143,7 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QMediaFormatPrivate); Describes an encoding format for a multimedia file or stream. You can check whether a certain QMediaFormat can be used for encoding - or decoding using QMediaDecoderInfo or QMediaEncoderInfo. + or decoding using QMediaDecoderInfo or QMediaRecorderInfo. */ // these are non inline to make a possible future addition of a d pointer binary compatible @@ -424,7 +424,7 @@ bool QMediaFormat::operator==(const QMediaFormat &other) const } /*! - Resolves the format to a format that is supported by QMediaEncoder. + Resolves the format to a format that is supported by QMediaRecorder. This method tries to find the best possible match for unspecified settings. Settings that are not supported by the encoder will be modified to the closest diff --git a/src/multimedia/recording/qmediacapturesession.cpp b/src/multimedia/recording/qmediacapturesession.cpp index 4c7838440..d82800e35 100644 --- a/src/multimedia/recording/qmediacapturesession.cpp +++ b/src/multimedia/recording/qmediacapturesession.cpp @@ -40,7 +40,7 @@ #include "qmediacapturesession.h" #include "qaudiodevice.h" #include "qcamera.h" -#include "qmediaencoder.h" +#include "qmediarecorder.h" #include "qcameraimagecapture.h" #include "qvideosink.h" @@ -62,7 +62,7 @@ public: QAudioOutput *audioOutput = nullptr; QCamera *camera = nullptr; QCameraImageCapture *imageCapture = nullptr; - QMediaEncoder *encoder = nullptr; + QMediaRecorder *encoder = nullptr; QVideoSink *videoSink = nullptr; QPointer<QObject> videoOutput; @@ -95,12 +95,12 @@ public: and heard by routing the audio to an output device using setAudioOutput(). You can capture still images from a camera by setting a QCameraImageCapture object on the capture session, - and record audio/video using a QMediaEncoder. + and record audio/video using a QMediaRecorder. - If you need a simple class that records media from the default camera and microphone, you can use QMediaEncoder. + If you need a simple class that records media from the default camera and microphone, you can use QMediaRecorder. That class uses a QMediaCaptureSession behind the scene to support audio and video capture. - \sa QCamera, QAudioDevice, QMediaEncoder, QCameraImageCapture, QMediaEncoder + \sa QCamera, QAudioDevice, QMediaRecorder, QCameraImageCapture, QMediaRecorder */ /*! @@ -220,16 +220,16 @@ void QMediaCaptureSession::setImageCapture(QCameraImageCapture *imageCapture) \brief the encoder object used to capture audio/video. - Add a QMediaEncoder object to the capture session to enable + Add a QMediaRecorder object to the capture session to enable recording of audio and/or video from the capture session. */ -QMediaEncoder *QMediaCaptureSession::encoder() +QMediaRecorder *QMediaCaptureSession::encoder() { return d_ptr->encoder; } -void QMediaCaptureSession::setEncoder(QMediaEncoder *encoder) +void QMediaCaptureSession::setEncoder(QMediaRecorder *encoder) { if (d_ptr->encoder == encoder) return; diff --git a/src/multimedia/recording/qmediacapturesession.h b/src/multimedia/recording/qmediacapturesession.h index ee096a147..8d662a3bd 100644 --- a/src/multimedia/recording/qmediacapturesession.h +++ b/src/multimedia/recording/qmediacapturesession.h @@ -50,7 +50,7 @@ class QAudioInput; class QAudioOutput; class QCameraDevice; class QCameraImageCapture; // ### rename to QMediaImageCapture -class QMediaEncoder; +class QMediaRecorder; class QPlatformMediaCaptureSession; class QVideoSink; @@ -61,7 +61,7 @@ class Q_MULTIMEDIA_EXPORT QMediaCaptureSession : public QObject Q_PROPERTY(QAudioInput *audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged) Q_PROPERTY(QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged) Q_PROPERTY(QCameraImageCapture *imageCapture READ imageCapture WRITE setImageCapture NOTIFY imageCaptureChanged) - Q_PROPERTY(QMediaEncoder *encoder READ encoder WRITE setEncoder NOTIFY encoderChanged) + Q_PROPERTY(QMediaRecorder *encoder READ encoder WRITE setEncoder NOTIFY encoderChanged) Q_PROPERTY(QObject *videoOutput READ videoOutput WRITE setVideoOutput NOTIFY videoOutputChanged) public: explicit QMediaCaptureSession(QObject *parent = nullptr); @@ -78,8 +78,8 @@ public: QCameraImageCapture *imageCapture(); void setImageCapture(QCameraImageCapture *imageCapture); - QMediaEncoder *encoder(); - void setEncoder(QMediaEncoder *recorder); + QMediaRecorder *encoder(); + void setEncoder(QMediaRecorder *recorder); void setVideoOutput(QObject *preview); QObject *videoOutput() const; diff --git a/src/multimedia/recording/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp index 1c24d4241..833155089 100644 --- a/src/multimedia/recording/qmediaencodersettings.cpp +++ b/src/multimedia/recording/qmediaencodersettings.cpp @@ -55,14 +55,14 @@ QT_BEGIN_NAMESPACE \ingroup multimedia_recording A media encoder settings object is used to specify the encoder - settings used by QMediaEncoder. Settings are selected by + settings used by QMediaRecorder. Settings are selected by constructing a QMediaEncoderSettings object specifying an output file format, - setting the desired properties and then passing it to a QMediaEncoder instance - using the QMediaEncoder::setEncoderSettings() function. + setting the desired properties and then passing it to a QMediaRecorder instance + using the QMediaRecorder::setEncoderSettings() function. \snippet multimedia-snippets/media.cpp Audio encoder settings - \sa QMediaEncoder + \sa QMediaRecorder */ class QMediaEncoderSettingsPrivate : public QSharedData @@ -201,7 +201,7 @@ void QMediaEncoderSettings::setQuality(Quality quality) } /*! - Resolves the format to a format that is supported by QMediaEncoder. + Resolves the format to a format that is supported by QMediaRecorder. This method tries to find the best possible match for unspecified settings. Settings that are not supported by the encoder will be modified to the closest diff --git a/src/multimedia/recording/qmediaencodersettings.h b/src/multimedia/recording/qmediaencodersettings.h index 99efabb00..7e24e2018 100644 --- a/src/multimedia/recording/qmediaencodersettings.h +++ b/src/multimedia/recording/qmediaencodersettings.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QMEDIAENCODERSETTINGS_H -#define QMEDIAENCODERSETTINGS_H +#ifndef QMediaEncoderSettings_H +#define QMediaEncoderSettings_H #include <QtCore/qsharedpointer.h> #include <QtCore/qstring.h> diff --git a/src/multimedia/recording/qmediaencoder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 545005cb1..24b1c21b4 100644 --- a/src/multimedia/recording/qmediaencoder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "qmediaencoder_p.h" +#include "qmediarecorder_p.h" #include <private/qplatformmediaencoder_p.h> #include <qaudiodevice.h> @@ -58,20 +58,20 @@ QT_BEGIN_NAMESPACE /*! - \class QMediaEncoder + \class QMediaRecorder \inmodule QtMultimedia \ingroup multimedia \ingroup multimedia_recording - \brief The QMediaEncoder class is used for the encoding and recording a capture session. + \brief The QMediaRecorder class is used for the encoding and recording a capture session. - The QMediaEncoder class is a class for encoding and recording media generated in a + The QMediaRecorder class is a class for encoding and recording media generated in a QMediaCaptureSession. \snippet multimedia-snippets/media.cpp Media encoder */ -void QMediaEncoderPrivate::applySettingsLater() +void QMediaRecorderPrivate::applySettingsLater() { if (control && !settingsChanged) { settingsChanged = true; @@ -79,7 +79,7 @@ void QMediaEncoderPrivate::applySettingsLater() } } -void QMediaEncoderPrivate::_q_applySettings() +void QMediaRecorderPrivate::_q_applySettings() { if (control && settingsChanged) { settingsChanged = false; @@ -91,11 +91,11 @@ void QMediaEncoderPrivate::_q_applySettings() Constructs a media encoder which records the media produced by a microphone and camera. */ -QMediaEncoder::QMediaEncoder(QObject *parent) +QMediaRecorder::QMediaRecorder(QObject *parent) : QObject(parent), - d_ptr(new QMediaEncoderPrivate) + d_ptr(new QMediaRecorderPrivate) { - Q_D(QMediaEncoder); + Q_D(QMediaRecorder); d->q_ptr = this; d->control = QPlatformMediaIntegration::instance()->createEncoder(this); } @@ -104,7 +104,7 @@ QMediaEncoder::QMediaEncoder(QObject *parent) Destroys a media encoder object. */ -QMediaEncoder::~QMediaEncoder() +QMediaRecorder::~QMediaRecorder() { if (d_ptr->captureSession) { if (d_ptr->captureSession->platformSession()) @@ -118,9 +118,9 @@ QMediaEncoder::~QMediaEncoder() /*! \internal */ -void QMediaEncoder::setCaptureSession(QMediaCaptureSession *session) +void QMediaRecorder::setCaptureSession(QMediaCaptureSession *session) { - Q_D(QMediaEncoder); + Q_D(QMediaRecorder); if (d->captureSession == session) return; @@ -139,7 +139,7 @@ void QMediaEncoder::setCaptureSession(QMediaCaptureSession *session) } /*! - \property QMediaEncoder::outputLocation + \property QMediaRecorder::outputLocation \brief the destination location of media content. Setting the location can fail, for example when the service supports only @@ -149,11 +149,11 @@ void QMediaEncoder::setCaptureSession(QMediaCaptureSession *session) The \a location can be relative or empty; in this case the encoder uses the system specific place and file naming scheme. - After recording has stated, QMediaEncoder::outputLocation() returns the actual output location. + After recording has stated, QMediaRecorder::outputLocation() returns the actual output location. */ /*! - \property QMediaEncoder::actualLocation + \property QMediaRecorder::actualLocation \brief the actual location of the last media content. The actual location is usually available after recording starts, @@ -165,19 +165,19 @@ void QMediaEncoder::setCaptureSession(QMediaCaptureSession *session) \sa availabilityChanged() */ -bool QMediaEncoder::isAvailable() const +bool QMediaRecorder::isAvailable() const { return d_func()->control != nullptr && d_func()->captureSession; } -QUrl QMediaEncoder::outputLocation() const +QUrl QMediaRecorder::outputLocation() const { return d_func()->control ? d_func()->control->outputLocation() : QUrl(); } -bool QMediaEncoder::setOutputLocation(const QUrl &location) +bool QMediaRecorder::setOutputLocation(const QUrl &location) { - Q_D(QMediaEncoder); + Q_D(QMediaRecorder); if (!d->control) return false; d->control->clearActualLocation(); @@ -186,32 +186,32 @@ bool QMediaEncoder::setOutputLocation(const QUrl &location) return false; } -QUrl QMediaEncoder::actualLocation() const +QUrl QMediaRecorder::actualLocation() const { - Q_D(const QMediaEncoder); + Q_D(const QMediaRecorder); return d->control ? d->control->actualLocation() : QUrl(); } /*! Returns the current media encoder state. - \sa QMediaEncoder::RecorderState + \sa QMediaRecorder::RecorderState */ -QMediaEncoder::RecorderState QMediaEncoder::recorderState() const +QMediaRecorder::RecorderState QMediaRecorder::recorderState() const { - return d_func()->control ? QMediaEncoder::RecorderState(d_func()->control->state()) : StoppedState; + return d_func()->control ? QMediaRecorder::RecorderState(d_func()->control->state()) : StoppedState; } /*! Returns the current media encoder status. - \sa QMediaEncoder::Status + \sa QMediaRecorder::Status */ -QMediaEncoder::Status QMediaEncoder::status() const +QMediaRecorder::Status QMediaRecorder::status() const { - Q_D(const QMediaEncoder); + Q_D(const QMediaRecorder); return d->control ? d->control->status() : UnavailableStatus; } @@ -221,11 +221,11 @@ QMediaEncoder::Status QMediaEncoder::status() const \sa errorString() */ -QMediaEncoder::Error QMediaEncoder::error() const +QMediaRecorder::Error QMediaRecorder::error() const { - Q_D(const QMediaEncoder); + Q_D(const QMediaRecorder); - return d->control ? d->control->error() : QMediaEncoder::ResourceError; + return d->control ? d->control->error() : QMediaRecorder::ResourceError; } /*! @@ -234,20 +234,20 @@ QMediaEncoder::Error QMediaEncoder::error() const \sa error() */ -QString QMediaEncoder::errorString() const +QString QMediaRecorder::errorString() const { - Q_D(const QMediaEncoder); + Q_D(const QMediaRecorder); - return d->control ? d->control->errorString() : tr("QMediaEncoder not supported on this platform"); + return d->control ? d->control->errorString() : tr("QMediaRecorder not supported on this platform"); } /*! - \property QMediaEncoder::duration + \property QMediaRecorder::duration \brief the recorded media duration in milliseconds. */ -qint64 QMediaEncoder::duration() const +qint64 QMediaRecorder::duration() const { return d_func()->control ? d_func()->control->duration() : 0; } @@ -257,9 +257,9 @@ qint64 QMediaEncoder::duration() const \sa QMediaEncoderSettings */ -void QMediaEncoder::setEncoderSettings(const QMediaEncoderSettings &settings) +void QMediaRecorder::setEncoderSettings(const QMediaEncoderSettings &settings) { - Q_D(QMediaEncoder); + Q_D(QMediaRecorder); if (d->encoderSettings == settings) return; @@ -276,7 +276,7 @@ void QMediaEncoder::setEncoderSettings(const QMediaEncoderSettings &settings) \sa QMediaEncoderSettings */ -QMediaEncoderSettings QMediaEncoder::encoderSettings() const +QMediaEncoderSettings QMediaRecorder::encoderSettings() const { return d_func()->encoderSettings; } @@ -284,17 +284,17 @@ QMediaEncoderSettings QMediaEncoder::encoderSettings() const /*! Start recording. - While the encoder state is changed immediately to QMediaEncoder::RecordingState, - recording may start asynchronously, with statusChanged(QMediaEncoder::RecordingStatus) + While the encoder state is changed immediately to QMediaRecorder::RecordingState, + recording may start asynchronously, with statusChanged(QMediaRecorder::RecordingStatus) signal emitted when recording starts. If recording fails error() signal is emitted - with encoder state being reset back to QMediaEncoder::StoppedState. + with encoder state being reset back to QMediaRecorder::StoppedState. */ -void QMediaEncoder::record() +void QMediaRecorder::record() { - Q_D(QMediaEncoder); + Q_D(QMediaRecorder); if (!d->control) return; @@ -306,40 +306,40 @@ void QMediaEncoder::record() d->control->clearError(); if (d->control && d->captureSession) - d->control->setState(QMediaEncoder::RecordingState); + d->control->setState(QMediaRecorder::RecordingState); } /*! Pause recording. - The encoder state is changed to QMediaEncoder::PausedState. + The encoder state is changed to QMediaRecorder::PausedState. Depending on platform recording pause may be not supported, in this case the encoder state stays unchanged. */ -void QMediaEncoder::pause() +void QMediaRecorder::pause() { - Q_D(QMediaEncoder); + Q_D(QMediaRecorder); if (d->control && d->captureSession) - d->control->setState(QMediaEncoder::PausedState); + d->control->setState(QMediaRecorder::PausedState); } /*! Stop recording. - The encoder state is changed to QMediaEncoder::StoppedState. + The encoder state is changed to QMediaRecorder::StoppedState. */ -void QMediaEncoder::stop() +void QMediaRecorder::stop() { - Q_D(QMediaEncoder); + Q_D(QMediaRecorder); if (d->control && d->captureSession) - d->control->setState(QMediaEncoder::StoppedState); + d->control->setState(QMediaRecorder::StoppedState); } /*! - \enum QMediaEncoder::RecorderState + \enum QMediaRecorder::RecorderState \value StoppedState The recorder is not active. If this is the state after recording then the actual created recording has @@ -351,7 +351,7 @@ void QMediaEncoder::stop() */ /*! - \enum QMediaEncoder::Status + \enum QMediaRecorder::Status \value UnavailableStatus The recorder is not available or not supported by connected media object. @@ -372,7 +372,7 @@ void QMediaEncoder::stop() */ /*! - \enum QMediaEncoder::Error + \enum QMediaRecorder::Error \value NoError No Errors. \value ResourceError Device is not ready or not available. @@ -381,7 +381,7 @@ void QMediaEncoder::stop() */ /*! - \property QMediaEncoder::RecorderState + \property QMediaRecorder::RecorderState \brief The current state of the media recorder. The state property represents the user request and is changed synchronously @@ -390,7 +390,7 @@ void QMediaEncoder::stop() */ /*! - \property QMediaEncoder::status + \property QMediaRecorder::status \brief The current status of the media recorder. The status is changed asynchronously and represents the actual status @@ -398,38 +398,38 @@ void QMediaEncoder::stop() */ /*! - \fn QMediaEncoder::recorderStateChanged(State state) + \fn QMediaRecorder::recorderStateChanged(State state) Signals that a media recorder's \a state has changed. */ /*! - \fn QMediaEncoder::durationChanged(qint64 duration) + \fn QMediaRecorder::durationChanged(qint64 duration) Signals that the \a duration of the recorded media has changed. */ /*! - \fn QMediaEncoder::actualLocationChanged(const QUrl &location) + \fn QMediaRecorder::actualLocationChanged(const QUrl &location) Signals that the actual \a location of the recorded media has changed. This signal is usually emitted when recording starts. */ /*! - \fn QMediaEncoder::error(QMediaEncoder::Error error) + \fn QMediaRecorder::error(QMediaRecorder::Error error) Signals that an \a error has occurred. */ /*! - \fn QMediaEncoder::availabilityChanged(bool available) + \fn QMediaRecorder::availabilityChanged(bool available) Signals that the media recorder is now available (if \a available is true), or not. */ /*! - \fn QMediaEncoder::mutedChanged(bool muted) + \fn QMediaRecorder::mutedChanged(bool muted) Signals that the \a muted state has changed. If true the recording is being muted. */ @@ -437,9 +437,9 @@ void QMediaEncoder::stop() /*! Returns the metaData associated with the recording. */ -QMediaMetaData QMediaEncoder::metaData() const +QMediaMetaData QMediaRecorder::metaData() const { - Q_D(const QMediaEncoder); + Q_D(const QMediaRecorder); return d->control ? d->control->metaData() : QMediaMetaData{}; } @@ -450,15 +450,15 @@ QMediaMetaData QMediaEncoder::metaData() const \note To ensure that meta data is set corretly, it should be set before starting the recording. Once the recording is stopped, any meta data set will be attached to the next recording. */ -void QMediaEncoder::setMetaData(const QMediaMetaData &metaData) +void QMediaRecorder::setMetaData(const QMediaMetaData &metaData) { - Q_D(QMediaEncoder); + Q_D(QMediaRecorder); if (d->control && d->captureSession) d->control->setMetaData(metaData); } -void QMediaEncoder::addMetaData(const QMediaMetaData &metaData) +void QMediaRecorder::addMetaData(const QMediaMetaData &metaData) { auto data = this->metaData(); // merge data @@ -468,7 +468,7 @@ void QMediaEncoder::addMetaData(const QMediaMetaData &metaData) } /*! - \fn QMediaEncoder::metaDataChanged() + \fn QMediaRecorder::metaDataChanged() Signals that a media object's meta-data has changed. @@ -477,12 +477,12 @@ void QMediaEncoder::addMetaData(const QMediaMetaData &metaData) for each of them with metaDataChanged() changed emitted once. */ -QMediaCaptureSession *QMediaEncoder::captureSession() const +QMediaCaptureSession *QMediaRecorder::captureSession() const { - Q_D(const QMediaEncoder); + Q_D(const QMediaRecorder); return d->captureSession; } QT_END_NAMESPACE -#include "moc_qmediaencoder.cpp" +#include "moc_qmediarecorder.cpp" diff --git a/src/multimedia/recording/qmediaencoder.h b/src/multimedia/recording/qmediarecorder.h index fdc48d839..a33988672 100644 --- a/src/multimedia/recording/qmediaencoder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QMEDIAENCODER_H -#define QMEDIAENCODER_H +#ifndef QMediaRecorder_H +#define QMediaRecorder_H #include <QtCore/qobject.h> #include <QtMultimedia/qtmultimediaglobal.h> @@ -58,17 +58,17 @@ class QCameraDevice; class QAudioDevice; class QMediaCaptureSession; -class QMediaEncoderPrivate; -class Q_MULTIMEDIA_EXPORT QMediaEncoder : public QObject +class QMediaRecorderPrivate; +class Q_MULTIMEDIA_EXPORT QMediaRecorder : public QObject { Q_OBJECT - Q_PROPERTY(QMediaEncoder::RecorderState recorderState READ recorderState NOTIFY recorderStateChanged) - Q_PROPERTY(QMediaEncoder::Status status READ status NOTIFY statusChanged) + Q_PROPERTY(QMediaRecorder::RecorderState recorderState READ recorderState NOTIFY recorderStateChanged) + Q_PROPERTY(QMediaRecorder::Status status READ status NOTIFY statusChanged) Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged) Q_PROPERTY(QUrl outputLocation READ outputLocation WRITE setOutputLocation) Q_PROPERTY(QUrl actualLocation READ actualLocation NOTIFY actualLocationChanged) Q_PROPERTY(QMediaMetaData metaData READ metaData WRITE setMetaData NOTIFY metaDataChanged) - Q_PROPERTY(QMediaEncoder::Error error READ error NOTIFY errorChanged) + Q_PROPERTY(QMediaRecorder::Error error READ error NOTIFY errorChanged) Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) Q_PROPERTY(QMediaEncoderSettings encoderSettings READ encoderSettings WRITE setEncoderSettings NOTIFY encoderSettingsChanged) @@ -100,8 +100,8 @@ public: }; Q_ENUM(Error) - QMediaEncoder(QObject *parent = nullptr); - ~QMediaEncoder(); + QMediaRecorder(QObject *parent = nullptr); + ~QMediaRecorder(); bool isAvailable() const; @@ -145,18 +145,18 @@ Q_SIGNALS: void metaDataChanged(); private: - QMediaEncoderPrivate *d_ptr; + QMediaRecorderPrivate *d_ptr; friend class QMediaCaptureSession; void setCaptureSession(QMediaCaptureSession *session); - Q_DISABLE_COPY(QMediaEncoder) - Q_DECLARE_PRIVATE(QMediaEncoder) + Q_DISABLE_COPY(QMediaRecorder) + Q_DECLARE_PRIVATE(QMediaRecorder) Q_PRIVATE_SLOT(d_func(), void _q_applySettings()) }; QT_END_NAMESPACE -Q_MEDIA_ENUM_DEBUG(QMediaEncoder, RecorderState) -Q_MEDIA_ENUM_DEBUG(QMediaEncoder, Status) -Q_MEDIA_ENUM_DEBUG(QMediaEncoder, Error) +Q_MEDIA_ENUM_DEBUG(QMediaRecorder, RecorderState) +Q_MEDIA_ENUM_DEBUG(QMediaRecorder, Status) +Q_MEDIA_ENUM_DEBUG(QMediaRecorder, Error) -#endif // QMEDIAENCODER_H +#endif // QMediaRecorder_H diff --git a/src/multimedia/recording/qmediaencoder_p.h b/src/multimedia/recording/qmediarecorder_p.h index a2c5e4725..d243b3ace 100644 --- a/src/multimedia/recording/qmediaencoder_p.h +++ b/src/multimedia/recording/qmediarecorder_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QMEDIAENCODER_P_H -#define QMEDIAENCODER_P_H +#ifndef QMediaRecorder_P_H +#define QMediaRecorder_P_H // // W A R N I N G @@ -51,7 +51,7 @@ // We mean it. // -#include "qmediaencoder.h" +#include "qmediarecorder.h" #include "qcamera.h" #include <QtCore/qurl.h> #include <QtCore/qpointer.h> @@ -64,12 +64,12 @@ class QAudioEncoderSettingsControl; class QVideoEncoderSettingsControl; class QTimer; -class QMediaEncoderPrivate +class QMediaRecorderPrivate { - Q_DECLARE_PUBLIC(QMediaEncoder) + Q_DECLARE_PUBLIC(QMediaRecorder) public: - QMediaEncoderPrivate() = default; + QMediaRecorderPrivate() = default; void applySettingsLater(); @@ -82,7 +82,7 @@ public: void _q_applySettings(); - QMediaEncoder *q_ptr = nullptr; + QMediaRecorder *q_ptr = nullptr; }; #undef Q_DECLARE_NON_CONST_PUBLIC diff --git a/src/multimediaquick/multimedia_plugin.cpp b/src/multimediaquick/multimedia_plugin.cpp index f79ac7827..01b374729 100644 --- a/src/multimediaquick/multimedia_plugin.cpp +++ b/src/multimediaquick/multimedia_plugin.cpp @@ -46,7 +46,7 @@ #include "qmediametadata.h" #include "qcamera.h" #include "qmediacapturesession.h" -#include "qmediaencoder.h" +#include "qmediarecorder.h" #include <private/qquickimagepreviewprovider_p.h> diff --git a/src/multimediaquick/qtmultimediaquicktypes_p.h b/src/multimediaquick/qtmultimediaquicktypes_p.h index ae950777b..dc53f6701 100644 --- a/src/multimediaquick/qtmultimediaquicktypes_p.h +++ b/src/multimediaquick/qtmultimediaquicktypes_p.h @@ -92,10 +92,10 @@ struct QCameraImageCaptureForeign QML_NAMED_ELEMENT(ImageCapture) }; -struct QMediaEncoderForeign +struct QMediaRecorderForeign { Q_GADGET - QML_FOREIGN(QMediaEncoder) + QML_FOREIGN(QMediaRecorder) QML_NAMED_ELEMENT(MediaEncoder) }; diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 5a653c1f8..428c06dcb 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -40,7 +40,7 @@ #include <qmediacapturesession.h> #include <qobject.h> #include <qmediadevices.h> -#include <qmediaencoder.h> +#include <qmediarecorder.h> QT_USE_NAMESPACE @@ -446,24 +446,26 @@ void tst_QCameraBackend::testVideoRecording_data() void tst_QCameraBackend::testVideoRecording() { + if (noCamera) + QSKIP("No camera available"); QFETCH(QCameraDevice, device); QMediaCaptureSession session; QScopedPointer<QCamera> camera(new QCamera(device)); session.setCamera(camera.data()); - QMediaEncoder recorder; + QMediaRecorder recorder; session.setEncoder(&recorder); QSignalSpy errorSignal(camera.data(), SIGNAL(errorOccurred(QCamera::Error, const QString &))); - QSignalSpy recorderErrorSignal(&recorder, SIGNAL(errorOccurred(QMediaEncoder::Error, const QString &))); - QSignalSpy recorderStatusSignal(&recorder, SIGNAL(statusChanged(QMediaEncoder::Status))); + QSignalSpy recorderErrorSignal(&recorder, SIGNAL(errorOccurred(Error, const QString &))); + QSignalSpy recorderStatusSignal(&recorder, SIGNAL(statusChanged(Status))); QMediaEncoderSettings videoSettings; videoSettings.setVideoResolution(320, 240); recorder.setEncoderSettings(videoSettings); - QCOMPARE(recorder.status(), QMediaEncoder::StoppedStatus); + QCOMPARE(recorder.status(), QMediaRecorder::StoppedStatus); camera->start(); if (noCamera || device.isNull()) { @@ -473,26 +475,26 @@ void tst_QCameraBackend::testVideoRecording() QTRY_VERIFY(camera->isActive()); QTRY_COMPARE(camera->status(), QCamera::ActiveStatus); - QTRY_COMPARE(recorder.status(), QMediaEncoder::StoppedStatus); + QTRY_COMPARE(recorder.status(), QMediaRecorder::StoppedStatus); for (int recordings = 0; recordings < 2; ++recordings) { //record 200ms clip recorder.record(); - QTRY_COMPARE(recorder.status(), QMediaEncoder::RecordingStatus); - QCOMPARE(recorderStatusSignal.last().first().value<QMediaEncoder::Status>(), recorder.status()); + QTRY_COMPARE(recorder.status(), QMediaRecorder::RecordingStatus); + QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status()); QTest::qWait(200); recorderStatusSignal.clear(); recorder.stop(); bool foundFinalizingStatus = false; for (auto &list : recorderStatusSignal) { - if (qvariant_cast<QMediaEncoder::Status>(list.first()) == QMediaEncoder::FinalizingStatus) { + if (qvariant_cast<QMediaRecorder::Status>(list.first()) == QMediaRecorder::FinalizingStatus) { foundFinalizingStatus = true; break; } } QVERIFY(foundFinalizingStatus); - QTRY_COMPARE(recorder.status(), QMediaEncoder::StoppedStatus); - QCOMPARE(recorderStatusSignal.last().first().value<QMediaEncoder::Status>(), recorder.status()); + QTRY_COMPARE(recorder.status(), QMediaRecorder::StoppedStatus); + QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status()); QVERIFY(errorSignal.isEmpty()); QVERIFY(recorderErrorSignal.isEmpty()); @@ -503,8 +505,8 @@ void tst_QCameraBackend::testVideoRecording() QVERIFY(QFileInfo(fileName).size() > 0); QFile(fileName).remove(); - QTRY_COMPARE(recorder.status(), QMediaEncoder::StoppedStatus); - QCOMPARE(recorderStatusSignal.last().first().value<QMediaEncoder::Status>(), recorder.status()); + QTRY_COMPARE(recorder.status(), QMediaRecorder::StoppedStatus); + QCOMPARE(recorderStatusSignal.last().first().value<QMediaRecorder::Status>(), recorder.status()); } } diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp index 69e5c8e05..614542042 100644 --- a/tests/auto/unit/mockbackend/qmockintegration.cpp +++ b/tests/auto/unit/mockbackend/qmockintegration.cpp @@ -99,7 +99,7 @@ QPlatformCameraImageCapture *QMockIntegration::createImageCapture(QCameraImageCa return new QMockImageCapture(capture); } -QPlatformMediaEncoder *QMockIntegration::createEncoder(QMediaEncoder *encoder) +QPlatformMediaEncoder *QMockIntegration::createEncoder(QMediaRecorder *encoder) { return new QMockMediaEncoder(encoder); } diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h index 1625c021f..e46b35713 100644 --- a/tests/auto/unit/mockbackend/qmockintegration_p.h +++ b/tests/auto/unit/mockbackend/qmockintegration_p.h @@ -74,7 +74,7 @@ public: QPlatformAudioDecoder *createAudioDecoder(QAudioDecoder *decoder) override; QPlatformMediaPlayer *createPlayer(QMediaPlayer *) override; QPlatformCamera *createCamera(QCamera *) override; - QPlatformMediaEncoder *createEncoder(QMediaEncoder *) override; + QPlatformMediaEncoder *createEncoder(QMediaRecorder *) override; QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) override; QPlatformMediaCaptureSession *createCaptureSession() override; QPlatformVideoSink *createVideoSink(QVideoSink *) override; diff --git a/tests/auto/unit/mockbackend/qmockmediaencoder.h b/tests/auto/unit/mockbackend/qmockmediaencoder.h index 0a9530a98..f49fc5e78 100644 --- a/tests/auto/unit/mockbackend/qmockmediaencoder.h +++ b/tests/auto/unit/mockbackend/qmockmediaencoder.h @@ -37,10 +37,10 @@ class QMockMediaEncoder : public QPlatformMediaEncoder { public: - QMockMediaEncoder(QMediaEncoder *parent): + QMockMediaEncoder(QMediaRecorder *parent): QPlatformMediaEncoder(parent), - m_state(QMediaEncoder::StoppedState), - m_status(QMediaEncoder::StoppedStatus), + m_state(QMediaRecorder::StoppedState), + m_status(QMediaRecorder::StoppedStatus), m_position(0), m_settingAppliedCount(0) { @@ -57,12 +57,12 @@ public: return true; } - QMediaEncoder::RecorderState state() const + QMediaRecorder::RecorderState state() const { return m_state; } - QMediaEncoder::Status status() const + QMediaRecorder::Status status() const { return m_status; } @@ -91,8 +91,8 @@ public: public: void record() { - m_state = QMediaEncoder::RecordingState; - m_status = QMediaEncoder::RecordingStatus; + m_state = QMediaRecorder::RecordingState; + m_status = QMediaRecorder::RecordingStatus; m_position=1; emit stateChanged(m_state); emit statusChanged(m_status); @@ -104,8 +104,8 @@ public: void pause() { - m_state = QMediaEncoder::PausedState; - m_status = QMediaEncoder::PausedStatus; + m_state = QMediaRecorder::PausedState; + m_status = QMediaRecorder::PausedStatus; emit stateChanged(m_state); emit statusChanged(m_status); } @@ -113,22 +113,22 @@ public: void stop() { m_position=0; - m_state = QMediaEncoder::StoppedState; - m_status = QMediaEncoder::StoppedStatus; + m_state = QMediaRecorder::StoppedState; + m_status = QMediaRecorder::StoppedStatus; emit stateChanged(m_state); emit statusChanged(m_status); } - void setState(QMediaEncoder::RecorderState state) + void setState(QMediaRecorder::RecorderState state) { switch (state) { - case QMediaEncoder::StoppedState: + case QMediaRecorder::StoppedState: stop(); break; - case QMediaEncoder::PausedState: + case QMediaRecorder::PausedState: pause(); break; - case QMediaEncoder::RecordingState: + case QMediaRecorder::RecordingState: record(); break; } @@ -137,8 +137,8 @@ public: public: QMediaMetaData m_metaData; QUrl m_sink; - QMediaEncoder::RecorderState m_state; - QMediaEncoder::Status m_status; + QMediaRecorder::RecorderState m_state; + QMediaRecorder::Status m_status; QMediaEncoderSettings m_settings; qint64 m_position; int m_settingAppliedCount; diff --git a/tests/auto/unit/multimedia/CMakeLists.txt b/tests/auto/unit/multimedia/CMakeLists.txt index 63c459cae..4ed5121f8 100644 --- a/tests/auto/unit/multimedia/CMakeLists.txt +++ b/tests/auto/unit/multimedia/CMakeLists.txt @@ -9,7 +9,7 @@ add_subdirectory(qcameradevice) add_subdirectory(qcameraimagecapture) add_subdirectory(qmediaplayer) add_subdirectory(qmediaplaylist) -add_subdirectory(qmediaencoder) +add_subdirectory(qmediarecorder) add_subdirectory(qmediatimerange) add_subdirectory(qvideoframe) add_subdirectory(qvideoframeformat) diff --git a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp index ac2136eb0..7fe79c36c 100644 --- a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp +++ b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp @@ -31,7 +31,7 @@ #include <qaudioformat.h> -#include <qmediaencoder.h> +#include <qmediarecorder.h> #include <private/qplatformmediaencoder_p.h> #include <qaudiodevice.h> #include <qaudiosource.h> @@ -53,13 +53,12 @@ public slots: void cleanup(); private slots: - void testNullControl(); void testAudioSource(); void testDevices(); void testAvailability(); private: - QMediaEncoder *encoder = nullptr; + QMediaRecorder *encoder = nullptr; QMockIntegration *mockIntegration; }; @@ -77,19 +76,10 @@ void tst_QAudioRecorder::cleanup() encoder = nullptr; } -void tst_QAudioRecorder::testNullControl() -{ - QMediaEncoder source; - auto *service = mockIntegration->lastCaptureService(); - service->hasControls = false; - - QVERIFY(source.isAvailable()); -} - void tst_QAudioRecorder::testAudioSource() { QMediaCaptureSession session; - encoder = new QMediaEncoder; + encoder = new QMediaRecorder; session.setEncoder(encoder); QCOMPARE(session.camera(), nullptr); @@ -97,7 +87,7 @@ void tst_QAudioRecorder::testAudioSource() void tst_QAudioRecorder::testDevices() { -// audiosource = new QMediaEncoder; +// audiosource = new QMediaRecorder; // QList<QAudioDevice> devices = mockIntegration->audioInputs(); // QVERIFY(devices.size() > 0); // QVERIFY(devices.at(0).id() == "device1"); @@ -114,7 +104,9 @@ void tst_QAudioRecorder::testDevices() void tst_QAudioRecorder::testAvailability() { - QMediaEncoder source; + QMediaCaptureSession session; + QMediaRecorder source; + session.setEncoder(&source); QVERIFY(source.isAvailable()); } diff --git a/tests/auto/unit/multimedia/qmediaencoder/CMakeLists.txt b/tests/auto/unit/multimedia/qmediarecorder/CMakeLists.txt index 71afe08d9..68234d7ab 100644 --- a/tests/auto/unit/multimedia/qmediaencoder/CMakeLists.txt +++ b/tests/auto/unit/multimedia/qmediarecorder/CMakeLists.txt @@ -1,12 +1,12 @@ -# Generated from QMediaEncoder.pro. +# Generated from QMediaRecorder.pro. ##################################################################### -## tst_QMediaEncoder Test: +## tst_QMediaRecorder Test: ##################################################################### -qt_internal_add_test(tst_qmediaencoder +qt_internal_add_test(tst_qmediarecorder SOURCES - tst_qmediaencoder.cpp + tst_qmediarecorder.cpp INCLUDE_DIRECTORIES ../../mockbackend PUBLIC_LIBRARIES diff --git a/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp index 9261c6115..ba80f9951 100644 --- a/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp +++ b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp @@ -32,7 +32,7 @@ #include <QDebug> #include <QtMultimedia/qmediametadata.h> #include <private/qplatformmediaencoder_p.h> -#include <qmediaencoder.h> +#include <qmediarecorder.h> #include <qaudioformat.h> #include <qmockintegration_p.h> #include <qmediacapturesession.h> @@ -42,7 +42,7 @@ QT_USE_NAMESPACE -class tst_QMediaEncoder : public QObject +class tst_QMediaRecorder : public QObject { Q_OBJECT @@ -85,22 +85,22 @@ private: QCamera *object = nullptr; QMockMediaCaptureSession *service = nullptr; QMockMediaEncoder *mock; - QMediaEncoder *encoder; + QMediaRecorder *encoder; }; -void tst_QMediaEncoder::initTestCase() +void tst_QMediaRecorder::initTestCase() { mockIntegration = new QMockIntegration; captureSession = new QMediaCaptureSession; object = new QCamera; - encoder = new QMediaEncoder; + encoder = new QMediaRecorder; captureSession->setCamera(object); captureSession->setEncoder(encoder); service = mockIntegration->lastCaptureService(); mock = service->mockControl; } -void tst_QMediaEncoder::cleanupTestCase() +void tst_QMediaRecorder::cleanupTestCase() { delete encoder; delete object; @@ -108,21 +108,21 @@ void tst_QMediaEncoder::cleanupTestCase() delete mockIntegration; } -void tst_QMediaEncoder::testBasicSession() +void tst_QMediaRecorder::testBasicSession() { QMediaCaptureSession session; QCamera camera; - QMediaEncoder recorder; + QMediaRecorder recorder; session.setCamera(&camera); session.setEncoder(&recorder); QCOMPARE(recorder.outputLocation(), QUrl()); - QCOMPARE(recorder.recorderState(), QMediaEncoder::StoppedState); - QCOMPARE(recorder.error(), QMediaEncoder::NoError); + QCOMPARE(recorder.recorderState(), QMediaRecorder::StoppedState); + QCOMPARE(recorder.error(), QMediaRecorder::NoError); QCOMPARE(recorder.duration(), qint64(0)); } -void tst_QMediaEncoder::testNullControls() +void tst_QMediaRecorder::testNullControls() { // With the new changes, hasControls does not make much sense anymore // since the session does not own the controls @@ -131,13 +131,13 @@ void tst_QMediaEncoder::testNullControls() QMediaCaptureSession session; // mockIntegration->lastCaptureService()->hasControls = false; QCamera camera; - QMediaEncoder recorder; + QMediaRecorder recorder; session.setCamera(&camera); // session.setEncoder(&recorder); QCOMPARE(recorder.outputLocation(), QUrl()); - QCOMPARE(recorder.recorderState(), QMediaEncoder::StoppedState); - QCOMPARE(recorder.error(), QMediaEncoder::NoError); + QCOMPARE(recorder.recorderState(), QMediaRecorder::StoppedState); + QCOMPARE(recorder.error(), QMediaRecorder::NoError); QCOMPARE(recorder.duration(), qint64(0)); recorder.setOutputLocation(QUrl("file://test/save/file.mp4")); @@ -158,29 +158,29 @@ void tst_QMediaEncoder::testNullControls() QCOMPARE(recorder.encoderSettings().videoCodec(), QMediaFormat::VideoCodec::VP9); QCOMPARE(recorder.encoderSettings().fileFormat(), QMediaFormat::MPEG4); - QSignalSpy spy(&recorder, SIGNAL(stateChanged(QMediaEncoder::RecorderState))); + QSignalSpy spy(&recorder, SIGNAL(recorderStateChanged(RecorderState))); recorder.record(); - QCOMPARE(recorder.recorderState(), QMediaEncoder::StoppedState); - QCOMPARE(recorder.error(), QMediaEncoder::NoError); + QCOMPARE(recorder.recorderState(), QMediaRecorder::StoppedState); + QCOMPARE(recorder.error(), QMediaRecorder::NoError); QCOMPARE(spy.count(), 0); recorder.pause(); - QCOMPARE(recorder.recorderState(), QMediaEncoder::StoppedState); - QCOMPARE(recorder.error(), QMediaEncoder::NoError); + QCOMPARE(recorder.recorderState(), QMediaRecorder::StoppedState); + QCOMPARE(recorder.error(), QMediaRecorder::NoError); QCOMPARE(spy.count(), 0); recorder.stop(); - QCOMPARE(recorder.recorderState(), QMediaEncoder::StoppedState); - QCOMPARE(recorder.error(), QMediaEncoder::NoError); + QCOMPARE(recorder.recorderState(), QMediaRecorder::StoppedState); + QCOMPARE(recorder.error(), QMediaRecorder::NoError); QCOMPARE(spy.count(), 0); } -void tst_QMediaEncoder::testDeleteMediaSource() +void tst_QMediaRecorder::testDeleteMediaSource() { QMediaCaptureSession session; QCamera *camera = new QCamera; - QMediaEncoder *recorder = new QMediaEncoder; + QMediaRecorder *recorder = new QMediaRecorder; session.setCamera(camera); session.setEncoder(recorder); @@ -195,24 +195,24 @@ void tst_QMediaEncoder::testDeleteMediaSource() delete recorder; } -void tst_QMediaEncoder::testError() +void tst_QMediaRecorder::testError() { const QString errorString(QLatin1String("format error")); - QSignalSpy spy(encoder, SIGNAL(errorOccurred(QMediaEncoder::Error, const QString&))); + QSignalSpy spy(encoder, SIGNAL(errorOccurred(Error, const QString&))); - QCOMPARE(encoder->error(), QMediaEncoder::NoError); + QCOMPARE(encoder->error(), QMediaRecorder::NoError); QCOMPARE(encoder->errorString(), QString()); - mock->error(QMediaEncoder::FormatError, errorString); - QCOMPARE(encoder->error(), QMediaEncoder::FormatError); + mock->error(QMediaRecorder::FormatError, errorString); + QCOMPARE(encoder->error(), QMediaRecorder::FormatError); QCOMPARE(encoder->errorString(), errorString); QCOMPARE(spy.count(), 1); - QCOMPARE(spy.last()[0].value<QMediaEncoder::Error>(), QMediaEncoder::FormatError); + QCOMPARE(spy.last()[0].value<QMediaRecorder::Error>(), QMediaRecorder::FormatError); } -void tst_QMediaEncoder::testSink() +void tst_QMediaRecorder::testSink() { encoder->setOutputLocation(QUrl("test.tmp")); QUrl s = encoder->outputLocation(); @@ -235,56 +235,56 @@ void tst_QMediaEncoder::testSink() QCOMPARE(encoder->actualLocation(), QUrl::fromLocalFile("default_name.mp4")); } -void tst_QMediaEncoder::testRecord() +void tst_QMediaRecorder::testRecord() { - QSignalSpy stateSignal(encoder,SIGNAL(stateChanged(QMediaEncoder::RecorderState))); - QSignalSpy statusSignal(encoder,SIGNAL(statusChanged(QMediaEncoder::Status))); + QSignalSpy stateSignal(encoder,SIGNAL(recorderStateChanged(RecorderState))); + QSignalSpy statusSignal(encoder,SIGNAL(statusChanged(Status))); QSignalSpy progressSignal(encoder, SIGNAL(durationChanged(qint64))); encoder->record(); - QCOMPARE(encoder->recorderState(), QMediaEncoder::RecordingState); - QCOMPARE(encoder->error(), QMediaEncoder::NoError); + QCOMPARE(encoder->recorderState(), QMediaRecorder::RecordingState); + QCOMPARE(encoder->error(), QMediaRecorder::NoError); QCOMPARE(encoder->errorString(), QString()); QCOMPARE(stateSignal.count(), 1); - QCOMPARE(stateSignal.last()[0].value<QMediaEncoder::RecorderState>(), QMediaEncoder::RecordingState); + QCOMPARE(stateSignal.last()[0].value<QMediaRecorder::RecorderState>(), QMediaRecorder::RecordingState); QTestEventLoop::instance().enterLoop(1); - QCOMPARE(encoder->status(), QMediaEncoder::RecordingStatus); + QCOMPARE(encoder->status(), QMediaRecorder::RecordingStatus); QVERIFY(!statusSignal.isEmpty()); - QCOMPARE(statusSignal.last()[0].value<QMediaEncoder::Status>(), QMediaEncoder::RecordingStatus); + QCOMPARE(statusSignal.last()[0].value<QMediaRecorder::Status>(), QMediaRecorder::RecordingStatus); statusSignal.clear(); QVERIFY(progressSignal.count() > 0); encoder->pause(); - QCOMPARE(encoder->recorderState(), QMediaEncoder::PausedState); + QCOMPARE(encoder->recorderState(), QMediaRecorder::PausedState); QCOMPARE(stateSignal.count(), 2); QTestEventLoop::instance().enterLoop(1); - QCOMPARE(encoder->status(), QMediaEncoder::PausedStatus); + QCOMPARE(encoder->status(), QMediaRecorder::PausedStatus); QVERIFY(!statusSignal.isEmpty()); - QCOMPARE(statusSignal.last()[0].value<QMediaEncoder::Status>(), QMediaEncoder::PausedStatus); + QCOMPARE(statusSignal.last()[0].value<QMediaRecorder::Status>(), QMediaRecorder::PausedStatus); statusSignal.clear(); encoder->stop(); - QCOMPARE(encoder->recorderState(), QMediaEncoder::StoppedState); + QCOMPARE(encoder->recorderState(), QMediaRecorder::StoppedState); QCOMPARE(stateSignal.count(), 3); QTestEventLoop::instance().enterLoop(1); - QCOMPARE(encoder->status(), QMediaEncoder::StoppedStatus); + QCOMPARE(encoder->status(), QMediaRecorder::StoppedStatus); QVERIFY(!statusSignal.isEmpty()); - QCOMPARE(statusSignal.last()[0].value<QMediaEncoder::Status>(), QMediaEncoder::StoppedStatus); + QCOMPARE(statusSignal.last()[0].value<QMediaRecorder::Status>(), QMediaRecorder::StoppedStatus); statusSignal.clear(); mock->stop(); QCOMPARE(stateSignal.count(), 3); } -void tst_QMediaEncoder::testEncodingSettings() +void tst_QMediaRecorder::testEncodingSettings() { QMediaEncoderSettings settings = encoder->encoderSettings(); QCOMPARE(settings.fileFormat(), QMediaFormat::UnspecifiedFormat); @@ -309,7 +309,7 @@ void tst_QMediaEncoder::testEncodingSettings() QCOMPARE(encoder->encoderSettings(), settings); } -void tst_QMediaEncoder::testAudioSettings() +void tst_QMediaRecorder::testAudioSettings() { QMediaEncoderSettings settings; QVERIFY(settings == QMediaEncoderSettings()); @@ -420,7 +420,7 @@ void tst_QMediaEncoder::testAudioSettings() QVERIFY(settings1 != settings2); } -void tst_QMediaEncoder::testVideoSettings() +void tst_QMediaRecorder::testVideoSettings() { QMediaEncoderSettings settings; QVERIFY(settings == QMediaEncoderSettings()); @@ -534,10 +534,10 @@ void tst_QMediaEncoder::testVideoSettings() QVERIFY(settings1 != settings2); } -void tst_QMediaEncoder::testSettingsApplied() +void tst_QMediaRecorder::testSettingsApplied() { QMediaCaptureSession session; - QMediaEncoder encoder; + QMediaRecorder encoder; session.setEncoder(&encoder); auto *mock = mockIntegration->lastCaptureService()->mockControl; @@ -564,11 +564,11 @@ void tst_QMediaEncoder::testSettingsApplied() encoder.stop(); } -void tst_QMediaEncoder::metaData() +void tst_QMediaRecorder::metaData() { QMediaCaptureSession session; QCamera camera; - QMediaEncoder recorder; + QMediaRecorder recorder; session.setCamera(&camera); session.setEncoder(&recorder); @@ -581,7 +581,7 @@ void tst_QMediaEncoder::metaData() QCOMPARE(recorder.metaData().value(QMediaMetaData::Author).toString(), QString::fromUtf8("John Doe")); } -void tst_QMediaEncoder::testAudioSettingsCopyConstructor() +void tst_QMediaRecorder::testAudioSettingsCopyConstructor() { /* create an object for AudioEncodersettings */ QMediaEncoderSettings audiosettings; @@ -606,7 +606,7 @@ void tst_QMediaEncoder::testAudioSettingsCopyConstructor() QVERIFY(other.quality() == audiosettings.quality()); } -void tst_QMediaEncoder::testAudioSettingsOperatorNotEqual() +void tst_QMediaRecorder::testAudioSettingsOperatorNotEqual() { /* create an object for AudioEncodersettings */ QMediaEncoderSettings audiosettings1; @@ -643,7 +643,7 @@ void tst_QMediaEncoder::testAudioSettingsOperatorNotEqual() QVERIFY(audiosettings2.encodingMode() != audiosettings1.encodingMode()); } -void tst_QMediaEncoder::testAudioSettingsOperatorEqual() +void tst_QMediaRecorder::testAudioSettingsOperatorEqual() { /* create an object for AudioEncodersettings */ QMediaEncoderSettings audiosettings1; @@ -672,7 +672,7 @@ void tst_QMediaEncoder::testAudioSettingsOperatorEqual() QVERIFY(audiosettings1 != audiosettings2); } -void tst_QMediaEncoder::testAudioSettingsOperatorAssign() +void tst_QMediaRecorder::testAudioSettingsOperatorAssign() { /* create an object for AudioEncodersettings */ @@ -697,42 +697,42 @@ void tst_QMediaEncoder::testAudioSettingsOperatorAssign() QVERIFY(audiosettings2.quality() == audiosettings1.quality()); } -void tst_QMediaEncoder::testIsAvailable() +void tst_QMediaRecorder::testIsAvailable() { { QMediaCaptureSession session; QCamera camera; - QMediaEncoder recorder; + QMediaRecorder recorder; session.setCamera(&camera); session.setEncoder(&recorder); QCOMPARE(recorder.isAvailable(), true); } { - QMediaEncoder recorder; + QMediaRecorder recorder; QCOMPARE(recorder.isAvailable(), false); } } -/* enum QMediaEncoder::ResourceError property test. */ -void tst_QMediaEncoder::testEnum() +/* enum QMediaRecorder::ResourceError property test. */ +void tst_QMediaRecorder::testEnum() { const QString errorString(QLatin1String("resource error")); - QSignalSpy spy(encoder, SIGNAL(errorOccurred(QMediaEncoder::Error, const QString&))); + QSignalSpy spy(encoder, SIGNAL(errorOccurred(Error, const QString&))); - QCOMPARE(encoder->error(), QMediaEncoder::NoError); + QCOMPARE(encoder->error(), QMediaRecorder::NoError); QCOMPARE(encoder->errorString(), QString()); - emit mock->error(QMediaEncoder::ResourceError, errorString); - QCOMPARE(encoder->error(), QMediaEncoder::ResourceError); + emit mock->error(QMediaRecorder::ResourceError, errorString); + QCOMPARE(encoder->error(), QMediaRecorder::ResourceError); QCOMPARE(encoder->errorString(), errorString); QCOMPARE(spy.count(), 1); - QCOMPARE(spy.last()[0].value<QMediaEncoder::Error>(), QMediaEncoder::ResourceError); + QCOMPARE(spy.last()[0].value<QMediaRecorder::Error>(), QMediaRecorder::ResourceError); } /* Test the QMediaEncoderSettings quality API*/ -void tst_QMediaEncoder::testVideoSettingsQuality() +void tst_QMediaRecorder::testVideoSettingsQuality() { /* Create the instance*/ QMediaEncoderSettings settings; @@ -756,7 +756,7 @@ void tst_QMediaEncoder::testVideoSettingsQuality() } /* Test QMediaEncoderSettings encodingMode */ -void tst_QMediaEncoder::testVideoSettingsEncodingMode() +void tst_QMediaRecorder::testVideoSettingsEncodingMode() { /* Create the instance*/ QMediaEncoderSettings settings; @@ -774,7 +774,7 @@ void tst_QMediaEncoder::testVideoSettingsEncodingMode() } /* Test QMediaEncoderSettings copy constructor */ -void tst_QMediaEncoder::testVideoSettingsCopyConstructor() +void tst_QMediaRecorder::testVideoSettingsCopyConstructor() { /* Create the instance and initialise it*/ QMediaEncoderSettings settings1; @@ -802,7 +802,7 @@ void tst_QMediaEncoder::testVideoSettingsCopyConstructor() } /* Test QMediaEncoderSettings Overloaded Operator assignment*/ -void tst_QMediaEncoder::testVideoSettingsOperatorAssignment() +void tst_QMediaRecorder::testVideoSettingsOperatorAssignment() { /* Create two instances.*/ QMediaEncoderSettings settings1; @@ -831,7 +831,7 @@ void tst_QMediaEncoder::testVideoSettingsOperatorAssignment() } /* Test QMediaEncoderSettings Overloaded OperatorNotEqual*/ -void tst_QMediaEncoder::testVideoSettingsOperatorNotEqual() +void tst_QMediaRecorder::testVideoSettingsOperatorNotEqual() { /* Create the instance and set the bit rate and Verify objects with OperatorNotEqual*/ QMediaEncoderSettings settings1; @@ -901,7 +901,7 @@ void tst_QMediaEncoder::testVideoSettingsOperatorNotEqual() } /* Test QMediaEncoderSettings Overloaded comparison operator*/ -void tst_QMediaEncoder::testVideoSettingsOperatorComparison() +void tst_QMediaRecorder::testVideoSettingsOperatorComparison() { /* Create the instance and set the bit rate and Verify objects with comparison operator*/ QMediaEncoderSettings settings1; @@ -971,5 +971,5 @@ void tst_QMediaEncoder::testVideoSettingsOperatorComparison() QCOMPARE(settings1 == settings2, false); } -QTEST_GUILESS_MAIN(tst_QMediaEncoder) -#include "tst_qmediaencoder.moc" +QTEST_GUILESS_MAIN(tst_QMediaRecorder) +#include "tst_qmediarecorder.moc" |