Rename QPlatformMediaRecoder to QPlatformMediaEncoder

Still need to rename darwin and qnx files and classes.

Change-Id: Ic2faa1612ac4fa95ef84f311855762dfae67fae0
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

30 files changed, 90 insertions, 90 deletions

diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index ffaa94b7b..6d29526a0 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -37,9 +37,9 @@ qt_internal_add_module(Multimedia
         platform/qplatformcamerafocus.cpp platform/qplatformcamerafocus_p.h
         platform/qplatformcameraimagecapture.cpp platform/qplatformcameraimagecapture_p.h
         platform/qplatformcameraimageprocessing.cpp platform/qplatformcameraimageprocessing_p.h
-        platform/qplatformmediarecorder.cpp platform/qplatformmediarecorder_p.h
         platform/qplatformmediacapture.cpp platform/qplatformmediacapture_p.h
         platform/qplatformmediadevicemanager.cpp platform/qplatformmediadevicemanager_p.h
+        platform/qplatformmediaencoder.cpp platform/qplatformmediaencoder_p.h
         platform/qplatformmediaformatinfo.cpp  platform/qplatformmediaformatinfo_p.h
         platform/qplatformmediaintegration.cpp platform/qplatformmediaintegration_p.h
         platform/qplatformmediaplayer.cpp platform/qplatformmediaplayer_p.h
@@ -252,7 +252,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND NOT use_
         platform/gstreamer/mediacapture/qgstreamermediacapture.cpp platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
         platform/gstreamer/mediacapture/qgstreamercapturesession.cpp platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
         platform/gstreamer/mediacapture/qgstreamercameraimagecapture.cpp platform/gstreamer/mediacapture/qgstreamercameraimagecapture_p.h
-        platform/gstreamer/mediacapture/qgstreamermediarecorder.cpp platform/gstreamer/mediacapture/qgstreamermediarecorder_p.h
+        platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h
     INCLUDE_DIRECTORIES
         platform/gstreamer/mediacapture
     DEFINES
@@ -327,7 +327,7 @@ qt_internal_extend_target(Multimedia CONDITION ANDROID
         platform/android/mediacapture/qandroidcameravideorenderercontrol.cpp platform/android/mediacapture/qandroidcameravideorenderercontrol_p.h
         platform/android/mediacapture/qandroidcaptureservice.cpp platform/android/mediacapture/qandroidcaptureservice_p.h
         platform/android/mediacapture/qandroidcapturesession.cpp platform/android/mediacapture/qandroidcapturesession_p.h
-        platform/android/mediacapture/qandroidmediarecordercontrol.cpp platform/android/mediacapture/qandroidmediarecordercontrol_p.h
+        platform/android/mediacapture/qandroidmediaencoder.cpp platform/android/mediacapture/qandroidmediaencoder_p.h
         platform/android/mediaplayer/qandroidmediaplayercontrol.cpp platform/android/mediaplayer/qandroidmediaplayercontrol_p.h
         platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol.cpp platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol_p.h
         platform/android/mediaplayer/qandroidmetadata.cpp platform/android/mediaplayer/qandroidmetadata_p.h
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
index f2a943fb7..738aa8051 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
@@ -40,7 +40,7 @@
 
 #include "qandroidcaptureservice_p.h"
 
-#include "qandroidmediarecordercontrol_p.h"
+#include "qandroidmediaencoder_p.h"
 #include "qandroidcapturesession_p.h"
 #include "qandroidcameracontrol_p.h"
 #include "qandroidcamerasession_p.h"
@@ -65,7 +65,7 @@ QAndroidCaptureService::QAndroidCaptureService(QMediaRecorder::CaptureMode mode)
     }
 
     m_captureSession = new QAndroidCaptureSession(m_cameraSession);
-    m_recorderControl = new QAndroidMediaRecorderControl(m_captureSession);
+    m_recorderControl = new QAndroidMediaEncoder(m_captureSession);
 }
 
 QAndroidCaptureService::~QAndroidCaptureService()
@@ -87,7 +87,7 @@ QPlatformCameraImageCapture *QAndroidCaptureService::imageCaptureControl()
     return m_imageCaptureControl;
 }
 
-QPlatformMediaRecorder *QAndroidCaptureService::mediaRecorderControl()
+QPlatformMediaEncoder *QAndroidCaptureService::mediaEncoder()
 {
     return m_recorderControl;
 }
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
index 6f48e9fa5..ab3707258 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QAndroidMediaRecorderControl;
+class QAndroidMediaEncoder;
 class QAndroidCaptureSession;
 class QAndroidCameraControl;
 class QAndroidCameraSession;
@@ -73,7 +73,7 @@ public:
 
     QPlatformCamera *cameraControl() override;
     QPlatformCameraImageCapture *imageCaptureControl() override;
-    QPlatformMediaRecorder *mediaRecorderControl() override;
+    QPlatformMediaEncoder *mediaEncoder() override;
 
     bool isMuted() const override;
     void setMuted(bool muted) override;
@@ -86,7 +86,7 @@ public:
 
     bool m_videoEnabled = false;
 
-    QAndroidMediaRecorderControl *m_recorderControl;
+    QAndroidMediaEncoder *m_recorderControl;
     QAndroidCaptureSession *m_captureSession;
     QAndroidCameraControl *m_cameraControl;
     QAndroidCameraSession *m_cameraSession;
diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp
index 92cdb14f4..9d56f9a44 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder.cpp
@@ -37,14 +37,14 @@
 **
 ****************************************************************************/
 
-#include "qandroidmediarecordercontrol_p.h"
+#include "qandroidmediaencoder_p.h"
 
 #include "qandroidcapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QAndroidMediaRecorderControl::QAndroidMediaRecorderControl(QAndroidCaptureSession *session)
-    : QPlatformMediaRecorder()
+QAndroidMediaEncoder::QAndroidMediaEncoder(QAndroidCaptureSession *session)
+    : QPlatformMediaEncoder()
     , m_session(session)
 {
     connect(m_session, SIGNAL(stateChanged(QMediaRecorder::State)), this, SIGNAL(stateChanged(QMediaRecorder::State)));
@@ -54,42 +54,42 @@ QAndroidMediaRecorderControl::QAndroidMediaRecorderControl(QAndroidCaptureSessio
     connect(m_session, SIGNAL(error(int,QString)), this, SIGNAL(error(int,QString)));
 }
 
-QUrl QAndroidMediaRecorderControl::outputLocation() const
+QUrl QAndroidMediaEncoder::outputLocation() const
 {
     return m_session->outputLocation();
 }
 
-bool QAndroidMediaRecorderControl::setOutputLocation(const QUrl &location)
+bool QAndroidMediaEncoder::setOutputLocation(const QUrl &location)
 {
     return m_session->setOutputLocation(location);
 }
 
-QMediaRecorder::State QAndroidMediaRecorderControl::state() const
+QMediaRecorder::State QAndroidMediaEncoder::state() const
 {
     return m_session->state();
 }
 
-QMediaRecorder::Status QAndroidMediaRecorderControl::status() const
+QMediaRecorder::Status QAndroidMediaEncoder::status() const
 {
     return m_session->status();
 }
 
-qint64 QAndroidMediaRecorderControl::duration() const
+qint64 QAndroidMediaEncoder::duration() const
 {
     return m_session->duration();
 }
 
-void QAndroidMediaRecorderControl::applySettings()
+void QAndroidMediaEncoder::applySettings()
 {
     m_session->applySettings();
 }
 
-void QAndroidMediaRecorderControl::setState(QMediaRecorder::State state)
+void QAndroidMediaEncoder::setState(QMediaRecorder::State state)
 {
     m_session->setState(state);
 }
 
-void QAndroidMediaRecorderControl::setEncoderSettings(const QMediaEncoderSettings &settings)
+void QAndroidMediaEncoder::setEncoderSettings(const QMediaEncoderSettings &settings)
 {
     m_session->setEncoderSettings(settings);
 }
diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h
index d94d15bf4..e2a117faa 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediaencoder_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QANDROIDMEDIARECORDERCONTROL_H
-#define QANDROIDMEDIARECORDERCONTROL_H
+#ifndef QANDROIDMEDIAENCODER_H
+#define QANDROIDMEDIAENCODER_H
 
 //
 //  W A R N I N G
@@ -51,17 +51,17 @@
 // We mean it.
 //
 
-#include <private/qplatformmediarecorder_p.h>
+#include <private/qplatformmediaencoder_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QAndroidCaptureSession;
 
-class QAndroidMediaRecorderControl : public QPlatformMediaRecorder
+class QAndroidMediaEncoder : public QPlatformMediaEncoder
 {
     Q_OBJECT
 public:
-    explicit QAndroidMediaRecorderControl(QAndroidCaptureSession *session);
+    explicit QAndroidMediaEncoder(QAndroidCaptureSession *session);
 
     QUrl outputLocation() const override;
     bool setOutputLocation(const QUrl &location) override;
@@ -81,4 +81,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QANDROIDMEDIARECORDERCONTROL_H
+#endif // QANDROIDMEDIAENCODER_H
diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice.mm b/src/multimedia/platform/darwin/camera/avfcameraservice.mm
index 795f1d98e..8bb4ea236 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraservice.mm
+++ b/src/multimedia/platform/darwin/camera/avfcameraservice.mm
@@ -100,7 +100,7 @@ QPlatformCameraImageCapture *AVFCameraService::imageCaptureControl()
     return m_imageCaptureControl;
 }
 
-QPlatformMediaRecorder *AVFCameraService::mediaRecorderControl()
+QPlatformMediaEncoder *AVFCameraService::mediaEncoder()
 {
     return m_recorderControl;
 }
diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
index 515bb40d7..6dd1d50a6 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
@@ -59,7 +59,7 @@
 
 QT_BEGIN_NAMESPACE
 class QPlatformCamera;
-class QPlatformMediaRecorder;
+class QPlatformMediaEncoder;
 class QPlatformCameraImageProcessing;
 class AVFCameraControl;
 class AVFImageCaptureControl;
@@ -79,7 +79,7 @@ public:
 
     QPlatformCamera *cameraControl() override;
     QPlatformCameraImageCapture *imageCaptureControl() override;
-    QPlatformMediaRecorder *mediaRecorderControl() override;
+    QPlatformMediaEncoder *mediaEncoder() override;
 
     bool isMuted() const override;
     void setMuted(bool muted) override;
diff --git a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
index 0136713b2..dc46a2233 100644
--- a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
+++ b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
@@ -86,7 +86,7 @@ bool qt_file_exists(NSURL *fileURL)
 }
 
 AVFMediaRecorderControl::AVFMediaRecorderControl(AVFCameraService *service, QObject *parent)
-    : QPlatformMediaRecorder(parent)
+    : QPlatformMediaEncoder(parent)
     , m_service(service)
     , m_state(QMediaRecorder::StoppedState)
     , m_lastStatus(QMediaRecorder::StoppedStatus)
diff --git a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_p.h b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_p.h
index 8a7dbd67a..feccbfbb1 100644
--- a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_p.h
+++ b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_p.h
@@ -56,7 +56,7 @@
 #include "avfcamerautility_p.h"
 #include "qaudiodeviceinfo.h"
 
-#include <private/qplatformmediarecorder_p.h>
+#include <private/qplatformmediaencoder_p.h>
 #include <private/qvideooutputorientationhandler_p.h>
 
 #include <QtCore/qglobal.h>
@@ -70,7 +70,7 @@ class AVFCameraService;
 class QString;
 class QUrl;
 
-class AVFMediaRecorderControl : public QPlatformMediaRecorder
+class AVFMediaRecorderControl : public QPlatformMediaEncoder
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
index 00fb90a45..3ff777df1 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
@@ -60,7 +60,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class CameraBinRecorder : public QPlatformMediaRecorder
+class CameraBinRecorder : public QPlatformMediaEncoder
 {
     Q_OBJECT
 
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp
index 4a9176db6..fc55aa709 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qgstreamercapturesession_p.h"
-#include "qgstreamermediarecorder_p.h"
+#include "qgstreamermediaencoder_p.h"
 #include "qgstreamercameraimagecapture_p.h"
 #include "private/qgstreamerdevicemanager_p.h"
 #include <qmediarecorder.h>
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
index d13949ad6..4578a1afc 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <private/qplatformmediarecorder_p.h>
+#include <private/qplatformmediaencoder_p.h>
 #include <qmediarecorder.h>
 #include <qaudiodeviceinfo.h>
 #include <qcamerainfo.h>
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
index 072dfb874..51065d486 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
@@ -39,7 +39,7 @@
 
 #include "qgstreamermediacapture_p.h"
 #include "qgstreamercapturesession_p.h"
-#include "qgstreamermediarecorder_p.h"
+#include "qgstreamermediaencoder_p.h"
 #include "qgstreamercamera_p.h"
 #include <private/qgstreamerbushelper_p.h>
 
@@ -74,7 +74,7 @@ QPlatformCameraImageCapture *QGstreamerMediaCapture::imageCaptureControl()
     return m_captureSession->imageCaptureControl();
 }
 
-QPlatformMediaRecorder *QGstreamerMediaCapture::mediaRecorderControl()
+QPlatformMediaEncoder *QGstreamerMediaCapture::mediaEncoder()
 {
     return m_captureSession->recorderControl();
 }
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
index a698d31c0..586c7f24a 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
@@ -76,7 +76,7 @@ public:
 
     QPlatformCamera *cameraControl() override;
     QPlatformCameraImageCapture *imageCaptureControl() override;
-    QPlatformMediaRecorder *mediaRecorderControl() override;
+    QPlatformMediaEncoder *mediaEncoder() override;
 
     bool isMuted() const override;
     void setMuted(bool) override;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediarecorder.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp
index dc13801b5..598cbbfa8 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediarecorder.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qgstreamermediarecorder_p.h"
+#include "qgstreamermediaencoder_p.h"
 #include <QtCore/QDebug>
 #include <QtGui/qdesktopservices.h>
 #include <QStandardPaths>
@@ -45,7 +45,7 @@
 #include <qmimetype.h>
 
 QGstreamerMediaRecorder::QGstreamerMediaRecorder(QGstreamerCaptureSession *session)
-    : QPlatformMediaRecorder(session),
+    : QPlatformMediaEncoder(session),
       m_session(session),
       m_state(QMediaRecorder::StoppedState),
       m_status(QMediaRecorder::StoppedStatus)
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediarecorder_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h
index 57eb070e5..afd9e78ad 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediarecorder_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h
@@ -54,14 +54,14 @@
 
 #include <QtCore/QDir>
 
-#include <private/qplatformmediarecorder_p.h>
+#include <private/qplatformmediaencoder_p.h>
 #include "qgstreamercapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
 class QMediaMetaData;
 
-class QGstreamerMediaRecorder : public QPlatformMediaRecorder
+class QGstreamerMediaRecorder : public QPlatformMediaEncoder
 {
     Q_OBJECT
 
diff --git a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp
index a5453a384..809e30827 100644
--- a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp
@@ -62,7 +62,7 @@ static audio_manager_device_t currentAudioInputDevice()
 }
 
 BbCameraMediaRecorderControl::BbCameraMediaRecorderControl(BbCameraSession *session, QObject *parent)
-    : QPlatformMediaRecorder(parent)
+    : QPlatformMediaEncoder(parent)
     , m_session(session)
 {
     connect(m_session, SIGNAL(videoStateChanged(QMediaRecorder::State)), this, SIGNAL(stateChanged(QMediaRecorder::State)));
diff --git a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h
index ca3039f95..40de8e474 100644
--- a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h
@@ -50,13 +50,13 @@
 // We mean it.
 //
 
-#include <private/qplatformmediarecorder_p.h>
+#include <private/qplatformmediaencoder_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class BbCameraSession;
 
-class BbCameraMediaRecorderControl : public QPlatformMediaRecorder
+class BbCameraMediaRecorderControl : public QPlatformMediaEncoder
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice.cpp b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
index 59b25a0a1..17789042a 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
@@ -83,7 +83,7 @@ QPlatformCameraImageCapture *BbCameraService::imageCaptureControl()
     return m_cameraImageCaptureControl;
 }
 
-QPlatformMediaRecorder *BbCameraService::mediaRecorderControl()
+QPlatformMediaEncoder *BbCameraService::mediaEncoder()
 {
     return m_cameraMediaRecorderControl;
 }
diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
index 25d40d42f..c2c0e1ddb 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
@@ -77,7 +77,7 @@ public:
 
     QPlatformCamera *cameraControl() override;
     QPlatformCameraImageCapture *imageCaptureControl() override;
-    QPlatformMediaRecorder *mediaRecorderControl() override;
+    QPlatformMediaEncoder *mediaEncoder() override;
 
     void setVideoPreview(QAbstractVideoSurface *surface) override;
 
diff --git a/src/multimedia/platform/qplatformmediacapture_p.h b/src/multimedia/platform/qplatformmediacapture_p.h
index 0c17f6c04..97151e651 100644
--- a/src/multimedia/platform/qplatformmediacapture_p.h
+++ b/src/multimedia/platform/qplatformmediacapture_p.h
@@ -56,7 +56,7 @@
 QT_BEGIN_NAMESPACE
 class QPlatformCamera;
 class QPlatformCameraImageCapture;
-class QPlatformMediaRecorder;
+class QPlatformMediaEncoder;
 class QAudioDeviceInfo;
 class QCameraInfo;
 class QAbstractVideoSurface;
@@ -70,7 +70,7 @@ public:
 
     virtual QPlatformCamera *cameraControl() = 0;
     virtual QPlatformCameraImageCapture *imageCaptureControl() = 0;
-    virtual QPlatformMediaRecorder *mediaRecorderControl() = 0;
+    virtual QPlatformMediaEncoder *mediaEncoder() = 0;
 
     virtual bool isMuted() const = 0;
     virtual void setMuted(bool muted) = 0;
diff --git a/src/multimedia/platform/qplatformmediarecorder.cpp b/src/multimedia/platform/qplatformmediaencoder.cpp
index 080a06eb1..7f5b41080 100644
--- a/src/multimedia/platform/qplatformmediarecorder.cpp
+++ b/src/multimedia/platform/qplatformmediaencoder.cpp
@@ -37,20 +37,20 @@
 **
 ****************************************************************************/
 
-#include "qplatformmediarecorder_p.h"
+#include "qplatformmediaencoder_p.h"
 
 QT_BEGIN_NAMESPACE
 
 
 /*!
-    \class QPlatformMediaRecorder
+    \class QPlatformMediaEncoder
     \obsolete
     \inmodule QtMultimedia
 
 
     \ingroup multimedia_control
 
-    \brief The QPlatformMediaRecorder class provides access to the recording
+    \brief The QPlatformMediaEncoder class provides access to the recording
     functionality.
 
     This control provides a means to set the \l {outputLocation()}{output location},
@@ -65,19 +65,19 @@ QT_BEGIN_NAMESPACE
     Constructs a media recorder control with the given \a parent.
 */
 
-QPlatformMediaRecorder::QPlatformMediaRecorder(QObject* parent)
+QPlatformMediaEncoder::QPlatformMediaEncoder(QObject* parent)
     : QObject(parent)
 {
 }
 
 /*!
-    \fn QUrl QPlatformMediaRecorder::outputLocation() const
+    \fn QUrl QPlatformMediaEncoder::outputLocation() const
 
     Returns the current output location being used.
 */
 
 /*!
-    \fn bool QPlatformMediaRecorder::setOutputLocation(const QUrl &location)
+    \fn bool QPlatformMediaEncoder::setOutputLocation(const QUrl &location)
 
     Sets the output \a location and returns if this operation is successful.
     If file at the output location already exists, it should be overwritten.
@@ -90,56 +90,56 @@ QPlatformMediaRecorder::QPlatformMediaRecorder(QObject* parent)
 */
 
 /*!
-    \fn QMediaRecorder::State QPlatformMediaRecorder::state() const
+    \fn QMediaRecorder::State QPlatformMediaEncoder::state() const
 
     Return the current recording state.
 */
 
 /*!
-    \fn QMediaRecorder::Status QPlatformMediaRecorder::status() const
+    \fn QMediaRecorder::Status QPlatformMediaEncoder::status() const
 
     Return the current recording status.
 */
 
 /*!
-    \fn qint64 QPlatformMediaRecorder::duration() const
+    \fn qint64 QPlatformMediaEncoder::duration() const
 
     Return the current duration in milliseconds.
 */
 
 /*!
-    \fn void QPlatformMediaRecorder::setState(QMediaRecorder::State state)
+    \fn void QPlatformMediaEncoder::setState(QMediaRecorder::State state)
 
     Set the media recorder \a state.
 */
 
 /*!
-    \fn void QPlatformMediaRecorder::applySettings()
+    \fn void QPlatformMediaEncoder::applySettings()
 
     Commits the encoder settings and performs pre-initialization to reduce delays when recording
     is started.
 */
 
 /*!
-    \fn bool QPlatformMediaRecorder::isMuted() const
+    \fn bool QPlatformMediaEncoder::isMuted() const
 
     Returns true if the recorder is muted, and false if it is not.
 */
 
 /*!
-    \fn void QPlatformMediaRecorder::setMuted(bool muted)
+    \fn void QPlatformMediaEncoder::setMuted(bool muted)
 
     Sets the \a muted state of a media recorder.
 */
 
 /*!
-    \fn qreal QPlatformMediaRecorder::volume() const
+    \fn qreal QPlatformMediaEncoder::volume() const
 
     Returns the audio volume of a media recorder control.
 */
 
 /*!
-    \fn void QPlatformMediaRecorder::setVolume(qreal volume)
+    \fn void QPlatformMediaEncoder::setVolume(qreal volume)
 
     Sets the audio \a volume of a media recorder control.
 
@@ -147,20 +147,20 @@ QPlatformMediaRecorder::QPlatformMediaRecorder(QObject* parent)
 */
 
 /*!
-    \fn void QPlatformMediaRecorder::stateChanged(QMediaRecorder::State state)
+    \fn void QPlatformMediaEncoder::stateChanged(QMediaRecorder::State state)
 
     Signals that the \a state of a media recorder has changed.
 */
 
 /*!
-    \fn void QPlatformMediaRecorder::statusChanged(QMediaRecorder::Status status)
+    \fn void QPlatformMediaEncoder::statusChanged(QMediaRecorder::Status status)
 
     Signals that the \a status of a media recorder has changed.
 */
 
 
 /*!
-    \fn void QPlatformMediaRecorder::durationChanged(qint64 duration)
+    \fn void QPlatformMediaEncoder::durationChanged(qint64 duration)
 
     Signals that the \a duration of the recorded media has changed.
 
@@ -168,30 +168,30 @@ QPlatformMediaRecorder::QPlatformMediaRecorder(QObject* parent)
 */
 
 /*!
-    \fn void QPlatformMediaRecorder::mutedChanged(bool muted)
+    \fn void QPlatformMediaEncoder::mutedChanged(bool muted)
 
     Signals that the \a muted state of a media recorder has changed.
 */
 
 /*!
-    \fn void QPlatformMediaRecorder::volumeChanged(qreal gain)
+    \fn void QPlatformMediaEncoder::volumeChanged(qreal gain)
 
     Signals that the audio \a gain value has changed.
 */
 
 /*!
-    \fn void QPlatformMediaRecorder::actualLocationChanged(const QUrl &location)
+    \fn void QPlatformMediaEncoder::actualLocationChanged(const QUrl &location)
 
     Signals that the actual media \a location has changed.
     This signal should be emitted at start of recording.
 */
 
 /*!
-    \fn void QPlatformMediaRecorder::error(int error, const QString &errorString)
+    \fn void QPlatformMediaEncoder::error(int error, const QString &errorString)
 
     Signals that an \a error has occurred.  The \a errorString describes the error.
 */
 
 QT_END_NAMESPACE
 
-#include "moc_qplatformmediarecorder_p.cpp"
+#include "moc_qplatformmediaencoder_p.cpp"
diff --git a/src/multimedia/platform/qplatformmediarecorder_p.h b/src/multimedia/platform/qplatformmediaencoder_p.h
index 5fa62618c..91cffdd67 100644
--- a/src/multimedia/platform/qplatformmediarecorder_p.h
+++ b/src/multimedia/platform/qplatformmediaencoder_p.h
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 // Required for QDoc workaround
 class QString;
 
-class Q_MULTIMEDIA_EXPORT QPlatformMediaRecorder : public QObject
+class Q_MULTIMEDIA_EXPORT QPlatformMediaEncoder : public QObject
 {
     Q_OBJECT
 
@@ -95,7 +95,7 @@ public Q_SLOTS:
     virtual void setState(QMediaRecorder::State state) = 0;
 
 protected:
-    explicit QPlatformMediaRecorder(QObject *parent = nullptr);
+    explicit QPlatformMediaEncoder(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/recording/qmediaencoder.cpp b/src/multimedia/recording/qmediaencoder.cpp
index 7f8b2c281..51a7ecaaa 100644
--- a/src/multimedia/recording/qmediaencoder.cpp
+++ b/src/multimedia/recording/qmediaencoder.cpp
@@ -39,7 +39,7 @@
 
 #include "qmediaencoder_p.h"
 
-#include <private/qplatformmediarecorder_p.h>
+#include <private/qplatformmediaencoder_p.h>
 #include <qaudiodeviceinfo.h>
 #include <qcamera.h>
 #include <qmediacapturesession.h>
@@ -164,7 +164,7 @@ void QMediaEncoder::setCaptureSession(QMediaCaptureSession *session)
         return;
     }
 
-    d->control = d->captureSession->platformSession()->mediaRecorderControl();
+    d->control = d->captureSession->platformSession()->mediaEncoder();
     Q_ASSERT(d->control);
 
     connect(d->control, SIGNAL(stateChanged(QMediaEncoder::State)),
diff --git a/src/multimedia/recording/qmediaencoder_p.h b/src/multimedia/recording/qmediaencoder_p.h
index a2f220dc8..b2e674ac1 100644
--- a/src/multimedia/recording/qmediaencoder_p.h
+++ b/src/multimedia/recording/qmediaencoder_p.h
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QPlatformMediaRecorder;
+class QPlatformMediaEncoder;
 class QMediaContainerControl;
 class QAudioEncoderSettingsControl;
 class QVideoEncoderSettingsControl;
@@ -75,7 +75,7 @@ public:
 
     QMediaCaptureSession *captureSession = nullptr;
 
-    QPlatformMediaRecorder *control = nullptr;
+    QPlatformMediaEncoder *control = nullptr;
 
     bool settingsChanged = false;
 
diff --git a/src/multimedia/recording/qmediarecorder_p.h b/src/multimedia/recording/qmediarecorder_p.h
index f1859d13a..878658346 100644
--- a/src/multimedia/recording/qmediarecorder_p.h
+++ b/src/multimedia/recording/qmediarecorder_p.h
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QPlatformMediaRecorder;
+class QPlatformMediaEncoder;
 class QMediaContainerControl;
 class QAudioEncoderSettingsControl;
 class QVideoEncoderSettingsControl;
diff --git a/tests/auto/unit/mockbackend/mockmediarecordercontrol.h b/tests/auto/unit/mockbackend/mockmediarecordercontrol.h
index fc5a44df4..d6aea3f9c 100644
--- a/tests/auto/unit/mockbackend/mockmediarecordercontrol.h
+++ b/tests/auto/unit/mockbackend/mockmediarecordercontrol.h
@@ -32,15 +32,15 @@
 #include <QUrl>
 #include <qaudiodeviceinfo.h>
 
-#include "private/qplatformmediarecorder_p.h"
+#include "private/qplatformmediaencoder_p.h"
 
-class MockMediaRecorderControl : public QPlatformMediaRecorder
+class MockMediaEncoderControl : public QPlatformMediaEncoder
 {
     Q_OBJECT
 
 public:
-    MockMediaRecorderControl(QObject *parent = 0):
-        QPlatformMediaRecorder(parent),
+    MockMediaEncoderControl(QObject *parent = 0):
+        QPlatformMediaEncoder(parent),
         m_state(QMediaRecorder::StoppedState),
         m_status(QMediaRecorder::StoppedStatus),
         m_position(0),
@@ -88,7 +88,7 @@ public:
     }
     virtual QMediaMetaData metaData() const { return m_metaData; }
 
-    using QPlatformMediaRecorder::error;
+    using QPlatformMediaEncoder::error;
 
 public slots:
     void record()
diff --git a/tests/auto/unit/mockbackend/mockmediarecorderservice.h b/tests/auto/unit/mockbackend/mockmediarecorderservice.h
index 769ccc770..17f326355 100644
--- a/tests/auto/unit/mockbackend/mockmediarecorderservice.h
+++ b/tests/auto/unit/mockbackend/mockmediarecorderservice.h
@@ -44,7 +44,7 @@ public:
     MockMediaRecorderService()
         : hasControls(true)
     {
-        mockControl = new MockMediaRecorderControl(this);
+        mockControl = new MockMediaEncoderControl(this);
         mockCameraControl = new MockCameraControl(this);
         mockExposureControl = new MockCameraExposureControl(this);
         mockFocusControl = new MockCameraFocusControl(this);
@@ -57,7 +57,7 @@ public:
 
     QPlatformCamera *cameraControl() override { return hasControls ? mockCameraControl : nullptr; }
     QPlatformCameraImageCapture *imageCaptureControl() override { return hasControls ? mockCaptureControl : nullptr; }
-    QPlatformMediaRecorder *mediaRecorderControl() override { return hasControls ? mockControl : nullptr; }
+    QPlatformMediaEncoder *mediaEncoder() override { return hasControls ? mockControl : nullptr; }
 
     void setVideoPreview(QAbstractVideoSurface *) override {}
 
@@ -100,7 +100,7 @@ public:
     MockCameraExposureControl *mockExposureControl;
     MockCameraFocusControl *mockFocusControl;
     MockImageProcessingControl *mockImageProcessingControl;
-    MockMediaRecorderControl *mockControl;
+    MockMediaEncoderControl *mockControl;
 
     QAudioDeviceInfo m_audioInput;
     bool m_muted = false;
diff --git a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
index 6bfcc55d0..4be4733cf 100644
--- a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
+++ b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
@@ -32,7 +32,7 @@
 #include <qaudioformat.h>
 
 #include <qmediaencoder.h>
-#include <private/qplatformmediarecorder_p.h>
+#include <private/qplatformmediaencoder_p.h>
 #include <qaudiodeviceinfo.h>
 #include <qaudioinput.h>
 #include <qmediacapturesession.h>
diff --git a/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp b/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp
index fd5e8e834..8523bd516 100644
--- a/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp
+++ b/tests/auto/unit/multimedia/qmediaencoder/tst_qmediaencoder.cpp
@@ -31,7 +31,7 @@
 #include <QtTest/QtTest>
 #include <QDebug>
 #include <QtMultimedia/qmediametadata.h>
-#include <private/qplatformmediarecorder_p.h>
+#include <private/qplatformmediaencoder_p.h>
 #include <qmediaencoder.h>
 #include <qaudioformat.h>
 #include <qmockintegration_p.h>
@@ -87,7 +87,7 @@ private:
     QMediaCaptureSession *captureSession;
     QCamera *object = nullptr;
     MockMediaRecorderService *service = nullptr;
-    MockMediaRecorderControl *mock;
+    MockMediaEncoderControl *mock;
     QMediaEncoder *capture;
 };