Get rid of the global enums in qmultimedia.h

Move the ones that are still used into the correct place.

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

25 files changed, 114 insertions, 297 deletions

diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 2a8a4eccc..31e723199 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -53,7 +53,6 @@ qt_internal_add_module(Multimedia
         qmediapluginloader.cpp qmediapluginloader_p.h
         qmediastoragelocation.cpp qmediastoragelocation_p.h
         qmediatimerange.cpp qmediatimerange.h
-        qmultimedia.cpp qmultimedia.h
         qmultimediautils.cpp qmultimediautils_p.h
         qtmultimediaglobal.h qtmultimediaglobal_p.h
         recording/qmediaencodersettings.cpp recording/qmediaencodersettings.h
diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h
index 3f2b5416d..3b4696dfd 100644
--- a/src/multimedia/audio/qaudio.h
+++ b/src/multimedia/audio/qaudio.h
@@ -42,7 +42,6 @@
 #define QAUDIO_H
 
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 
 #include <QtCore/qmetatype.h>
 
diff --git a/src/multimedia/audio/qaudiobuffer.h b/src/multimedia/audio/qaudiobuffer.h
index 50ec92a43..62571d4da 100644
--- a/src/multimedia/audio/qaudiobuffer.h
+++ b/src/multimedia/audio/qaudiobuffer.h
@@ -43,7 +43,6 @@
 #include <QtCore/qshareddata.h>
 
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>
diff --git a/src/multimedia/audio/qaudiobuffer_p.h b/src/multimedia/audio/qaudiobuffer_p.h
index e770989f2..53f627250 100644
--- a/src/multimedia/audio/qaudiobuffer_p.h
+++ b/src/multimedia/audio/qaudiobuffer_p.h
@@ -52,7 +52,6 @@
 //
 
 #include <qtmultimediaglobal.h>
-#include <qmultimedia.h>
 
 #include "qaudioformat.h"
 
diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h
index aaba9ffac..6029d244c 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.h
+++ b/src/multimedia/audio/qaudiodeviceinfo.h
@@ -48,7 +48,6 @@
 #include <QtCore/qlist.h>
 
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>
diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h
index 04d6eb560..13a5ea0f2 100644
--- a/src/multimedia/audio/qaudioformat.h
+++ b/src/multimedia/audio/qaudioformat.h
@@ -45,7 +45,6 @@
 #include <QtCore/qshareddata.h>
 
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h
index 1f1b84fb5..df7a52b90 100644
--- a/src/multimedia/audio/qaudioinput.h
+++ b/src/multimedia/audio/qaudioinput.h
@@ -44,7 +44,6 @@
 #include <QtCore/qiodevice.h>
 
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>
diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h
index 8c3c2a831..bcb76487f 100644
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/src/multimedia/audio/qaudiooutput.h
@@ -44,7 +44,6 @@
 #include <QtCore/qiodevice.h>
 
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>
diff --git a/src/multimedia/audio/qaudiosystem_p.h b/src/multimedia/audio/qaudiosystem_p.h
index efc7ade28..41c63ea5a 100644
--- a/src/multimedia/audio/qaudiosystem_p.h
+++ b/src/multimedia/audio/qaudiosystem_p.h
@@ -52,7 +52,6 @@
 //
 
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index 35c5e842f..19a4c84a8 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -194,16 +194,6 @@ bool QCameraImageCapture::isAvailable() const
 }
 
 /*!
-    Returns the availability of this functionality.
-*/
-QMultimedia::AvailabilityStatus QCameraImageCapture::availability() const
-{
-    if (d_func()->control != nullptr)
-        return QMultimedia::Available;
-    return QMultimedia::ServiceMissing;
-}
-
-/*!
     Returns the current error state.
 
     \sa errorString()
diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h
index 1ca4111bc..785ab1d78 100644
--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
@@ -86,7 +86,6 @@ public:
     ~QCameraImageCapture();
 
     bool isAvailable() const;
-    QMultimedia::AvailabilityStatus availability() const;
 
     QCamera *camera() const;
 
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
index a4dc3156d..2f10a5e58 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
@@ -229,9 +229,9 @@ void MediaExample::MediaRecorder()
     //! [Media recorder]
     recorder = new QMediaRecorder(camera);
 
-    QAudioEncoderSettings audioSettings;
-    audioSettings.setCodec("audio/amr");
-    audioSettings.setQuality(QMultimedia::HighQuality);
+    QMediaEncoderSettings audioSettings;
+    audioSettings.setFormat(QMediaEncoderSettings::MP3);
+    audioSettings.setQuality(QMediaEncoderSettings::HighQuality);
 
     recorder->setAudioSettings(audioSettings);
 
@@ -245,9 +245,9 @@ void MediaExample::AudioRecorder()
     //! [Audio recorder]
     audioRecorder = new QAudioRecorder;
 
-    QAudioEncoderSettings audioSettings;
-    audioSettings.setCodec("audio/amr");
-    audioSettings.setQuality(QMultimedia::HighQuality);
+    QMediaEncoderSettings audioSettings;
+    audioSettings.setFormat(QMediaEncoderSettings::MP3);
+    audioSettings.setQuality(QMediaEncoderSettings::HighQuality);
 
     audioRecorder->setEncodingSettings(audioSettings);
 
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
index 20be56916..35d8b7c34 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
@@ -518,19 +518,19 @@ void QAndroidCameraSession::applyImageSettings()
 
     int jpegQuality = 100;
     switch (m_requestedImageSettings.quality()) {
-    case QMultimedia::VeryLowQuality:
+    case QImageEncoderSettings::VeryLowQuality:
         jpegQuality = 20;
         break;
-    case QMultimedia::LowQuality:
+    case QImageEncoderSettings::LowQuality:
         jpegQuality = 40;
         break;
-    case QMultimedia::NormalQuality:
+    case QImageEncoderSettings::NormalQuality:
         jpegQuality = 60;
         break;
-    case QMultimedia::HighQuality:
+    case QImageEncoderSettings::HighQuality:
         jpegQuality = 80;
         break;
-    case QMultimedia::VeryHighQuality:
+    case QImageEncoderSettings::VeryHighQuality:
         jpegQuality = 100;
         break;
     }
diff --git a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
index cf988783a..a8778e459 100644
--- a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
+++ b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
@@ -244,22 +244,22 @@ static NSDictionary *avfAudioSettings(const QMediaEncoderSettings &encoderSettin
     [settings setObject:[NSNumber numberWithInt:codecId] forKey:AVFormatIDKey];
 
 #ifdef Q_OS_OSX
-    if (encoderSettings.encodingMode() == QMultimedia::ConstantQualityEncoding) {
+    if (encoderSettings.encodingMode() == QMediaEncoderSettings::ConstantQualityEncoding) {
         int quality;
         switch (encoderSettings.quality()) {
-        case QMultimedia::VeryLowQuality:
+        case QMediaEncoderSettings::VeryLowQuality:
             quality = AVAudioQualityMin;
             break;
-        case QMultimedia::LowQuality:
+        case QMediaEncoderSettings::LowQuality:
             quality = AVAudioQualityLow;
             break;
-        case QMultimedia::HighQuality:
+        case QMediaEncoderSettings::HighQuality:
             quality = AVAudioQualityHigh;
             break;
-        case QMultimedia::VeryHighQuality:
+        case QMediaEncoderSettings::VeryHighQuality:
             quality = AVAudioQualityMax;
             break;
-        case QMultimedia::NormalQuality:
+        case QMediaEncoderSettings::NormalQuality:
         default:
             quality = AVAudioQualityMedium;
             break;
@@ -417,22 +417,22 @@ NSDictionary *avfVideoSettings(QMediaEncoderSettings &encoderSettings, AVCapture
     int bitrate = -1;
     float quality = -1.f;
 
-    if (encoderSettings.encodingMode() == QMultimedia::ConstantQualityEncoding) {
-        if (encoderSettings.quality() != QMultimedia::NormalQuality) {
+    if (encoderSettings.encodingMode() == QMediaEncoderSettings::ConstantQualityEncoding) {
+        if (encoderSettings.quality() != QMediaEncoderSettings::NormalQuality) {
             if (codec != QMediaFormat::VideoCodec::MotionJPEG) {
                 qWarning("ConstantQualityEncoding is not supported for MotionJPEG");
             } else {
                 switch (encoderSettings.quality()) {
-                case QMultimedia::VeryLowQuality:
+                case QMediaEncoderSettings::VeryLowQuality:
                     quality = 0.f;
                     break;
-                case QMultimedia::LowQuality:
+                case QMediaEncoderSettings::LowQuality:
                     quality = 0.25f;
                     break;
-                case QMultimedia::HighQuality:
+                case QMediaEncoderSettings::HighQuality:
                     quality = 0.75f;
                     break;
-                case QMultimedia::VeryHighQuality:
+                case QMediaEncoderSettings::VeryHighQuality:
                     quality = 1.f;
                     break;
                 default:
@@ -441,7 +441,7 @@ NSDictionary *avfVideoSettings(QMediaEncoderSettings &encoderSettings, AVCapture
                 }
             }
         }
-    } else if (encoderSettings.encodingMode() == QMultimedia::AverageBitRateEncoding){
+    } else if (encoderSettings.encodingMode() == QMediaEncoderSettings::AverageBitRateEncoding){
         if (codec != QMediaFormat::VideoCodec::H264 && codec != QMediaFormat::VideoCodec::H265)
             qWarning() << "AverageBitRateEncoding is not supported for codec" <<  QMediaFormat::videoCodecName(codec);
         else
diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
index 8493a236e..2f1d45672 100644
--- a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
@@ -965,19 +965,19 @@ void BbCameraSession::applyConfiguration()
 
         int jpegQuality = 100;
         switch (m_imageEncoderSettings.quality()) {
-        case QMultimedia::VeryLowQuality:
+        case QMediaEncoderSettings::VeryLowQuality:
             jpegQuality = 20;
             break;
-        case QMultimedia::LowQuality:
+        case QMediaEncoderSettings::LowQuality:
             jpegQuality = 40;
             break;
-        case QMultimedia::NormalQuality:
+        case QMediaEncoderSettings::NormalQuality:
             jpegQuality = 60;
             break;
-        case QMultimedia::HighQuality:
+        case QMediaEncoderSettings::HighQuality:
             jpegQuality = 80;
             break;
-        case QMultimedia::VeryHighQuality:
+        case QMediaEncoderSettings::VeryHighQuality:
             jpegQuality = 100;
             break;
         }
diff --git a/src/multimedia/qmediaformat.h b/src/multimedia/qmediaformat.h
index 6b3684ab6..3b8b9d9ce 100644
--- a/src/multimedia/qmediaformat.h
+++ b/src/multimedia/qmediaformat.h
@@ -42,7 +42,6 @@
 
 #include <QtCore/qsharedpointer.h>
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h
index 97524f24a..2793a6d6d 100644
--- a/src/multimedia/qmediatimerange.h
+++ b/src/multimedia/qmediatimerange.h
@@ -41,7 +41,6 @@
 #define QMEDIATIMERANGE_H
 
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 #include <QtCore/qshareddata.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/qmultimedia.cpp b/src/multimedia/qmultimedia.cpp
deleted file mode 100644
index 7308f6389..000000000
--- a/src/multimedia/qmultimedia.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmultimedia.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \namespace QMultimedia
-    \ingroup multimedia-namespaces
-    \ingroup multimedia
-    \inmodule QtMultimedia
-
-    \ingroup multimedia
-    \ingroup multimedia_core
-
-    \brief The QMultimedia namespace contains miscellaneous identifiers used throughout the Qt Multimedia library.
-
-*/
-
-/*!
-    \enum QMultimedia::SupportEstimate
-
-    Enumerates the levels of support a media service provider may have for a feature.
-
-    \value NotSupported The feature is not supported.
-    \value MaybeSupported The feature may be supported.
-    \value ProbablySupported The feature is probably supported.
-    \value PreferredService The service is the preferred provider of a service.
-*/
-
-/*!
-    \enum QMultimedia::EncodingQuality
-
-    Enumerates quality encoding levels.
-
-    \value VeryLowQuality
-    \value LowQuality
-    \value NormalQuality
-    \value HighQuality
-    \value VeryHighQuality
-*/
-
-/*!
-    \enum QMultimedia::EncodingMode
-
-    Enumerates encoding modes.
-
-    \value ConstantQualityEncoding Encoding will aim to have a constant quality, adjusting bitrate to fit.
-    \value ConstantBitRateEncoding Encoding will use a constant bit rate, adjust quality to fit.
-    \value AverageBitRateEncoding Encoding will try to keep an average bitrate setting, but will use
-            more or less as needed.
-    \value TwoPassEncoding The media will first be processed to determine the characteristics,
-            and then processed a second time allocating more bits to the areas
-            that need it.
-*/
-
-/*!
-    \enum QMultimedia::AvailabilityStatus
-
-    Enumerates Service status errors.
-
-    \value Available The service is operating correctly.
-    \value ServiceMissing There is no service available to provide the requested functionality.
-    \value ResourceError The service could not allocate resources required to function correctly.
-    \value Busy The service must wait for access to necessary resources.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/multimedia/qmultimedia.h b/src/multimedia/qmultimedia.h
deleted file mode 100644
index 535a913e6..000000000
--- a/src/multimedia/qmultimedia.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMULTIMEDIA_H
-#define QMULTIMEDIA_H
-
-#include <QtCore/qpair.h>
-#include <QtCore/qmetatype.h>
-#include <QtCore/qstring.h>
-
-#include <QtMultimedia/qtmultimediaglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace QMultimedia
-{
-    enum SupportEstimate
-    {
-        NotSupported,
-        MaybeSupported,
-        ProbablySupported,
-        PreferredService
-    };
-
-    enum EncodingQuality
-    {
-        VeryLowQuality,
-        LowQuality,
-        NormalQuality,
-        HighQuality,
-        VeryHighQuality
-    };
-
-    enum EncodingMode
-    {
-        ConstantQualityEncoding,
-        ConstantBitRateEncoding,
-        AverageBitRateEncoding,
-        TwoPassEncoding
-    };
-
-    enum AvailabilityStatus
-    {
-        Available,
-        ServiceMissing,
-        Busy,
-        ResourceError
-    };
-
-}
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/multimedia/qmultimediautils_p.h b/src/multimedia/qmultimediautils_p.h
index 771502bdd..c5cdbe935 100644
--- a/src/multimedia/qmultimediautils_p.h
+++ b/src/multimedia/qmultimediautils_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtMultimedia/qmultimedia.h>
+#include <QtMultimedia/qtmultimediaglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/recording/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp
index cc05eecc7..55b9984b8 100644
--- a/src/multimedia/recording/qmediaencodersettings.cpp
+++ b/src/multimedia/recording/qmediaencodersettings.cpp
@@ -123,8 +123,8 @@ class QMediaEncoderSettingsPrivate  : public QSharedData
 {
 public:
     bool isNull = true;
-    QMultimedia::EncodingMode encodingMode = QMultimedia::ConstantQualityEncoding;
-    QMultimedia::EncodingQuality quality = QMultimedia::NormalQuality;
+    QMediaEncoderSettings::EncodingMode encodingMode = QMediaEncoderSettings::ConstantQualityEncoding;
+    QMediaEncoderSettings::Quality quality = QMediaEncoderSettings::NormalQuality;
 
     int audioBitrate = -1;
     int audioSampleRate = -1;
@@ -164,12 +164,39 @@ QMediaEncoderSettings &QMediaEncoderSettings::operator=(const QMediaEncoderSetti
 
 QMediaEncoderSettings::~QMediaEncoderSettings() = default;
 
+
+/*!
+    \enum QMediaEncoderSettings::EncodingQuality
+
+    Enumerates quality encoding levels.
+
+    \value VeryLowQuality
+    \value LowQuality
+    \value NormalQuality
+    \value HighQuality
+    \value VeryHighQuality
+*/
+
+/*!
+    \enum QMediaEncoderSettings::EncodingMode
+
+    Enumerates encoding modes.
+
+    \value ConstantQualityEncoding Encoding will aim to have a constant quality, adjusting bitrate to fit.
+    \value ConstantBitRateEncoding Encoding will use a constant bit rate, adjust quality to fit.
+    \value AverageBitRateEncoding Encoding will try to keep an average bitrate setting, but will use
+           more or less as needed.
+    \value TwoPassEncoding The media will first be processed to determine the characteristics,
+           and then processed a second time allocating more bits to the areas
+           that need it.
+*/
+
 /*!
     Returns the encoding mode.
 
-    \sa QMultimedia::EncodingMode
+    \sa EncodingMode
 */
-QMultimedia::EncodingMode QMediaEncoderSettings::encodingMode() const
+QMediaEncoderSettings::EncodingMode QMediaEncoderSettings::encodingMode() const
 {
     return d->encodingMode;
 }
@@ -177,23 +204,23 @@ QMultimedia::EncodingMode QMediaEncoderSettings::encodingMode() const
 /*!
     Sets the encoding \a mode setting.
 
-    If QMultimedia::ConstantQualityEncoding is set, the quality
+    If ConstantQualityEncoding is set, the quality
     encoding parameter is used and bit rates are ignored,
     otherwise the bitrates are used.
 
-    \sa encodingMode(), QMultimedia::EncodingMode
+    \sa encodingMode(), EncodingMode
 */
-void QMediaEncoderSettings::setEncodingMode(QMultimedia::EncodingMode mode)
+void QMediaEncoderSettings::setEncodingMode(EncodingMode mode)
 {
     d->encodingMode = mode;
 }
 
-QMultimedia::EncodingQuality QMediaEncoderSettings::quality() const
+QMediaEncoderSettings::Quality QMediaEncoderSettings::quality() const
 {
     return d->quality;
 }
 
-void QMediaEncoderSettings::setQuality(QMultimedia::EncodingQuality quality)
+void QMediaEncoderSettings::setQuality(Quality quality)
 {
     d->quality = quality;
 }
@@ -411,27 +438,13 @@ void QMediaEncoderSettings::setAudioSampleRate(int rate)
 }
 
 
-class QAudioEncoderSettingsPrivate  : public QSharedData
-{
-public:
-    bool isNull = true;
-    QMultimedia::EncodingMode encodingMode = QMultimedia::ConstantQualityEncoding;
-    QString codec;
-    int bitrate = -1;
-    int sampleRate = -1;
-    int channels = -1;
-    QMultimedia::EncodingQuality quality = QMultimedia::NormalQuality;
-    QVariantMap encodingOptions;
-};
-
-
 class QImageEncoderSettingsPrivate  : public QSharedData
 {
 public:
     bool isNull = true;
     QImageEncoderSettings::FileFormat format;
     QSize resolution;
-    QMultimedia::EncodingQuality quality = QMultimedia::NormalQuality;
+    QImageEncoderSettings::Quality quality = QImageEncoderSettings::NormalQuality;
     QVariantMap encodingOptions;
 };
 
@@ -627,10 +640,21 @@ void QImageEncoderSettings::setResolution(int width, int height)
 }
 
 /*!
-    Returns the image encoding quality.
+    \enum QImageEncoderSettings::EncodingQuality
+
+    Enumerates quality encoding levels.
+
+    \value VeryLowQuality
+    \value LowQuality
+    \value NormalQuality
+    \value HighQuality
+    \value VeryHighQuality
 */
 
-QMultimedia::EncodingQuality QImageEncoderSettings::quality() const
+/*!
+    Returns the image encoding quality.
+*/
+QImageEncoderSettings::Quality QImageEncoderSettings::quality() const
 {
     return d->quality;
 }
@@ -638,8 +662,7 @@ QMultimedia::EncodingQuality QImageEncoderSettings::quality() const
 /*!
     Sets the image encoding \a quality.
 */
-
-void QImageEncoderSettings::setQuality(QMultimedia::EncodingQuality quality)
+void QImageEncoderSettings::setQuality(Quality quality)
 {
     d->isNull = false;
     d->quality = quality;
diff --git a/src/multimedia/recording/qmediaencodersettings.h b/src/multimedia/recording/qmediaencodersettings.h
index 6e8d35794..c5d6b5b0b 100644
--- a/src/multimedia/recording/qmediaencodersettings.h
+++ b/src/multimedia/recording/qmediaencodersettings.h
@@ -45,7 +45,6 @@
 #include <QtCore/qsize.h>
 #include <QtCore/qvariant.h>
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 #include <QtMultimedia/qmediaformat.h>
 
 QT_BEGIN_NAMESPACE
@@ -54,17 +53,34 @@ class QMediaEncoderSettingsPrivate;
 class Q_MULTIMEDIA_EXPORT QMediaEncoderSettings : public QMediaFormat
 {
 public:
+    enum Quality
+    {
+        VeryLowQuality,
+        LowQuality,
+        NormalQuality,
+        HighQuality,
+        VeryHighQuality
+    };
+
+    enum EncodingMode
+    {
+        ConstantQualityEncoding,
+        ConstantBitRateEncoding,
+        AverageBitRateEncoding,
+        TwoPassEncoding
+    };
+
     QMediaEncoderSettings();
     QMediaEncoderSettings(FileFormat format);
     QMediaEncoderSettings(const QMediaEncoderSettings& other);
     QMediaEncoderSettings& operator=(const QMediaEncoderSettings &other);
     ~QMediaEncoderSettings();
 
-    QMultimedia::EncodingMode encodingMode() const;
-    void setEncodingMode(QMultimedia::EncodingMode);
+    EncodingMode encodingMode() const;
+    void setEncodingMode(EncodingMode);
 
-    QMultimedia::EncodingQuality quality() const;
-    void setQuality(QMultimedia::EncodingQuality quality);
+    Quality quality() const;
+    void setQuality(Quality quality);
 
     void resolveFormat();
 
@@ -95,6 +111,15 @@ class QImageEncoderSettingsPrivate;
 class Q_MULTIMEDIA_EXPORT QImageEncoderSettings
 {
 public:
+    enum Quality
+    {
+        VeryLowQuality,
+        LowQuality,
+        NormalQuality,
+        HighQuality,
+        VeryHighQuality
+    };
+
     enum FileFormat {
         UnspecifiedFormat,
         JPEG,
@@ -126,8 +151,8 @@ public:
     void setResolution(const QSize &);
     void setResolution(int width, int height);
 
-    QMultimedia::EncodingQuality quality() const;
-    void setQuality(QMultimedia::EncodingQuality quality);
+    Quality quality() const;
+    void setQuality(Quality quality);
 
     QVariant encodingOption(const QString &option) const;
     QVariantMap encodingOptions() const;
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index afb2b63c8..6d7091600 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -318,18 +318,7 @@ bool QMediaRecorder::setCamera(QCamera *object)
 */
 bool QMediaRecorder::isAvailable() const
 {
-    return availability() == QMultimedia::Available;
-}
-
-/*!
-    Returns the availability of this functionality.
-*/
-QMultimedia::AvailabilityStatus QMediaRecorder::availability() const
-{
-    if (d_func()->control == nullptr)
-        return QMultimedia::ServiceMissing;
-
-    return QMultimedia::Available;
+    return d_func()->control != nullptr;
 }
 
 QUrl QMediaRecorder::outputLocation() const
diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h
index 89bc20fcf..94bc2a18b 100644
--- a/src/multimedia/recording/qmediarecorder.h
+++ b/src/multimedia/recording/qmediarecorder.h
@@ -42,7 +42,6 @@
 
 #include <QtCore/qobject.h>
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 #include <QtMultimedia/qmediaencodersettings.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 #include <QtMultimedia/qmediametadata.h>
@@ -119,7 +118,6 @@ public:
     void removePropertyWatch(QByteArray const &name);
 
     bool isAvailable() const;
-    QMultimedia::AvailabilityStatus availability() const;
 
     QUrl outputLocation() const;
     bool setOutputLocation(const QUrl &location);
diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h
index bc4eee40e..7795b7c11 100644
--- a/src/multimedia/video/qabstractvideobuffer_p.h
+++ b/src/multimedia/video/qabstractvideobuffer_p.h
@@ -41,7 +41,6 @@
 #define QABSTRACTVIDEOBUFFER_H
 
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmultimedia.h>
 #include <QtMultimedia/qvideoframe.h>
 
 #include <QtCore/qmetatype.h>