Rename QAudioInput to QAudioSource

The renaming is a part of some changes coming from an
API review that tries to solve the problem of not having
API symmetry between QCameraInfo/QCamera and QAudioDeviceInfo
where QAudioDevice is missing (so you can't select a nullptr
as the input/output device to disable it).

One issue is that QAudioInput/QAudioOutput are there for reading
and writing low level PCM data from an audio device. They as such
are not quite suitable as classes to use together with QMediaPlayer
or QMediaCaptureSession, as they allow direct writing of data
bypassing the player or capture pipeline.

To solve this, we renamve those classes to QAudioSource/Sink
(making it a bit more symmetric with QVideoSink). That opens up
our API space for a QAudioDevice class avoiding names that feel
like they are doing the same thing.

The patch also renames things on the backend side to keep
API and implementation consistent.

Change-Id: I9f6b4892d3eee4e252cb3782e681b0c3824f27e2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

44 files changed, 451 insertions, 453 deletions

diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 3e3ff50e0..4a04b3286 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -20,7 +20,7 @@ qt_internal_add_module(Multimedia
         audio/qaudiodeviceinfo.cpp audio/qaudiodeviceinfo.h audio/qaudiodeviceinfo_p.h
         audio/qaudioformat.cpp audio/qaudioformat.h
         audio/qaudiohelpers.cpp audio/qaudiohelpers_p.h
-        audio/qaudioinput.cpp audio/qaudioinput.h
+        audio/qaudiosource.cpp audio/qaudiosource.h
         audio/qaudiooutput.cpp audio/qaudiooutput.h
         audio/qaudiosystem.cpp audio/qaudiosystem_p.h
         audio/qsamplecache_p.cpp audio/qsamplecache_p.h
@@ -130,7 +130,7 @@ endif()
 qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf
     SOURCES
         platform/windows/audio/qwindowsaudiodeviceinfo.cpp platform/windows/audio/qwindowsaudiodeviceinfo_p.h
-        platform/windows/audio/qwindowsaudioinput.cpp platform/windows/audio/qwindowsaudioinput_p.h
+        platform/windows/audio/qwindowsaudiosource.cpp platform/windows/audio/qwindowsaudiosource_p.h
         platform/windows/audio/qwindowsaudiooutput.cpp platform/windows/audio/qwindowsaudiooutput_p.h
         platform/windows/audio/qwindowsaudioutils.cpp platform/windows/audio/qwindowsaudioutils_p.h
         platform/windows/common/qwindowsmultimediautils.cpp platform/windows/common/qwindowsmultimediautils_p.h
@@ -203,7 +203,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf
 qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer
     SOURCES
         platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp platform/gstreamer/audio/qaudiodeviceinfo_gstreamer_p.h
-        platform/gstreamer/audio/qaudioinput_gstreamer.cpp platform/gstreamer/audio/qaudioinput_gstreamer_p.h
+        platform/gstreamer/audio/qgstreameraudiosource.cpp platform/gstreamer/audio/qgstreameraudiosource_p.h
         platform/gstreamer/audio/qaudiooutput_gstreamer.cpp platform/gstreamer/audio/qaudiooutput_gstreamer_p.h
         platform/gstreamer/audio/qgstreameraudiodecoder.cpp platform/gstreamer/audio/qgstreameraudiodecoder_p.h
         platform/gstreamer/common/qgst_p.h
@@ -274,7 +274,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_pulseaudio
     SOURCES
         platform/pulseaudio/qaudiodeviceinfo_pulse.cpp platform/pulseaudio/qaudiodeviceinfo_pulse_p.h
         platform/pulseaudio/qaudioengine_pulse.cpp platform/pulseaudio/qaudioengine_pulse_p.h
-        platform/pulseaudio/qaudioinput_pulse.cpp platform/pulseaudio/qaudioinput_pulse_p.h
+        platform/pulseaudio/qpulseaudiosource.cpp platform/pulseaudio/qpulseaudiosource_p.h
         platform/pulseaudio/qaudiooutput_pulse.cpp platform/pulseaudio/qaudiooutput_pulse_p.h
         platform/pulseaudio/qpulseaudiomediadevices.cpp platform/pulseaudio/qpulseaudiomediadevices_p.h
         platform/pulseaudio/qpulseaudiointegration.cpp platform/pulseaudio/qpulseaudiointegration_p.h
@@ -286,7 +286,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_pulseaudio
 qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_alsa
     SOURCES
         platform/alsa/qalsaaudiodeviceinfo.cpp platform/alsa/qalsaaudiodeviceinfo_p.h
-        platform/alsa/qalsaaudioinput.cpp platform/alsa/qalsaaudioinput_p.h
+        platform/alsa/qalsaaudiosource.cpp platform/alsa/qalsaaudiosource_p.h
         platform/alsa/qalsaaudiooutput.cpp platform/alsa/qalsaaudiooutput_p.h
         platform/alsa/qalsamediadevices.cpp platform/alsa/qalsamediadevices_p.h
         platform/alsa/qalsaintegration.cpp platform/alsa/qalsaintegration_p.h
@@ -296,7 +296,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_alsa
 
 qt_internal_extend_target(Multimedia CONDITION ANDROID
     SOURCES
-        platform/android/audio/qopenslesaudioinput.cpp platform/android/audio/qopenslesaudioinput_p.h
+        platform/android/audio/qandroidaudiosource.cpp platform/android/audio/qandroidaudiosource_p.h
         platform/android/audio/qopenslesaudiooutput.cpp platform/android/audio/qopenslesaudiooutput_p.h
         platform/android/audio/qopenslesdeviceinfo.cpp platform/android/audio/qopenslesdeviceinfo_p.h
         platform/android/audio/qopenslesengine.cpp platform/android/audio/qopenslesengine_p.h
@@ -353,7 +353,7 @@ qt_internal_extend_target(Multimedia CONDITION TARGET Qt::Widgets AND WIN32
 qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS
     SOURCES
         platform/darwin/audio/qcoreaudiodeviceinfo.mm platform/darwin/audio/qcoreaudiodeviceinfo_p.h
-        platform/darwin/audio/qcoreaudioinput.mm platform/darwin/audio/qcoreaudioinput_p.h
+        platform/darwin/audio/qdarwinaudiosource.mm platform/darwin/audio/qdarwinaudiosource_p.h
         platform/darwin/audio/qcoreaudiooutput.mm platform/darwin/audio/qcoreaudiooutput_p.h
         platform/darwin/audio/qcoreaudioutils.mm platform/darwin/audio/qcoreaudioutils_p.h
         platform/darwin/mediaplayer/avfdisplaylink.mm platform/darwin/mediaplayer/avfdisplaylink_p.h
@@ -428,7 +428,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_mmrenderer
     SOURCES
         platform/qnx/audio/neutrinoserviceplugin.cpp platform/qnx/audio/neutrinoserviceplugin_p.h
         platform/qnx/audio/qnxaudiodeviceinfo.cpp platform/qnx/audio/qnxaudiodeviceinfo_p.h
-        platform/qnx/audio/qnxaudioinput.cpp platform/qnx/audio/qnxaudioinput_p.h
+        platform/qnx/audio/qqnxaudiosource.cpp platform/qnx/audio/qqnxaudiosource_p.h
         platform/qnx/audio/qnxaudiooutput.cpp platform/qnx/audio/qnxaudiooutput_p.h
         platform/qnx/audio/qnxaudioutils.cpp platform/qnx/audio/qnxaudioutils_p.h
         platform/qnx/camera/bbcameraaudioencodersettingscontrol.cpp platform/qnx/camera/bbcameraaudioencodersettingscontrol_p.h
diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/audio/qaudio.cpp
index db3f39880..e8263f75e 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(), QAudioOutput::setVolume(),
-        QAudioInput::setVolume(), QSoundEffect::setVolume(), QMediaRecorder::setVolume()
+        QAudioSource::setVolume(), QSoundEffect::setVolume(), QMediaRecorder::setVolume()
 */
 qreal convertVolume(qreal volume, VolumeScale from, VolumeScale to)
 {
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 1bc56e7ac..b83e1aeaa 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -61,7 +61,7 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QAudioDeviceInfoPrivate);
 
     A QAudioDeviceInfo is used by Qt to construct
     classes that communicate with the device -- such as
-    QAudioInput, and QAudioOutput. It is also used to determine the
+    QAudioSource, and QAudioOutput. It is also used to determine the
     input or output device to use in a capture session or during media playback.
 
     You can also query each device for the formats it supports. A
@@ -88,7 +88,7 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QAudioDeviceInfoPrivate);
     sound, i.e., play an audio stream in a supported format. For each device we
     find, we simply print the deviceName().
 
-    \sa QAudioOutput, QAudioInput
+    \sa QAudioOutput, QAudioSource
 */
 
 /*!
diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp
index dc9921bc6..10eb6bf2d 100644
--- a/src/multimedia/audio/qaudioformat.cpp
+++ b/src/multimedia/audio/qaudioformat.cpp
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
             \li The format of the audio samples in the stream
     \endtable
 
-    This class is used in conjunction with QAudioInput or
+    This class is used in conjunction with QAudioSource or
     QAudioOutput to allow you to specify the parameters of the audio
     stream being read or written, or with QAudioBuffer when dealing with
     samples in memory.
diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp
index 1e76457ab..698b59440 100644
--- a/src/multimedia/audio/qaudiooutput.cpp
+++ b/src/multimedia/audio/qaudiooutput.cpp
@@ -100,7 +100,7 @@ QT_BEGIN_NAMESPACE
 
     \snippet multimedia-snippets/audio.cpp Audio output state changed
 
-    \sa QAudioInput, QAudioDeviceInfo
+    \sa QAudioSource, QAudioDeviceInfo
 */
 
 /*!
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudiosource.cpp
index a51957cc8..007d2b013 100644
--- a/src/multimedia/audio/qaudioinput.cpp
+++ b/src/multimedia/audio/qaudiosource.cpp
@@ -41,7 +41,7 @@
 #include "qaudio.h"
 #include "qaudiodeviceinfo.h"
 #include "qaudiosystem_p.h"
-#include "qaudioinput.h"
+#include "qaudiosource.h"
 
 #include <private/qplatformmediadevices_p.h>
 #include <private/qplatformmediaintegration_p.h>
@@ -49,8 +49,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QAudioInput
-    \brief The QAudioInput class provides an interface for receiving audio data from an audio input device.
+    \class QAudioSource
+    \brief The QAudioSource class provides an interface for receiving audio data from an audio input device.
 
     \inmodule QtMultimedia
     \ingroup multimedia
@@ -58,20 +58,20 @@ QT_BEGIN_NAMESPACE
 
     You can construct an audio input with the system's
     \l{QAudioDeviceInfo::defaultInputDevice()}{default audio input
-    device}. It is also possible to create QAudioInput with a
+    device}. It is also possible to create QAudioSource with a
     specific QAudioDeviceInfo. When you create the audio input, you
     should also send in the QAudioFormat to be used for the recording
     (see the QAudioFormat class description for details).
 
     To record to a file:
 
-    QAudioInput lets you record audio with an audio input device. The
+    QAudioSource lets you record audio with an audio input device. The
     default constructor of this class will use the systems default
     audio device, but you can also specify a QAudioDeviceInfo for a
     specific device. You also need to pass in the QAudioFormat in
     which you wish to record.
 
-    Starting up the QAudioInput is simply a matter of calling start()
+    Starting up the QAudioSource is simply a matter of calling start()
     with a QIODevice opened for writing. For instance, to record to a
     file, you can:
 
@@ -87,23 +87,23 @@ QT_BEGIN_NAMESPACE
 
     \snippet multimedia-snippets/audio.cpp Audio input stop recording
 
-    At any point in time, QAudioInput will be in one of four states:
+    At any point in time, QAudioSource will be in one of four states:
     active, suspended, stopped, or idle. These states are specified by
     the QAudio::State enum. You can request a state change directly through
     suspend(), resume(), stop(), reset(), and start(). The current
     state is reported by state(). QAudioOutput will also signal you
     when the state changes (stateChanged()).
 
-    QAudioInput provides several ways of measuring the time that has
+    QAudioSource provides several ways of measuring the time that has
     passed since the start() of the recording. The \c processedUSecs()
     function returns the length of the stream in microseconds written,
     i.e., it leaves out the times the audio input was suspended or idle.
     The elapsedUSecs() function returns the time elapsed since start() was called regardless of
-    which states the QAudioInput has been in.
+    which states the QAudioSource has been in.
 
     If an error should occur, you can fetch its reason with error().
     The possible error reasons are described by the QAudio::Error
-    enum. The QAudioInput will enter the \l{QAudio::}{StoppedState} when
+    enum. The QAudioSource will enter the \l{QAudio::}{StoppedState} when
     an error is encountered.  Connect to the stateChanged() signal to
     handle the error:
 
@@ -118,8 +118,8 @@ QT_BEGIN_NAMESPACE
     \a format parameters.
 */
 
-QAudioInput::QAudioInput(const QAudioFormat &format, QObject *parent)
-    : QAudioInput({}, format, parent)
+QAudioSource::QAudioSource(const QAudioFormat &format, QObject *parent)
+    : QAudioSource({}, format, parent)
 {
 }
 
@@ -129,7 +129,7 @@ QAudioInput::QAudioInput(const QAudioFormat &format, QObject *parent)
     \a format parameters.
 */
 
-QAudioInput::QAudioInput(const QAudioDeviceInfo &audioDevice, const QAudioFormat &format, QObject *parent):
+QAudioSource::QAudioSource(const QAudioDeviceInfo &audioDevice, const QAudioFormat &format, QObject *parent):
     QObject(parent)
 {
     d = QPlatformMediaIntegration::instance()->devices()->audioInputDevice(format, audioDevice);
@@ -141,7 +141,7 @@ QAudioInput::QAudioInput(const QAudioDeviceInfo &audioDevice, const QAudioFormat
     Destroy this audio input.
 */
 
-QAudioInput::~QAudioInput()
+QAudioSource::~QAudioSource()
 {
     delete d;
 }
@@ -151,7 +151,7 @@ QAudioInput::~QAudioInput()
     The \a device must have been opened in the \l{QIODevice::WriteOnly}{WriteOnly},
     \l{QIODevice::Append}{Append} or \l{QIODevice::ReadWrite}{ReadWrite} modes.
 
-    If the QAudioInput is able to successfully get audio data, state() returns
+    If the QAudioSource is able to successfully get audio data, state() returns
     either QAudio::ActiveState or QAudio::IdleState, error() returns QAudio::NoError
     and the stateChanged() signal is emitted.
 
@@ -161,7 +161,7 @@ QAudioInput::~QAudioInput()
     \sa QIODevice
 */
 
-void QAudioInput::start(QIODevice* device)
+void QAudioSource::start(QIODevice* device)
 {
     d->elapsedTime.start();
     d->start(device);
@@ -175,7 +175,7 @@ void QAudioInput::start(QIODevice* device)
     \note The pointer will become invalid after the stream is stopped or
     if you start another stream.
 
-    If the QAudioInput is able to access the system's audio device, state() returns
+    If the QAudioSource is able to access the system's audio device, state() returns
     QAudio::IdleState, error() returns QAudio::NoError
     and the stateChanged() signal is emitted.
 
@@ -185,7 +185,7 @@ void QAudioInput::start(QIODevice* device)
     \sa QIODevice
 */
 
-QIODevice* QAudioInput::start()
+QIODevice* QAudioSource::start()
 {
     d->elapsedTime.start();
     return d->start();
@@ -195,7 +195,7 @@ QIODevice* QAudioInput::start()
     Returns the QAudioFormat being used.
 */
 
-QAudioFormat QAudioInput::format() const
+QAudioFormat QAudioSource::format() const
 {
     return d->format();
 }
@@ -207,7 +207,7 @@ QAudioFormat QAudioInput::format() const
     emit stateChanged() signal.
 */
 
-void QAudioInput::stop()
+void QAudioSource::stop()
 {
     d->stop();
 }
@@ -216,7 +216,7 @@ void QAudioInput::stop()
     Drops all audio data in the buffers, resets buffers to zero.
 */
 
-void QAudioInput::reset()
+void QAudioSource::reset()
 {
     d->reset();
 }
@@ -228,7 +228,7 @@ void QAudioInput::reset()
     emit stateChanged() signal.
 */
 
-void QAudioInput::suspend()
+void QAudioSource::suspend()
 {
     d->suspend();
 }
@@ -242,7 +242,7 @@ void QAudioInput::suspend()
     emits stateChanged() signal.
 */
 
-void QAudioInput::resume()
+void QAudioSource::resume()
 {
      d->resume();
 }
@@ -257,7 +257,7 @@ void QAudioInput::resume()
 
 */
 
-void QAudioInput::setBufferSize(qsizetype value)
+void QAudioSource::setBufferSize(qsizetype value)
 {
     d->setBufferSize(value);
 }
@@ -272,7 +272,7 @@ void QAudioInput::setBufferSize(qsizetype value)
 
 */
 
-qsizetype QAudioInput::bufferSize() const
+qsizetype QAudioSource::bufferSize() const
 {
     return d->bufferSize();
 }
@@ -284,7 +284,7 @@ qsizetype QAudioInput::bufferSize() const
     state, otherwise returns zero.
 */
 
-qsizetype QAudioInput::bytesAvailable() const
+qsizetype QAudioSource::bytesAvailable() const
 {
     /*
     -If not ActiveState|IdleState, return 0
@@ -307,7 +307,7 @@ qsizetype QAudioInput::bytesAvailable() const
 
     Note: Adjustments to the volume will change the volume of this audio stream, not the global volume.
 */
-void QAudioInput::setVolume(qreal volume)
+void QAudioSource::setVolume(qreal volume)
 {
     qreal v = qBound(qreal(0.0), volume, qreal(1.0));
     d->setVolume(v);
@@ -319,7 +319,7 @@ void QAudioInput::setVolume(qreal volume)
     If the device does not support adjusting the input volume
     the returned value will be 1.0.
 */
-qreal QAudioInput::volume() const
+qreal QAudioSource::volume() const
 {
     return d->volume();
 }
@@ -329,7 +329,7 @@ qreal QAudioInput::volume() const
     was called in microseconds.
 */
 
-qint64 QAudioInput::processedUSecs() const
+qint64 QAudioSource::processedUSecs() const
 {
     return d->processedUSecs();
 }
@@ -341,7 +341,7 @@ qint64 QAudioInput::processedUSecs() const
 
 #include <qdebug.h>
 
-qint64 QAudioInput::elapsedUSecs() const
+qint64 QAudioSource::elapsedUSecs() const
 {
     return d->state() == QAudio::StoppedState ? 0 : d->elapsedTime.nsecsElapsed()/1000;
 }
@@ -350,7 +350,7 @@ qint64 QAudioInput::elapsedUSecs() const
     Returns the error state.
 */
 
-QAudio::Error QAudioInput::error() const
+QAudio::Error QAudioSource::error() const
 {
     return d->error();
 }
@@ -359,17 +359,17 @@ QAudio::Error QAudioInput::error() const
     Returns the state of audio processing.
 */
 
-QAudio::State QAudioInput::state() const
+QAudio::State QAudioSource::state() const
 {
     return d->state();
 }
 
 /*!
-    \fn QAudioInput::stateChanged(QAudio::State state)
+    \fn QAudioSource::stateChanged(QAudio::State state)
     This signal is emitted when the device \a state has changed.
 */
 
 QT_END_NAMESPACE
 
-#include "moc_qaudioinput.cpp"
+#include "moc_qaudiosource.cpp"
 
diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudiosource.h
index 2ac1efcdf..ab62396f6 100644
--- a/src/multimedia/audio/qaudioinput.h
+++ b/src/multimedia/audio/qaudiosource.h
@@ -52,18 +52,16 @@
 
 QT_BEGIN_NAMESPACE
 
+class QPlatformAudioSource;
 
-
-class QAbstractAudioInput;
-
-class Q_MULTIMEDIA_EXPORT QAudioInput : public QObject
+class Q_MULTIMEDIA_EXPORT QAudioSource : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit QAudioInput(const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
-    explicit QAudioInput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
-    ~QAudioInput();
+    explicit QAudioSource(const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
+    explicit QAudioSource(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
+    ~QAudioSource();
 
     bool isNull() const { return !d; }
 
@@ -95,9 +93,9 @@ Q_SIGNALS:
     void stateChanged(QAudio::State state);
 
 private:
-    Q_DISABLE_COPY(QAudioInput)
+    Q_DISABLE_COPY(QAudioSource)
 
-    QAbstractAudioInput* d;
+    QPlatformAudioSource *d;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudiosystem.cpp b/src/multimedia/audio/qaudiosystem.cpp
index 2f4a92b2c..0cca7f3e8 100644
--- a/src/multimedia/audio/qaudiosystem.cpp
+++ b/src/multimedia/audio/qaudiosystem.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
     QAudioDeviceInfo.
 
     \sa QAudioDeviceInfo
-    \sa QAbstractAudioOutput, QAbstractAudioInput
+    \sa QAbstractAudioOutput, QPlatformAudioSource
 */
 
 /*!
@@ -221,101 +221,101 @@ void QAbstractAudioOutput::setRole(QAudio::Role role)
 */
 
 /*!
-    \class QAbstractAudioInput
-    \brief The QAbstractAudioInput class provides access for QAudioInput to access the audio
+    \class QPlatformAudioSource
+    \brief The QPlatformAudioSource class provides access for QAudioSource to access the audio
     device provided by the plugin.
 
     \ingroup multimedia
     \inmodule QtMultimedia
 
-    QAudioDeviceInput keeps an instance of QAbstractAudioInput and
-    routes calls to functions of the same name to QAbstractAudioInput.
-    This means that it is QAbstractAudioInput that implements the
+    QAudioDeviceInput keeps an instance of QPlatformAudioSource and
+    routes calls to functions of the same name to QPlatformAudioSource.
+    This means that it is QPlatformAudioSource that implements the
     audio functionality. For a description of the functionality, see
-    the QAudioInput class description.
+    the QAudioSource class description.
 
-    \sa QAudioInput
+    \sa QAudioSource
 */
 
 /*!
-    \fn virtual void QAbstractAudioInput::start(QIODevice* device)
+    \fn virtual void QPlatformAudioSource::start(QIODevice* device)
     Uses the \a device as the QIODevice to transfer data.
 */
 
 /*!
-    \fn virtual QIODevice* QAbstractAudioInput::start()
+    \fn virtual QIODevice* QPlatformAudioSource::start()
     Returns a pointer to the QIODevice being used to handle
     the data transfer. This QIODevice can be used to read() audio data directly.
 */
 
 /*!
-    \fn virtual void QAbstractAudioInput::stop()
+    \fn virtual void QPlatformAudioSource::stop()
     Stops the audio input.
 */
 
 /*!
-    \fn virtual void QAbstractAudioInput::reset()
+    \fn virtual void QPlatformAudioSource::reset()
     Drops all audio data in the buffers, resets buffers to zero.
 */
 
 /*!
-    \fn virtual void QAbstractAudioInput::suspend()
+    \fn virtual void QPlatformAudioSource::suspend()
     Stops processing audio data, preserving buffered audio data.
 */
 
 /*!
-    \fn virtual void QAbstractAudioInput::resume()
+    \fn virtual void QPlatformAudioSource::resume()
     Resumes processing audio data after a suspend().
 */
 
 /*!
-    \fn virtual qsizetype QAbstractAudioInput::bytesReady() const
+    \fn virtual qsizetype QPlatformAudioSource::bytesReady() const
     Returns the amount of audio data available to read in bytes.
 */
 
 /*!
-    \fn virtual void QAbstractAudioInput::setBufferSize(qsizetype value)
+    \fn virtual void QPlatformAudioSource::setBufferSize(qsizetype value)
     Sets the audio buffer size to \a value in milliseconds.
 */
 
 /*!
-    \fn virtual qsizetype QAbstractAudioInput::bufferSize() const
+    \fn virtual qsizetype QPlatformAudioSource::bufferSize() const
     Returns the audio buffer size in milliseconds.
 */
 
 /*!
-    \fn virtual qint64 QAbstractAudioInput::processedUSecs() const
+    \fn virtual qint64 QPlatformAudioSource::processedUSecs() const
     Returns the amount of audio data processed since start() was called in milliseconds.
 */
 
 /*!
-    \fn virtual QAudio::Error QAbstractAudioInput::error() const
+    \fn virtual QAudio::Error QPlatformAudioSource::error() const
     Returns the error state.
 */
 
 /*!
-    \fn virtual QAudio::State QAbstractAudioInput::state() const
+    \fn virtual QAudio::State QPlatformAudioSource::state() const
     Returns the state of audio processing.
 */
 
 /*!
-    \fn virtual void QAbstractAudioInput::setFormat(const QAudioFormat& fmt)
+    \fn virtual void QPlatformAudioSource::setFormat(const QAudioFormat& fmt)
     Set the QAudioFormat to use to \a fmt.
     Setting the format is only allowable while in QAudio::StoppedState.
 */
 
 /*!
-    \fn virtual QAudioFormat QAbstractAudioInput::format() const
+    \fn virtual QAudioFormat QPlatformAudioSource::format() const
     Returns the QAudioFormat being used
 */
 
 /*!
-    \fn QAbstractAudioInput::errorChanged(QAudio::Error error)
+    \fn QPlatformAudioSource::errorChanged(QAudio::Error error)
     This signal is emitted when the \a error state has changed.
 */
 
 /*!
-    \fn QAbstractAudioInput::stateChanged(QAudio::State state)
+    \fn QPlatformAudioSource::stateChanged(QAudio::State state)
     This signal is emitted when the device \a state has changed.
 */
 
diff --git a/src/multimedia/audio/qaudiosystem_p.h b/src/multimedia/audio/qaudiosystem_p.h
index da8840dee..0f44585a4 100644
--- a/src/multimedia/audio/qaudiosystem_p.h
+++ b/src/multimedia/audio/qaudiosystem_p.h
@@ -96,7 +96,7 @@ protected:
     QAudio::Role m_role = QAudio::UnknownRole;
 };
 
-class QAbstractAudioInput : public QObject
+class QPlatformAudioSource : public QObject
 {
     Q_OBJECT
 
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
index 2d07344a7..78c58769d 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
@@ -45,7 +45,7 @@
 #include <qfile.h>
 
 #include "qaudiodeviceinfo.h"
-#include "qaudioinput.h"
+#include "qaudiosource.h"
 #include "qaudiooutput.h"
 #include "qaudiodecoder.h"
 #include "qmediaplayer.h"
@@ -64,7 +64,7 @@ public Q_SLOTS:
 private:
     //! [Audio input class members]
     QFile destinationFile;   // Class member
-    QAudioInput* audio; // Class member
+    QAudioSource* audio; // Class member
     //! [Audio input class members]
 };
 
@@ -86,7 +86,7 @@ void AudioInputExample::setup()
         qWarning() << "Default format not supported, trying to use the nearest.";
     }
 
-    audio = new QAudioInput(format, this);
+    audio = new QAudioSource(format, this);
     connect(audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State)));
 
     QTimer::singleShot(3000, this, SLOT(stopRecording()));
diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc
index e74b285c7..41be6614d 100644
--- a/src/multimedia/doc/src/audiooverview.qdoc
+++ b/src/multimedia/doc/src/audiooverview.qdoc
@@ -77,7 +77,7 @@ microphones, and to write raw data to speakers or other devices.  Generally
 these classes do not do any audio decoding, or other processing, but they
 can support different types of raw audio data.
 
-The QAudioOutput class offers raw audio data output, while QAudioInput
+The QAudioOutput class offers raw audio data output, while QAudioSource
 offers raw audio data input. The available hardware
 determines what audio outputs and inputs are available.
 
@@ -86,7 +86,7 @@ The low level audio classes can operate in two modes - \c push and \c pull.
 In \c pull mode, the audio device is started by giving it a QIODevice.  For
 an output device, the QAudioOutput class will pull data from the QIODevice
 (using \l QIODevice::read()) when more audio data is required.  Conversely,
-for \c pull mode with QAudioInput, when audio data is available then the
+for \c pull mode with QAudioSource, when audio data is available then the
 data will be written directly to the QIODevice.
 
 In \c push mode, the audio device provides a QIODevice instance that
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index 804333db3..daf20329a 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -93,7 +93,7 @@ For some quick recipes, look at the overviews above and consult this table:
         \li \l{Spectrum Example}{spectrum},
             \l{Audio Input Example}{audioinput}
         \li
-        \li QAudioInput
+        \li QAudioSource
     \row
         \li Recording encoded audio data
         \li \l{Audio Recorder Example}{audiorecorder}
diff --git a/src/multimedia/platform/alsa/qalsaaudioinput.cpp b/src/multimedia/platform/alsa/qalsaaudiosource.cpp
index b35b65462..bd44cc5e6 100644
--- a/src/multimedia/platform/alsa/qalsaaudioinput.cpp
+++ b/src/multimedia/platform/alsa/qalsaaudiosource.cpp
@@ -51,14 +51,14 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtMultimedia/private/qaudiohelpers_p.h>
-#include "qalsaaudioinput_p.h"
+#include "qalsaaudiosource_p.h"
 #include "qalsaaudiodeviceinfo_p.h"
 
 QT_BEGIN_NAMESPACE
 
 //#define DEBUG_AUDIO 1
 
-QAlsaAudioInput::QAlsaAudioInput(const QByteArray &device)
+QAlsaAudioSource::QAlsaAudioSource(const QByteArray &device)
 {
     bytesAvailable = 0;
     handle = 0;
@@ -83,7 +83,7 @@ QAlsaAudioInput::QAlsaAudioInput(const QByteArray &device)
     connect(timer,SIGNAL(timeout()),SLOT(userFeed()));
 }
 
-QAlsaAudioInput::~QAlsaAudioInput()
+QAlsaAudioSource::~QAlsaAudioSource()
 {
     close();
     disconnect(timer, SIGNAL(timeout()));
@@ -91,38 +91,38 @@ QAlsaAudioInput::~QAlsaAudioInput()
     delete timer;
 }
 
-void QAlsaAudioInput::setVolume(qreal vol)
+void QAlsaAudioSource::setVolume(qreal vol)
 {
     m_volume = vol;
 }
 
-qreal QAlsaAudioInput::volume() const
+qreal QAlsaAudioSource::volume() const
 {
     return m_volume;
 }
 
-QAudio::Error QAlsaAudioInput::error() const
+QAudio::Error QAlsaAudioSource::error() const
 {
     return errorState;
 }
 
-QAudio::State QAlsaAudioInput::state() const
+QAudio::State QAlsaAudioSource::state() const
 {
     return deviceState;
 }
 
-void QAlsaAudioInput::setFormat(const QAudioFormat& fmt)
+void QAlsaAudioSource::setFormat(const QAudioFormat& fmt)
 {
     if (deviceState == QAudio::StoppedState)
         settings = fmt;
 }
 
-QAudioFormat QAlsaAudioInput::format() const
+QAudioFormat QAlsaAudioSource::format() const
 {
     return settings;
 }
 
-int QAlsaAudioInput::xrun_recovery(int err)
+int QAlsaAudioSource::xrun_recovery(int err)
 {
     int  count = 0;
     bool reset = false;
@@ -168,7 +168,7 @@ int QAlsaAudioInput::xrun_recovery(int err)
     return err;
 }
 
-int QAlsaAudioInput::setFormat()
+int QAlsaAudioSource::setFormat()
 {
     snd_pcm_format_t pcmformat = SND_PCM_FORMAT_UNKNOWN;
 
@@ -202,7 +202,7 @@ int QAlsaAudioInput::setFormat()
             : -1;
 }
 
-void QAlsaAudioInput::start(QIODevice* device)
+void QAlsaAudioSource::start(QIODevice* device)
 {
     if(deviceState != QAudio::StoppedState)
         close();
@@ -221,7 +221,7 @@ void QAlsaAudioInput::start(QIODevice* device)
     emit stateChanged(deviceState);
 }
 
-QIODevice* QAlsaAudioInput::start()
+QIODevice* QAlsaAudioSource::start()
 {
     if(deviceState != QAudio::StoppedState)
         close();
@@ -243,7 +243,7 @@ QIODevice* QAlsaAudioInput::start()
     return audioSource;
 }
 
-void QAlsaAudioInput::stop()
+void QAlsaAudioSource::stop()
 {
     if(deviceState == QAudio::StoppedState)
         return;
@@ -254,7 +254,7 @@ void QAlsaAudioInput::stop()
     emit stateChanged(deviceState);
 }
 
-bool QAlsaAudioInput::open()
+bool QAlsaAudioSource::open()
 {
 #ifdef DEBUG_AUDIO
     QTime now(QTime::currentTime());
@@ -268,9 +268,9 @@ bool QAlsaAudioInput::open()
     unsigned int sampleRate=settings.sampleRate();
 
     if (!settings.isValid()) {
-        qWarning("QAudioInput: open error, invalid format.");
+        qWarning("QAudioSource: open error, invalid format.");
     } else if (settings.sampleRate() <= 0) {
-        qWarning("QAudioInput: open error, invalid sample rate (%d).",
+        qWarning("QAudioSource: open error, invalid sample rate (%d).",
                  settings.sampleRate());
     } else {
         err = -1;
@@ -308,69 +308,69 @@ bool QAlsaAudioInput::open()
     err = snd_pcm_hw_params_any( handle, hwparams );
     if ( err < 0 ) {
         fatal = true;
-        errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_any: err = %1").arg(err);
+        errMessage = QString::fromLatin1("QAudioSource: snd_pcm_hw_params_any: err = %1").arg(err);
     }
     if ( !fatal ) {
         err = snd_pcm_hw_params_set_rate_resample( handle, hwparams, 1 );
         if ( err < 0 ) {
             fatal = true;
-            errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_set_rate_resample: err = %1").arg(err);
+            errMessage = QString::fromLatin1("QAudioSource: snd_pcm_hw_params_set_rate_resample: err = %1").arg(err);
         }
     }
     if ( !fatal ) {
         err = snd_pcm_hw_params_set_access( handle, hwparams, access );
         if ( err < 0 ) {
             fatal = true;
-            errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_set_access: err = %1").arg(err);
+            errMessage = QString::fromLatin1("QAudioSource: snd_pcm_hw_params_set_access: err = %1").arg(err);
         }
     }
     if ( !fatal ) {
         err = setFormat();
         if ( err < 0 ) {
             fatal = true;
-            errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_set_format: err = %1").arg(err);
+            errMessage = QString::fromLatin1("QAudioSource: snd_pcm_hw_params_set_format: err = %1").arg(err);
         }
     }
     if ( !fatal ) {
         err = snd_pcm_hw_params_set_channels( handle, hwparams, (unsigned int)settings.channelCount() );
         if ( err < 0 ) {
             fatal = true;
-            errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_set_channels: err = %1").arg(err);
+            errMessage = QString::fromLatin1("QAudioSource: snd_pcm_hw_params_set_channels: err = %1").arg(err);
         }
     }
     if ( !fatal ) {
         err = snd_pcm_hw_params_set_rate_near( handle, hwparams, &sampleRate, 0 );
         if ( err < 0 ) {
             fatal = true;
-            errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_set_rate_near: err = %1").arg(err);
+            errMessage = QString::fromLatin1("QAudioSource: snd_pcm_hw_params_set_rate_near: err = %1").arg(err);
         }
     }
     if ( !fatal ) {
         err = snd_pcm_hw_params_set_buffer_time_near(handle, hwparams, &buffer_time, &dir);
         if ( err < 0 ) {
             fatal = true;
-            errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_set_buffer_time_near: err = %1").arg(err);
+            errMessage = QString::fromLatin1("QAudioSource: snd_pcm_hw_params_set_buffer_time_near: err = %1").arg(err);
         }
     }
     if ( !fatal ) {
         err = snd_pcm_hw_params_set_period_time_near(handle, hwparams, &period_time, &dir);
         if ( err < 0 ) {
             fatal = true;
-            errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_set_period_time_near: err = %1").arg(err);
+            errMessage = QString::fromLatin1("QAudioSource: snd_pcm_hw_params_set_period_time_near: err = %1").arg(err);
         }
     }
     if ( !fatal ) {
         err = snd_pcm_hw_params_set_periods_near(handle, hwparams, &chunks, &dir);
         if ( err < 0 ) {
             fatal = true;
-            errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_set_periods_near: err = %1").arg(err);
+            errMessage = QString::fromLatin1("QAudioSource: snd_pcm_hw_params_set_periods_near: err = %1").arg(err);
         }
     }
     if ( !fatal ) {
         err = snd_pcm_hw_params(handle, hwparams);
         if ( err < 0 ) {
             fatal = true;
-            errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params: err = %1").arg(err);
+            errMessage = QString::fromLatin1("QAudioSource: snd_pcm_hw_params: err = %1").arg(err);
         }
     }
     if( err < 0) {
@@ -418,7 +418,7 @@ bool QAlsaAudioInput::open()
     return true;
 }
 
-void QAlsaAudioInput::close()
+void QAlsaAudioSource::close()
 {
     timer->stop();
 
@@ -429,7 +429,7 @@ void QAlsaAudioInput::close()
     }
 }
 
-int QAlsaAudioInput::checkBytesReady()
+int QAlsaAudioSource::checkBytesReady()
 {
     if(resuming)
         bytesAvailable = period_size;
@@ -449,12 +449,12 @@ int QAlsaAudioInput::checkBytesReady()
     return bytesAvailable;
 }
 
-int QAlsaAudioInput::bytesReady() const
+int QAlsaAudioSource::bytesReady() const
 {
     return qMax(bytesAvailable, 0);
 }
 
-qint64 QAlsaAudioInput::read(char* data, qint64 len)
+qint64 QAlsaAudioSource::read(char* data, qint64 len)
 {
     // Read in some audio data and write it to QIODevice, pull mode
     if ( !handle )
@@ -599,7 +599,7 @@ qint64 QAlsaAudioInput::read(char* data, qint64 len)
     return 0;
 }
 
-void QAlsaAudioInput::resume()
+void QAlsaAudioSource::resume()
 {
     if(deviceState == QAudio::SuspendedState) {
         int err = 0;
@@ -623,17 +623,17 @@ void QAlsaAudioInput::resume()
     }
 }
 
-void QAlsaAudioInput::setBufferSize(int value)
+void QAlsaAudioSource::setBufferSize(int value)
 {
     buffer_size = value;
 }
 
-int QAlsaAudioInput::bufferSize() const
+int QAlsaAudioSource::bufferSize() const
 {
     return buffer_size;
 }
 
-qint64 QAlsaAudioInput::processedUSecs() const
+qint64 QAlsaAudioSource::processedUSecs() const
 {
     qint64 result = qint64(1000000) * totalTimeValue /
         settings.bytesPerFrame() /
@@ -642,7 +642,7 @@ qint64 QAlsaAudioInput::processedUSecs() const
     return result;
 }
 
-void QAlsaAudioInput::suspend()
+void QAlsaAudioSource::suspend()
 {
     if(deviceState == QAudio::ActiveState||resuming) {
         snd_pcm_drain(handle);
@@ -652,7 +652,7 @@ void QAlsaAudioInput::suspend()
     }
 }
 
-void QAlsaAudioInput::userFeed()
+void QAlsaAudioSource::userFeed()
 {
     if(deviceState == QAudio::StoppedState || deviceState == QAudio::SuspendedState)
         return;
@@ -663,7 +663,7 @@ void QAlsaAudioInput::userFeed()
     deviceReady();
 }
 
-bool QAlsaAudioInput::deviceReady()
+bool QAlsaAudioSource::deviceReady()
 {
     if(pullMode) {
         // reads some audio data and writes it to QIODevice
@@ -695,7 +695,7 @@ bool QAlsaAudioInput::deviceReady()
     return true;
 }
 
-void QAlsaAudioInput::reset()
+void QAlsaAudioSource::reset()
 {
     if(handle)
         snd_pcm_reset(handle);
@@ -703,15 +703,15 @@ void QAlsaAudioInput::reset()
     bytesAvailable = 0;
 }
 
-void QAlsaAudioInput::drain()
+void QAlsaAudioSource::drain()
 {
     if(handle)
         snd_pcm_drain(handle);
 }
 
-AlsaInputPrivate::AlsaInputPrivate(QAlsaAudioInput* audio)
+AlsaInputPrivate::AlsaInputPrivate(QAlsaAudioSource* audio)
 {
-    audioDevice = qobject_cast<QAlsaAudioInput*>(audio);
+    audioDevice = qobject_cast<QAlsaAudioSource*>(audio);
 }
 
 AlsaInputPrivate::~AlsaInputPrivate()
@@ -802,4 +802,4 @@ void RingBuffer::write(char *data, int len)
 
 QT_END_NAMESPACE
 
-#include "moc_qalsaaudioinput_p.cpp"
+#include "moc_qalsaaudiosource_p.cpp"
diff --git a/src/multimedia/platform/alsa/qalsaaudioinput_p.h b/src/multimedia/platform/alsa/qalsaaudiosource_p.h
index 3a29c481b..9c24ef940 100644
--- a/src/multimedia/platform/alsa/qalsaaudioinput_p.h
+++ b/src/multimedia/platform/alsa/qalsaaudiosource_p.h
@@ -94,12 +94,12 @@ private:
     QByteArray m_data;
 };
 
-class QAlsaAudioInput : public QAbstractAudioInput
+class QAlsaAudioSource : public QPlatformAudioSource
 {
     Q_OBJECT
 public:
-    QAlsaAudioInput(const QByteArray &device);
-    ~QAlsaAudioInput();
+    QAlsaAudioSource(const QByteArray &device);
+    ~QAlsaAudioSource();
 
     qint64 read(char* data, qint64 len);
 
@@ -161,7 +161,7 @@ class AlsaInputPrivate : public QIODevice
 {
     Q_OBJECT
 public:
-    AlsaInputPrivate(QAlsaAudioInput* audio);
+    AlsaInputPrivate(QAlsaAudioSource* audio);
     ~AlsaInputPrivate();
 
     qint64 readData( char* data, qint64 len) override;
@@ -169,7 +169,7 @@ public:
 
     void trigger();
 private:
-    QAlsaAudioInput *audioDevice;
+    QAlsaAudioSource *audioDevice;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/alsa/qalsamediadevices.cpp b/src/multimedia/platform/alsa/qalsamediadevices.cpp
index a6823191e..2f50ac7e7 100644
--- a/src/multimedia/platform/alsa/qalsamediadevices.cpp
+++ b/src/multimedia/platform/alsa/qalsamediadevices.cpp
@@ -41,7 +41,7 @@
 #include "qmediadevices.h"
 #include "qcamerainfo_p.h"
 
-#include "private/qalsaaudioinput_p.h"
+#include "private/qalsaaudiosource_p.h"
 #include "private/qalsaaudiooutput_p.h"
 #include "private/qalsaaudiodeviceinfo_p.h"
 
@@ -115,9 +115,9 @@ QList<QCameraInfo> QAlsaMediaDevices::videoInputs() const
     return {};
 }
 
-QAbstractAudioInput *QAlsaMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QAlsaMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
 {
-    return new QAlsaAudioInput(deviceInfo.id());
+    return new QAlsaAudioSource(deviceInfo.id());
 }
 
 QAbstractAudioOutput *QAlsaMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo)
diff --git a/src/multimedia/platform/alsa/qalsamediadevices_p.h b/src/multimedia/platform/alsa/qalsamediadevices_p.h
index 204d6c138..071ac6882 100644
--- a/src/multimedia/platform/alsa/qalsamediadevices_p.h
+++ b/src/multimedia/platform/alsa/qalsamediadevices_p.h
@@ -67,7 +67,7 @@ public:
     QList<QAudioDeviceInfo> audioInputs() const override;
     QList<QAudioDeviceInfo> audioOutputs() const override;
     QList<QCameraInfo> videoInputs() const override;
-    QAbstractAudioInput *createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) override;
+    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
     QAbstractAudioOutput *createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) override;
 };
 
diff --git a/src/multimedia/platform/android/audio/qopenslesaudioinput.cpp b/src/multimedia/platform/android/audio/qandroidaudiosource.cpp
index e0845a129..3bd8d564e 100644
--- a/src/multimedia/platform/android/audio/qopenslesaudioinput.cpp
+++ b/src/multimedia/platform/android/audio/qandroidaudiosource.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qopenslesaudioinput_p.h"
+#include "qandroidaudiosource_p.h"
 
 #include "qopenslesengine_p.h"
 #include <private/qaudiohelpers_p.h>
@@ -80,10 +80,10 @@ static void bufferQueueCallback(SLBufferQueueItf, void *context)
 #endif
 {
     // Process buffer in main thread
-    QMetaObject::invokeMethod(reinterpret_cast<QOpenSLESAudioInput*>(context), "processBuffer");
+    QMetaObject::invokeMethod(reinterpret_cast<QAndroidAudioSource*>(context), "processBuffer");
 }
 
-QOpenSLESAudioInput::QOpenSLESAudioInput(const QByteArray &device)
+QAndroidAudioSource::QAndroidAudioSource(const QByteArray &device)
     : m_device(device)
     , m_engine(QOpenSLESEngine::instance())
     , m_recorderObject(0)
@@ -113,35 +113,35 @@ QOpenSLESAudioInput::QOpenSLESAudioInput(const QByteArray &device)
 #endif
 }
 
-QOpenSLESAudioInput::~QOpenSLESAudioInput()
+QAndroidAudioSource::~QAndroidAudioSource()
 {
     if (m_recorderObject)
         (*m_recorderObject)->Destroy(m_recorderObject);
     delete[] m_buffers;
 }
 
-QAudio::Error QOpenSLESAudioInput::error() const
+QAudio::Error QAndroidAudioSource::error() const
 {
     return m_errorState;
 }
 
-QAudio::State QOpenSLESAudioInput::state() const
+QAudio::State QAndroidAudioSource::state() const
 {
     return m_deviceState;
 }
 
-void QOpenSLESAudioInput::setFormat(const QAudioFormat &format)
+void QAndroidAudioSource::setFormat(const QAudioFormat &format)
 {
     if (m_deviceState == QAudio::StoppedState)
         m_format = format;
 }
 
-QAudioFormat QOpenSLESAudioInput::format() const
+QAudioFormat QAndroidAudioSource::format() const
 {
     return m_format;
 }
 
-void QOpenSLESAudioInput::start(QIODevice *device)
+void QAndroidAudioSource::start(QIODevice *device)
 {
     if (m_deviceState != QAudio::StoppedState)
         stopRecording();
@@ -165,7 +165,7 @@ void QOpenSLESAudioInput::start(QIODevice *device)
     Q_EMIT stateChanged(m_deviceState);
 }
 
-QIODevice *QOpenSLESAudioInput::start()
+QIODevice *QAndroidAudioSource::start()
 {
     if (m_deviceState != QAudio::StoppedState)
         stopRecording();
@@ -196,7 +196,7 @@ QIODevice *QOpenSLESAudioInput::start()
     return m_bufferIODevice;
 }
 
-bool QOpenSLESAudioInput::startRecording()
+bool QAndroidAudioSource::startRecording()
 {
     if (!hasRecordingPermission())
         return false;
@@ -328,7 +328,7 @@ bool QOpenSLESAudioInput::startRecording()
     return true;
 }
 
-void QOpenSLESAudioInput::stop()
+void QAndroidAudioSource::stop()
 {
     if (m_deviceState == QAudio::StoppedState)
         return;
@@ -341,7 +341,7 @@ void QOpenSLESAudioInput::stop()
     Q_EMIT stateChanged(m_deviceState);
 }
 
-void QOpenSLESAudioInput::stopRecording()
+void QAndroidAudioSource::stopRecording()
 {
     flushBuffers();
 
@@ -363,7 +363,7 @@ void QOpenSLESAudioInput::stopRecording()
     }
 }
 
-void QOpenSLESAudioInput::suspend()
+void QAndroidAudioSource::suspend()
 {
     if (m_deviceState == QAudio::ActiveState) {
         m_deviceState = QAudio::SuspendedState;
@@ -373,7 +373,7 @@ void QOpenSLESAudioInput::suspend()
     }
 }
 
-void QOpenSLESAudioInput::resume()
+void QAndroidAudioSource::resume()
 {
     if (m_deviceState == QAudio::SuspendedState || m_deviceState == QAudio::IdleState) {
         (*m_recorder)->SetRecordState(m_recorder, SL_RECORDSTATE_RECORDING);
@@ -383,7 +383,7 @@ void QOpenSLESAudioInput::resume()
     }
 }
 
-void QOpenSLESAudioInput::processBuffer()
+void QAndroidAudioSource::processBuffer()
 {
     if (m_deviceState == QAudio::StoppedState || m_deviceState == QAudio::SuspendedState)
         return;
@@ -418,7 +418,7 @@ void QOpenSLESAudioInput::processBuffer()
     }
 }
 
-void QOpenSLESAudioInput::writeDataToDevice(const char *data, int size)
+void QAndroidAudioSource::writeDataToDevice(const char *data, int size)
 {
     m_processedBytes += size;
 
@@ -448,7 +448,7 @@ void QOpenSLESAudioInput::writeDataToDevice(const char *data, int size)
     }
 }
 
-void QOpenSLESAudioInput::flushBuffers()
+void QAndroidAudioSource::flushBuffers()
 {
     SLmillisecond recorderPos;
     (*m_recorder)->GetPosition(m_recorder, &recorderPos);
@@ -463,7 +463,7 @@ void QOpenSLESAudioInput::flushBuffers()
     }
 }
 
-qsizetype QOpenSLESAudioInput::bytesReady() const
+qsizetype QAndroidAudioSource::bytesReady() const
 {
     if (m_deviceState == QAudio::ActiveState || m_deviceState == QAudio::SuspendedState)
         return m_bufferIODevice ? m_bufferIODevice->bytesAvailable() : m_bufferSize;
@@ -471,32 +471,32 @@ qsizetype QOpenSLESAudioInput::bytesReady() const
     return 0;
 }
 
-void QOpenSLESAudioInput::setBufferSize(qsizetype value)
+void QAndroidAudioSource::setBufferSize(qsizetype value)
 {
     m_bufferSize = value;
 }
 
-qsizetype QOpenSLESAudioInput::bufferSize() const
+qsizetype QAndroidAudioSource::bufferSize() const
 {
     return m_bufferSize;
 }
 
-qint64 QOpenSLESAudioInput::processedUSecs() const
+qint64 QAndroidAudioSource::processedUSecs() const
 {
     return m_format.durationForBytes(m_processedBytes);
 }
 
-void QOpenSLESAudioInput::setVolume(qreal vol)
+void QAndroidAudioSource::setVolume(qreal vol)
 {
     m_volume = vol;
 }
 
-qreal QOpenSLESAudioInput::volume() const
+qreal QAndroidAudioSource::volume() const
 {
     return m_volume;
 }
 
-void QOpenSLESAudioInput::reset()
+void QAndroidAudioSource::reset()
 {
     stop();
 }
diff --git a/src/multimedia/platform/android/audio/qopenslesaudioinput_p.h b/src/multimedia/platform/android/audio/qandroidaudiosource_p.h
index e442d16af..8a4621b2c 100644
--- a/src/multimedia/platform/android/audio/qopenslesaudioinput_p.h
+++ b/src/multimedia/platform/android/audio/qandroidaudiosource_p.h
@@ -71,13 +71,13 @@ class QOpenSLESEngine;
 class QIODevice;
 class QBuffer;
 
-class QOpenSLESAudioInput : public QAbstractAudioInput
+class QAndroidAudioSource : public QPlatformAudioSource
 {
     Q_OBJECT
 
 public:
-    QOpenSLESAudioInput(const QByteArray &device);
-    ~QOpenSLESAudioInput();
+    QAndroidAudioSource(const QByteArray &device);
+    ~QAndroidAudioSource();
 
     void start(QIODevice *device);
     QIODevice *start();
diff --git a/src/multimedia/platform/android/audio/qopenslesengine.cpp b/src/multimedia/platform/android/audio/qopenslesengine.cpp
index 5c53e0f7b..b252b3d7f 100644
--- a/src/multimedia/platform/android/audio/qopenslesengine.cpp
+++ b/src/multimedia/platform/android/audio/qopenslesengine.cpp
@@ -39,7 +39,7 @@
 
 #include "qopenslesengine_p.h"
 
-#include "qopenslesaudioinput_p.h"
+#include "qandroidaudiosource_p.h"
 #include "qopenslesdeviceinfo_p.h"
 
 #include <qdebug.h>
diff --git a/src/multimedia/platform/android/qandroidmediadevices.cpp b/src/multimedia/platform/android/qandroidmediadevices.cpp
index d5705390f..acb1a5b33 100644
--- a/src/multimedia/platform/android/qandroidmediadevices.cpp
+++ b/src/multimedia/platform/android/qandroidmediadevices.cpp
@@ -41,7 +41,7 @@
 #include "qmediadevices.h"
 #include "qcamerainfo_p.h"
 
-#include "private/qopenslesaudioinput_p.h"
+#include "private/qandroidaudiosource_p.h"
 #include "private/qopenslesaudiooutput_p.h"
 #include "private/qopenslesdeviceinfo_p.h"
 #include "private/qopenslesengine_p.h"
@@ -70,9 +70,9 @@ QList<QCameraInfo> QAndroidMediaDevices::videoInputs() const
     return QAndroidCameraSession::availableCameras();
 }
 
-QAbstractAudioInput *QAndroidMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QAndroidMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
 {
-    return new QOpenSLESAudioInput(deviceInfo.id());
+    return new QAndroidAudioSource(deviceInfo.id());
 }
 
 QAbstractAudioOutput *QAndroidMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo)
diff --git a/src/multimedia/platform/android/qandroidmediadevices_p.h b/src/multimedia/platform/android/qandroidmediadevices_p.h
index 3900c131c..89c7d9c52 100644
--- a/src/multimedia/platform/android/qandroidmediadevices_p.h
+++ b/src/multimedia/platform/android/qandroidmediadevices_p.h
@@ -66,7 +66,7 @@ public:
     QList<QAudioDeviceInfo> audioInputs() const override;
     QList<QAudioDeviceInfo> audioOutputs() const override;
     QList<QCameraInfo> videoInputs() const override;
-    QAbstractAudioInput *createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) override;
+    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
     QAbstractAudioOutput *createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) override;
 
     void forwardAudioOutputsChanged();
diff --git a/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm b/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm
index 6b058f5e0..5cd616b42 100644
--- a/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm
+++ b/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm
@@ -593,7 +593,7 @@ bool QCoreAudioOutput::open()
                              0,
                              &numberOfFrames,
                              &size) != noErr) {
-        qWarning() << "QAudioInput: Failed to get audio period size";
+        qWarning() << "QAudioSource: Failed to get audio period size";
         return false;
     }
 #else //iOS
diff --git a/src/multimedia/platform/darwin/audio/qcoreaudioinput.mm b/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm
index 893bed16c..95d22d01a 100644
--- a/src/multimedia/platform/darwin/audio/qcoreaudioinput.mm
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm
@@ -36,7 +36,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qcoreaudioinput_p.h"
+#include "qdarwinaudiosource_p.h"
 #include "qcoreaudiosessionmanager_p.h"
 #include "qcoreaudiodeviceinfo_p.h"
 #include "qcoreaudioutils_p.h"
@@ -188,7 +188,7 @@ bool QCoreAudioPacketFeeder::empty() const
     return m_position == m_totalPackets;
 }
 
-QCoreAudioInputBuffer::QCoreAudioInputBuffer(int bufferSize, int maxPeriodSize, const AudioStreamBasicDescription &inputFormat, const AudioStreamBasicDescription &outputFormat, QObject *parent)
+QDarwinAudioSourceBuffer::QDarwinAudioSourceBuffer(int bufferSize, int maxPeriodSize, const AudioStreamBasicDescription &inputFormat, const AudioStreamBasicDescription &outputFormat, QObject *parent)
     : QObject(parent)
     , m_deviceError(false)
     , m_device(0)
@@ -209,7 +209,7 @@ QCoreAudioInputBuffer::QCoreAudioInputBuffer(int bufferSize, int maxPeriodSize,
 
     if (CoreAudioUtils::toQAudioFormat(inputFormat) != CoreAudioUtils::toQAudioFormat(outputFormat)) {
         if (AudioConverterNew(&m_inputFormat, &m_outputFormat, &m_audioConverter) != noErr) {
-            qWarning() << "QAudioInput: Unable to create an Audio Converter";
+            qWarning() << "QAudioSource: Unable to create an Audio Converter";
             m_audioConverter = 0;
         }
     }
@@ -217,22 +217,22 @@ QCoreAudioInputBuffer::QCoreAudioInputBuffer(int bufferSize, int maxPeriodSize,
     m_qFormat = CoreAudioUtils::toQAudioFormat(inputFormat); // we adjust volume before conversion
 }
 
-QCoreAudioInputBuffer::~QCoreAudioInputBuffer()
+QDarwinAudioSourceBuffer::~QDarwinAudioSourceBuffer()
 {
     delete m_buffer;
 }
 
-qreal QCoreAudioInputBuffer::volume() const
+qreal QDarwinAudioSourceBuffer::volume() const
 {
     return m_volume;
 }
 
-void QCoreAudioInputBuffer::setVolume(qreal v)
+void QDarwinAudioSourceBuffer::setVolume(qreal v)
 {
     m_volume = v;
 }
 
-qint64 QCoreAudioInputBuffer::renderFromDevice(AudioUnit audioUnit, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames)
+qint64 QDarwinAudioSourceBuffer::renderFromDevice(AudioUnit audioUnit, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames)
 {
     const bool  pullMode = m_device == 0;
 
@@ -316,7 +316,7 @@ qint64 QCoreAudioInputBuffer::renderFromDevice(AudioUnit audioUnit, AudioUnitRen
     return framesRendered;
 }
 
-qint64 QCoreAudioInputBuffer::readBytes(char *data, qint64 len)
+qint64 QDarwinAudioSourceBuffer::readBytes(char *data, qint64 len)
 {
     bool    wecan = true;
     qint64  bytesCopied = 0;
@@ -338,13 +338,13 @@ qint64 QCoreAudioInputBuffer::readBytes(char *data, qint64 len)
     return bytesCopied;
 }
 
-void QCoreAudioInputBuffer::setFlushDevice(QIODevice *device)
+void QDarwinAudioSourceBuffer::setFlushDevice(QIODevice *device)
 {
     if (m_device != device)
         m_device = device;
 }
 
-void QCoreAudioInputBuffer::startFlushTimer()
+void QDarwinAudioSourceBuffer::startFlushTimer()
 {
     if (m_device != 0) {
         // We use the period time for the timer, since that's
@@ -353,12 +353,12 @@ void QCoreAudioInputBuffer::startFlushTimer()
     }
 }
 
-void QCoreAudioInputBuffer::stopFlushTimer()
+void QDarwinAudioSourceBuffer::stopFlushTimer()
 {
     m_flushTimer->stop();
 }
 
-void QCoreAudioInputBuffer::flush(bool all)
+void QDarwinAudioSourceBuffer::flush(bool all)
 {
     if (m_device == 0)
         return;
@@ -393,28 +393,28 @@ void QCoreAudioInputBuffer::flush(bool all)
     }
 }
 
-void QCoreAudioInputBuffer::reset()
+void QDarwinAudioSourceBuffer::reset()
 {
     m_buffer->reset();
     m_deviceError = false;
 }
 
-int QCoreAudioInputBuffer::available() const
+int QDarwinAudioSourceBuffer::available() const
 {
     return m_buffer->free();
 }
 
-int QCoreAudioInputBuffer::used() const
+int QDarwinAudioSourceBuffer::used() const
 {
     return m_buffer->used();
 }
 
-void QCoreAudioInputBuffer::flushBuffer()
+void QDarwinAudioSourceBuffer::flushBuffer()
 {
     flush();
 }
 
-OSStatus QCoreAudioInputBuffer::converterCallback(AudioConverterRef inAudioConverter, UInt32 *ioNumberDataPackets, AudioBufferList *ioData, AudioStreamPacketDescription **outDataPacketDescription, void *inUserData)
+OSStatus QDarwinAudioSourceBuffer::converterCallback(AudioConverterRef inAudioConverter, UInt32 *ioNumberDataPackets, AudioBufferList *ioData, AudioStreamPacketDescription **outDataPacketDescription, void *inUserData)
 {
     Q_UNUSED(inAudioConverter);
     Q_UNUSED(outDataPacketDescription);
@@ -427,7 +427,7 @@ OSStatus QCoreAudioInputBuffer::converterCallback(AudioConverterRef inAudioConve
     return noErr;
 }
 
-QCoreAudioInputDevice::QCoreAudioInputDevice(QCoreAudioInputBuffer *audioBuffer, QObject *parent)
+QDarwinAudioSourceDevice::QDarwinAudioSourceDevice(QDarwinAudioSourceBuffer *audioBuffer, QObject *parent)
     : QIODevice(parent)
     , m_audioBuffer(audioBuffer)
 {
@@ -435,12 +435,12 @@ QCoreAudioInputDevice::QCoreAudioInputDevice(QCoreAudioInputBuffer *audioBuffer,
     connect(m_audioBuffer, SIGNAL(readyRead()), SIGNAL(readyRead()));
 }
 
-qint64 QCoreAudioInputDevice::readData(char *data, qint64 len)
+qint64 QDarwinAudioSourceDevice::readData(char *data, qint64 len)
 {
     return m_audioBuffer->readBytes(data, len);
 }
 
-qint64 QCoreAudioInputDevice::writeData(const char *data, qint64 len)
+qint64 QDarwinAudioSourceDevice::writeData(const char *data, qint64 len)
 {
     Q_UNUSED(data);
     Q_UNUSED(len);
@@ -448,7 +448,7 @@ qint64 QCoreAudioInputDevice::writeData(const char *data, qint64 len)
     return 0;
 }
 
-CoreAudioInput::CoreAudioInput(const QAudioDeviceInfo &device)
+QDarwinAudioSource::QDarwinAudioSource(const QAudioDeviceInfo &device)
     : m_audioDeviceInfo(device)
     , m_isOpen(false)
     , m_internalBufferSize(DEFAULT_BUFFER_SIZE)
@@ -472,12 +472,12 @@ CoreAudioInput::CoreAudioInput(const QAudioDeviceInfo &device)
 }
 
 
-CoreAudioInput::~CoreAudioInput()
+QDarwinAudioSource::~QDarwinAudioSource()
 {
     close();
 }
 
-bool CoreAudioInput::open()
+bool QDarwinAudioSource::open()
 {
 #if defined(Q_OS_IOS)
     CoreAudioSessionManager::instance().setCategory(CoreAudioSessionManager::PlayAndRecord, CoreAudioSessionManager::MixWithOthers);
@@ -502,12 +502,12 @@ bool CoreAudioInput::open()
 
     AudioComponent component = AudioComponentFindNext(0, &componentDescription);
     if (component == 0) {
-        qWarning() << "QAudioInput: Failed to find Output component";
+        qWarning() << "QAudioSource: Failed to find Output component";
         return false;
     }
 
     if (AudioComponentInstanceNew(component, &m_audioUnit) != noErr) {
-        qWarning() << "QAudioInput: Unable to Open Output Component";
+        qWarning() << "QAudioSource: Unable to Open Output Component";
         return false;
     }
 
@@ -520,7 +520,7 @@ bool CoreAudioInput::open()
                                1,
                                &enable,
                                sizeof(enable)) != noErr) {
-        qWarning() << "QAudioInput: Unable to switch to input mode (Enable Input)";
+        qWarning() << "QAudioSource: Unable to switch to input mode (Enable Input)";
         return false;
     }
 
@@ -531,7 +531,7 @@ bool CoreAudioInput::open()
                             0,
                             &enable,
                             sizeof(enable)) != noErr) {
-        qWarning() << "QAudioInput: Unable to switch to input mode (Disable output)";
+        qWarning() << "QAudioSource: Unable to switch to input mode (Disable output)";
         return false;
     }
 
@@ -546,7 +546,7 @@ bool CoreAudioInput::open()
                                0,
                                &callback,
                                sizeof(callback)) != noErr) {
-        qWarning() << "QAudioInput: Failed to set AudioUnit callback";
+        qWarning() << "QAudioSource: Failed to set AudioUnit callback";
         return false;
     }
 
@@ -558,7 +558,7 @@ bool CoreAudioInput::open()
                              0,
                              &m_audioDeviceId,
                              sizeof(m_audioDeviceId)) != noErr) {
-        qWarning() << "QAudioInput: Unable to use configured device";
+        qWarning() << "QAudioSource: Unable to use configured device";
         return false;
     }
 #endif
@@ -586,7 +586,7 @@ bool CoreAudioInput::open()
                                  1,
                                  &m_deviceFormat,
                                  &size) != noErr) {
-            qWarning() << "QAudioInput: Unable to retrieve device format";
+            qWarning() << "QAudioSource: Unable to retrieve device format";
             return false;
         }
 
@@ -596,7 +596,7 @@ bool CoreAudioInput::open()
                                  1,
                                  &m_deviceFormat,
                                  sizeof(m_deviceFormat)) != noErr) {
-            qWarning() << "QAudioInput: Unable to set device format";
+            qWarning() << "QAudioSource: Unable to set device format";
             return false;
         }
     }
@@ -612,7 +612,7 @@ bool CoreAudioInput::open()
                              0,
                              &numberOfFrames,
                              &size) != noErr) {
-        qWarning() << "QAudioInput: Failed to get audio period size";
+        qWarning() << "QAudioSource: Failed to get audio period size";
         return false;
     }
     //BUG: numberOfFrames gets ignored after this point
@@ -626,7 +626,7 @@ bool CoreAudioInput::open()
                              0,
                              &bufferRange,
                              &size) != noErr) {
-        qWarning() << "QAudioInput: Failed to get audio period size range";
+        qWarning() << "QAudioSource: Failed to get audio period size range";
         return false;
     }
 
@@ -640,7 +640,7 @@ bool CoreAudioInput::open()
                              0,
                              &numberOfFrames,
                              sizeof(UInt32)) != noErr) {
-        qWarning() << "QAudioInput: Failed to set audio buffer size";
+        qWarning() << "QAudioSource: Failed to set audio buffer size";
         return false;
     }
 #else //iOS
@@ -654,7 +654,7 @@ bool CoreAudioInput::open()
 
     {
         QMutexLocker lock(m_audioBuffer);
-        m_audioBuffer = new QCoreAudioInputBuffer(m_internalBufferSize * 4,
+        m_audioBuffer = new QDarwinAudioSourceBuffer(m_internalBufferSize * 4,
                                             m_periodSizeBytes,
                                             m_deviceFormat,
                                             m_streamFormat,
@@ -662,11 +662,11 @@ bool CoreAudioInput::open()
 
         m_audioBuffer->setVolume(m_volume);
     }
-    m_audioIO = new QCoreAudioInputDevice(m_audioBuffer, this);
+    m_audioIO = new QDarwinAudioSourceDevice(m_audioBuffer, this);
 
     // Init
     if (AudioUnitInitialize(m_audioUnit) != noErr) {
-        qWarning() << "QAudioInput: Failed to initialize AudioUnit";
+        qWarning() << "QAudioSource: Failed to initialize AudioUnit";
         return false;
     }
 
@@ -676,7 +676,7 @@ bool CoreAudioInput::open()
 
 }
 
-void CoreAudioInput::close()
+void QDarwinAudioSource::close()
 {
     stop();
     if (m_audioUnit != 0) {
@@ -690,7 +690,7 @@ void CoreAudioInput::close()
     m_isOpen = false;
 }
 
-void CoreAudioInput::start(QIODevice *device)
+void QDarwinAudioSource::start(QIODevice *device)
 {
     QIODevice* op = device;
 
@@ -721,7 +721,7 @@ void CoreAudioInput::start(QIODevice *device)
 }
 
 
-QIODevice *CoreAudioInput::start()
+QIODevice *QDarwinAudioSource::start()
 {
     QIODevice* op = 0;
 
@@ -754,7 +754,7 @@ QIODevice *CoreAudioInput::start()
 }
 
 
-void CoreAudioInput::stop()
+void QDarwinAudioSource::stop()
 {
     QMutexLocker lock(m_audioBuffer);
     if (m_stateCode != QAudio::StoppedState) {
@@ -768,7 +768,7 @@ void CoreAudioInput::stop()
 }
 
 
-void CoreAudioInput::reset()
+void QDarwinAudioSource::reset()
 {
     QMutexLocker lock(m_audioBuffer);
     if (m_stateCode != QAudio::StoppedState) {
@@ -782,7 +782,7 @@ void CoreAudioInput::reset()
 }
 
 
-void CoreAudioInput::suspend()
+void QDarwinAudioSource::suspend()
 {
     QMutexLocker lock(m_audioBuffer);
     if (m_stateCode == QAudio::ActiveState || m_stateCode == QAudio::IdleState) {
@@ -795,7 +795,7 @@ void CoreAudioInput::suspend()
 }
 
 
-void CoreAudioInput::resume()
+void QDarwinAudioSource::resume()
 {
     QMutexLocker lock(m_audioBuffer);
     if (m_stateCode == QAudio::SuspendedState) {
@@ -808,7 +808,7 @@ void CoreAudioInput::resume()
 }
 
 
-qsizetype CoreAudioInput::bytesReady() const
+qsizetype QDarwinAudioSource::bytesReady() const
 {
     QMutexLocker lock(m_audioBuffer);
     if (!m_audioBuffer)
@@ -816,48 +816,48 @@ qsizetype CoreAudioInput::bytesReady() const
     return m_audioBuffer->used();
 }
 
-void CoreAudioInput::setBufferSize(qsizetype value)
+void QDarwinAudioSource::setBufferSize(qsizetype value)
 {
     m_internalBufferSize = value;
 }
 
 
-qsizetype CoreAudioInput::bufferSize() const
+qsizetype QDarwinAudioSource::bufferSize() const
 {
     return m_internalBufferSize;
 }
 
-qint64 CoreAudioInput::processedUSecs() const
+qint64 QDarwinAudioSource::processedUSecs() const
 {
     return m_totalFrames * 1000000 / m_audioFormat.sampleRate();
 }
 
-QAudio::Error CoreAudioInput::error() const
+QAudio::Error QDarwinAudioSource::error() const
 {
     return m_errorCode;
 }
 
 
-QAudio::State CoreAudioInput::state() const
+QAudio::State QDarwinAudioSource::state() const
 {
     return m_stateCode;
 }
 
 
-void CoreAudioInput::setFormat(const QAudioFormat &format)
+void QDarwinAudioSource::setFormat(const QAudioFormat &format)
 {
     if (m_stateCode == QAudio::StoppedState)
         m_audioFormat = format;
 }
 
 
-QAudioFormat CoreAudioInput::format() const
+QAudioFormat QDarwinAudioSource::format() const
 {
     return m_audioFormat;
 }
 
 
-void CoreAudioInput::setVolume(qreal volume)
+void QDarwinAudioSource::setVolume(qreal volume)
 {
     QMutexLocker lock(m_audioBuffer);
     m_volume = volume;
@@ -866,39 +866,39 @@ void CoreAudioInput::setVolume(qreal volume)
 }
 
 
-qreal CoreAudioInput::volume() const
+qreal QDarwinAudioSource::volume() const
 {
     return m_volume;
 }
 
-void CoreAudioInput::deviceStoppped()
+void QDarwinAudioSource::deviceStoppped()
 {
     stopTimers();
     emit stateChanged(m_stateCode);
 }
 
-void CoreAudioInput::audioThreadStart()
+void QDarwinAudioSource::audioThreadStart()
 {
     startTimers();
     m_audioThreadState.storeRelaxed(Running);
     AudioOutputUnitStart(m_audioUnit);
 }
 
-void CoreAudioInput::audioThreadStop()
+void QDarwinAudioSource::audioThreadStop()
 {
     stopTimers();
     if (m_audioThreadState.testAndSetAcquire(Running, Stopped))
         m_audioBuffer->wait();
 }
 
-void CoreAudioInput::audioDeviceStop()
+void QDarwinAudioSource::audioDeviceStop()
 {
     AudioOutputUnitStop(m_audioUnit);
     m_audioThreadState.storeRelaxed(Stopped);
     m_audioBuffer->wake();
 }
 
-void CoreAudioInput::audioDeviceActive()
+void QDarwinAudioSource::audioDeviceActive()
 {
     if (m_stateCode == QAudio::IdleState) {
         QMutexLocker lock(m_audioBuffer);
@@ -907,7 +907,7 @@ void CoreAudioInput::audioDeviceActive()
     }
 }
 
-void CoreAudioInput::audioDeviceFull()
+void QDarwinAudioSource::audioDeviceFull()
 {
     if (m_stateCode == QAudio::ActiveState) {
         QMutexLocker lock(m_audioBuffer);
@@ -917,7 +917,7 @@ void CoreAudioInput::audioDeviceFull()
     }
 }
 
-void CoreAudioInput::audioDeviceError()
+void QDarwinAudioSource::audioDeviceError()
 {
     if (m_stateCode == QAudio::ActiveState) {
         QMutexLocker lock(m_audioBuffer);
@@ -929,21 +929,21 @@ void CoreAudioInput::audioDeviceError()
     }
 }
 
-void CoreAudioInput::startTimers()
+void QDarwinAudioSource::startTimers()
 {
     m_audioBuffer->startFlushTimer();
 }
 
-void CoreAudioInput::stopTimers()
+void QDarwinAudioSource::stopTimers()
 {
     m_audioBuffer->stopFlushTimer();
 }
 
-OSStatus CoreAudioInput::inputCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData)
+OSStatus QDarwinAudioSource::inputCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData)
 {
     Q_UNUSED(ioData);
 
-    CoreAudioInput* d = static_cast<CoreAudioInput*>(inRefCon);
+    QDarwinAudioSource* d = static_cast<QDarwinAudioSource*>(inRefCon);
 
     const int threadState = d->m_audioThreadState.loadAcquire();
     if (threadState == Stopped)
@@ -974,4 +974,4 @@ OSStatus CoreAudioInput::inputCallback(void *inRefCon, AudioUnitRenderActionFlag
 
 QT_END_NAMESPACE
 
-#include "moc_qcoreaudioinput_p.cpp"
+#include "moc_qdarwinaudiosource_p.cpp"
diff --git a/src/multimedia/platform/darwin/audio/qcoreaudioinput_p.h b/src/multimedia/platform/darwin/audio/qdarwinaudiosource_p.h
index acbe0ff14..02c8f5ea5 100644
--- a/src/multimedia/platform/darwin/audio/qcoreaudioinput_p.h
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosource_p.h
@@ -66,8 +66,8 @@ QT_BEGIN_NAMESPACE
 
 class CoreAudioRingBuffer;
 class QCoreAudioPacketFeeder;
-class QCoreAudioInputBuffer;
-class QCoreAudioInputDevice;
+class QDarwinAudioSourceBuffer;
+class QDarwinAudioSourceDevice;
 
 class QCoreAudioBufferList
 {
@@ -107,18 +107,18 @@ private:
     QCoreAudioBufferList *m_audioBufferList;
 };
 
-class QCoreAudioInputBuffer : public QObject
+class QDarwinAudioSourceBuffer : public QObject
 {
     Q_OBJECT
 
 public:
-    QCoreAudioInputBuffer(int bufferSize,
+    QDarwinAudioSourceBuffer(int bufferSize,
                         int maxPeriodSize,
                         AudioStreamBasicDescription const& inputFormat,
                         AudioStreamBasicDescription const& outputFormat,
                         QObject *parent);
 
-    ~QCoreAudioInputBuffer();
+    ~QDarwinAudioSourceBuffer();
 
     qreal volume() const;
     void setVolume(qreal v);
@@ -180,12 +180,12 @@ private:
                                 void *inUserData);
 };
 
-class QCoreAudioInputDevice : public QIODevice
+class QDarwinAudioSourceDevice : public QIODevice
 {
     Q_OBJECT
 
 public:
-    QCoreAudioInputDevice(QCoreAudioInputBuffer *audioBuffer, QObject *parent);
+    QDarwinAudioSourceDevice(QDarwinAudioSourceBuffer *audioBuffer, QObject *parent);
 
     qint64 readData(char *data, qint64 len);
     qint64 writeData(const char *data, qint64 len);
@@ -193,16 +193,16 @@ public:
     bool isSequential() const { return true; }
 
 private:
-    QCoreAudioInputBuffer *m_audioBuffer;
+    QDarwinAudioSourceBuffer *m_audioBuffer;
 };
 
-class CoreAudioInput : public QAbstractAudioInput
+class QDarwinAudioSource : public QPlatformAudioSource
 {
     Q_OBJECT
 
 public:
-    CoreAudioInput(const QAudioDeviceInfo &device);
-    ~CoreAudioInput();
+    QDarwinAudioSource(const QAudioDeviceInfo &device);
+    ~QDarwinAudioSource();
 
     void start(QIODevice *device);
     QIODevice *start();
@@ -268,7 +268,7 @@ private:
     Float64 m_clockFrequency;
     QAudio::Error m_errorCode;
     QAudio::State m_stateCode;
-    QCoreAudioInputBuffer *m_audioBuffer;
+    QDarwinAudioSourceBuffer *m_audioBuffer;
     QAtomicInt m_audioThreadState;
     AudioStreamBasicDescription m_streamFormat;
     AudioStreamBasicDescription m_deviceFormat;
diff --git a/src/multimedia/platform/darwin/qdarwinmediadevices.mm b/src/multimedia/platform/darwin/qdarwinmediadevices.mm
index 637386917..ac5134d9c 100644
--- a/src/multimedia/platform/darwin/qdarwinmediadevices.mm
+++ b/src/multimedia/platform/darwin/qdarwinmediadevices.mm
@@ -42,7 +42,7 @@
 #include "qcamerainfo_p.h"
 #include "qaudiodeviceinfo_p.h"
 #include "private/qcoreaudiodeviceinfo_p.h"
-#include "private/qcoreaudioinput_p.h"
+#include "private/qdarwinaudiosource_p.h"
 #include "private/qcoreaudiooutput_p.h"
 #include "private/avfcamera_p.h"
 #include "private/avfcamerautility_p.h"
@@ -329,9 +329,9 @@ void QDarwinMediaDevices::updateAudioDevices()
 #endif
 }
 
-QAbstractAudioInput *QDarwinMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &info)
+QPlatformAudioSource *QDarwinMediaDevices::createAudioSource(const QAudioDeviceInfo &info)
 {
-    return new CoreAudioInput(info);
+    return new QDarwinAudioSource(info);
 }
 
 QAbstractAudioOutput *QDarwinMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &info)
diff --git a/src/multimedia/platform/darwin/qdarwinmediadevices_p.h b/src/multimedia/platform/darwin/qdarwinmediadevices_p.h
index 7d4dce1c7..f7de58f36 100644
--- a/src/multimedia/platform/darwin/qdarwinmediadevices_p.h
+++ b/src/multimedia/platform/darwin/qdarwinmediadevices_p.h
@@ -71,7 +71,7 @@ public:
     QList<QAudioDeviceInfo> audioInputs() const override;
     QList<QAudioDeviceInfo> audioOutputs() const override;
     QList<QCameraInfo> videoInputs() const override;
-    QAbstractAudioInput *createAudioInputDevice(const QAudioDeviceInfo &info) override;
+    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &info) override;
     QAbstractAudioOutput *createAudioOutputDevice(const QAudioDeviceInfo &info) override;
 
     void updateCameraDevices();
diff --git a/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp
index 40396b097..e2701c723 100644
--- a/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/qmath.h>
 #include <private/qaudiohelpers_p.h>
 
-#include "qaudioinput_gstreamer_p.h"
+#include "qgstreameraudiosource_p.h"
 #include "qaudiodeviceinfo_gstreamer_p.h"
 #include <sys/types.h>
 #include <unistd.h>
@@ -54,19 +54,19 @@ Q_DECLARE_METATYPE(GstSample *);
 QT_BEGIN_NAMESPACE
 
 
-QGStreamerAudioInput::QGStreamerAudioInput(const QAudioDeviceInfo &device)
+QGStreamerAudioSource::QGStreamerAudioSource(const QAudioDeviceInfo &device)
     : m_info(device),
       m_device(device.id())
 {
     qRegisterMetaType<GstSample *>();
 }
 
-QGStreamerAudioInput::~QGStreamerAudioInput()
+QGStreamerAudioSource::~QGStreamerAudioSource()
 {
     close();
 }
 
-void QGStreamerAudioInput::setError(QAudio::Error error)
+void QGStreamerAudioSource::setError(QAudio::Error error)
 {
     if (m_errorState == error)
         return;
@@ -75,12 +75,12 @@ void QGStreamerAudioInput::setError(QAudio::Error error)
     emit errorChanged(error);
 }
 
-QAudio::Error QGStreamerAudioInput::error() const
+QAudio::Error QGStreamerAudioSource::error() const
 {
     return m_errorState;
 }
 
-void QGStreamerAudioInput::setState(QAudio::State state)
+void QGStreamerAudioSource::setState(QAudio::State state)
 {
     if (m_deviceState == state)
         return;
@@ -89,23 +89,23 @@ void QGStreamerAudioInput::setState(QAudio::State state)
     emit stateChanged(state);
 }
 
-QAudio::State QGStreamerAudioInput::state() const
+QAudio::State QGStreamerAudioSource::state() const
 {
     return m_deviceState;
 }
 
-void QGStreamerAudioInput::setFormat(const QAudioFormat &format)
+void QGStreamerAudioSource::setFormat(const QAudioFormat &format)
 {
     if (m_deviceState == QAudio::StoppedState)
         m_format = format;
 }
 
-QAudioFormat QGStreamerAudioInput::format() const
+QAudioFormat QGStreamerAudioSource::format() const
 {
     return m_format;
 }
 
-void QGStreamerAudioInput::start(QIODevice *device)
+void QGStreamerAudioSource::start(QIODevice *device)
 {
     setState(QAudio::StoppedState);
     setError(QAudio::NoError);
@@ -121,7 +121,7 @@ void QGStreamerAudioInput::start(QIODevice *device)
     setState(QAudio::ActiveState);
 }
 
-QIODevice *QGStreamerAudioInput::start()
+QIODevice *QGStreamerAudioSource::start()
 {
     setState(QAudio::StoppedState);
     setError(QAudio::NoError);
@@ -140,7 +140,7 @@ QIODevice *QGStreamerAudioInput::start()
     return m_audioSink;
 }
 
-void QGStreamerAudioInput::stop()
+void QGStreamerAudioSource::stop()
 {
     if (m_deviceState == QAudio::StoppedState)
         return;
@@ -151,7 +151,7 @@ void QGStreamerAudioInput::stop()
     setState(QAudio::StoppedState);
 }
 
-bool QGStreamerAudioInput::open()
+bool QGStreamerAudioSource::open()
 {
     if (m_opened)
         return true;
@@ -187,7 +187,7 @@ bool QGStreamerAudioInput::open()
     gstPipeline = QGstPipeline("pipeline");
 
     auto *gstBus = gst_pipeline_get_bus(gstPipeline.pipeline());
-    gst_bus_add_watch(gstBus, &QGStreamerAudioInput::busMessage, this);
+    gst_bus_add_watch(gstBus, &QGStreamerAudioSource::busMessage, this);
     gst_object_unref (gstBus);
 
     gstAppSink = createAppSink();
@@ -212,7 +212,7 @@ bool QGStreamerAudioInput::open()
     return true;
 }
 
-void QGStreamerAudioInput::close()
+void QGStreamerAudioSource::close()
 {
     if (!m_opened)
         return;
@@ -230,9 +230,9 @@ void QGStreamerAudioInput::close()
     m_opened = false;
 }
 
-gboolean QGStreamerAudioInput::busMessage(GstBus *, GstMessage *msg, gpointer user_data)
+gboolean QGStreamerAudioSource::busMessage(GstBus *, GstMessage *msg, gpointer user_data)
 {
-    QGStreamerAudioInput *input = static_cast<QGStreamerAudioInput *>(user_data);
+    QGStreamerAudioSource *input = static_cast<QGStreamerAudioSource *>(user_data);
     switch (GST_MESSAGE_TYPE (msg)) {
     case GST_MESSAGE_EOS:
         input->stop();
@@ -256,12 +256,12 @@ gboolean QGStreamerAudioInput::busMessage(GstBus *, GstMessage *msg, gpointer us
     return false;
 }
 
-qsizetype QGStreamerAudioInput::bytesReady() const
+qsizetype QGStreamerAudioSource::bytesReady() const
 {
     return m_buffer.size();
 }
 
-void QGStreamerAudioInput::resume()
+void QGStreamerAudioSource::resume()
 {
     if (m_deviceState == QAudio::SuspendedState || m_deviceState == QAudio::IdleState) {
         gstPipeline.setState(GST_STATE_PLAYING);
@@ -270,7 +270,7 @@ void QGStreamerAudioInput::resume()
     }
 }
 
-void QGStreamerAudioInput::setVolume(qreal vol)
+void QGStreamerAudioSource::setVolume(qreal vol)
 {
     if (m_volume == vol)
         return;
@@ -280,27 +280,27 @@ void QGStreamerAudioInput::setVolume(qreal vol)
         gstVolume.set("volume", vol);
 }
 
-qreal QGStreamerAudioInput::volume() const
+qreal QGStreamerAudioSource::volume() const
 {
     return m_volume;
 }
 
-void QGStreamerAudioInput::setBufferSize(qsizetype value)
+void QGStreamerAudioSource::setBufferSize(qsizetype value)
 {
     m_bufferSize = value;
 }
 
-qsizetype QGStreamerAudioInput::bufferSize() const
+qsizetype QGStreamerAudioSource::bufferSize() const
 {
     return m_bufferSize;
 }
 
-qint64 QGStreamerAudioInput::processedUSecs() const
+qint64 QGStreamerAudioSource::processedUSecs() const
 {
     return m_format.durationForBytes(m_bytesWritten);
 }
 
-void QGStreamerAudioInput::suspend()
+void QGStreamerAudioSource::suspend()
 {
     if (m_deviceState == QAudio::ActiveState) {
         setError(QAudio::NoError);
@@ -310,7 +310,7 @@ void QGStreamerAudioInput::suspend()
     }
 }
 
-void QGStreamerAudioInput::reset()
+void QGStreamerAudioSource::reset()
 {
     stop();
     m_buffer.clear();
@@ -318,7 +318,7 @@ void QGStreamerAudioInput::reset()
 
 //#define MAX_BUFFERS_IN_QUEUE 4
 
-QGstElement QGStreamerAudioInput::createAppSink()
+QGstElement QGStreamerAudioSource::createAppSink()
 {
     QGstElement sink("appsink", "appsink");
     GstAppSink *appSink = reinterpret_cast<GstAppSink *>(sink.element());
@@ -334,7 +334,7 @@ QGstElement QGStreamerAudioInput::createAppSink()
     return sink;
 }
 
-void QGStreamerAudioInput::newDataAvailable(GstSample *sample)
+void QGStreamerAudioSource::newDataAvailable(GstSample *sample)
 {
     if (m_audioSink) {
         GstBuffer *buffer = gst_sample_get_buffer(sample);
@@ -358,10 +358,10 @@ void QGStreamerAudioInput::newDataAvailable(GstSample *sample)
     gst_sample_unref(sample);
 }
 
-GstFlowReturn QGStreamerAudioInput::new_sample(GstAppSink *sink, gpointer user_data)
+GstFlowReturn QGStreamerAudioSource::new_sample(GstAppSink *sink, gpointer user_data)
 {
     // "Note that the preroll buffer will also be returned as the first buffer when calling gst_app_sink_pull_buffer()."
-    QGStreamerAudioInput *control = static_cast<QGStreamerAudioInput*>(user_data);
+    QGStreamerAudioSource *control = static_cast<QGStreamerAudioSource*>(user_data);
 
     GstSample *sample = gst_app_sink_pull_sample(sink);
     QMetaObject::invokeMethod(control, "newDataAvailable", Qt::AutoConnection, Q_ARG(GstSample *, sample));
@@ -369,15 +369,15 @@ GstFlowReturn QGStreamerAudioInput::new_sample(GstAppSink *sink, gpointer user_d
     return GST_FLOW_OK;
 }
 
-void QGStreamerAudioInput::eos(GstAppSink *, gpointer user_data)
+void QGStreamerAudioSource::eos(GstAppSink *, gpointer user_data)
 {
-    QGStreamerAudioInput *control = static_cast<QGStreamerAudioInput*>(user_data);
+    QGStreamerAudioSource *control = static_cast<QGStreamerAudioSource*>(user_data);
     control->setState(QAudio::StoppedState);
 }
 
-GStreamerInputPrivate::GStreamerInputPrivate(QGStreamerAudioInput *audio)
+GStreamerInputPrivate::GStreamerInputPrivate(QGStreamerAudioSource *audio)
 {
-    m_audioDevice = qobject_cast<QGStreamerAudioInput*>(audio);
+    m_audioDevice = qobject_cast<QGStreamerAudioSource*>(audio);
 }
 
 qint64 GStreamerInputPrivate::readData(char *data, qint64 len)
@@ -404,4 +404,4 @@ qint64 GStreamerInputPrivate::bytesAvailable() const
 
 QT_END_NAMESPACE
 
-#include "moc_qaudioinput_gstreamer_p.cpp"
+#include "moc_qgstreameraudiosource_p.cpp"
diff --git a/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer_p.h b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource_p.h
index 2997b0084..a5bcdf084 100644
--- a/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource_p.h
@@ -73,14 +73,14 @@ QT_BEGIN_NAMESPACE
 
 class GStreamerInputPrivate;
 
-class QGStreamerAudioInput
-    : public QAbstractAudioInput
+class QGStreamerAudioSource
+    : public QPlatformAudioSource
 {
     Q_OBJECT
     friend class GStreamerInputPrivate;
 public:
-    QGStreamerAudioInput(const QAudioDeviceInfo &device);
-    ~QGStreamerAudioInput();
+    QGStreamerAudioSource(const QAudioDeviceInfo &device);
+    ~QGStreamerAudioSource();
 
     void start(QIODevice *device) override;
     QIODevice *start() override;
@@ -143,7 +143,7 @@ class GStreamerInputPrivate : public QIODevice
 {
     Q_OBJECT
 public:
-    GStreamerInputPrivate(QGStreamerAudioInput *audio);
+    GStreamerInputPrivate(QGStreamerAudioSource *audio);
     ~GStreamerInputPrivate() {};
 
     qint64 readData(char *data, qint64 len) override;
@@ -151,7 +151,7 @@ public:
     qint64 bytesAvailable() const override;
     bool isSequential() const override { return true; }
 private:
-    QGStreamerAudioInput *m_audioDevice;
+    QGStreamerAudioSource *m_audioDevice;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp b/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp
index 3e77eb4b0..c54ab8fd0 100644
--- a/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp
+++ b/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp
@@ -41,7 +41,7 @@
 #include "qmediadevices.h"
 #include "qcamerainfo_p.h"
 
-#include "private/qaudioinput_gstreamer_p.h"
+#include "private/qgstreameraudiosource_p.h"
 #include "private/qaudiooutput_gstreamer_p.h"
 #include "private/qaudiodeviceinfo_gstreamer_p.h"
 #include "private/qgstutils_p.h"
@@ -187,9 +187,9 @@ QList<QCameraInfo> QGstreamerMediaDevices::videoInputs() const
     return devices;
 }
 
-QAbstractAudioInput *QGstreamerMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QGstreamerMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
 {
-    return new QGStreamerAudioInput(deviceInfo);
+    return new QGStreamerAudioSource(deviceInfo);
 }
 
 QAbstractAudioOutput *QGstreamerMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo)
diff --git a/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h b/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h
index 21dc124c4..d9fa59d9d 100644
--- a/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h
+++ b/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h
@@ -66,7 +66,7 @@ public:
     QList<QAudioDeviceInfo> audioInputs() const override;
     QList<QAudioDeviceInfo> audioOutputs() const override;
     QList<QCameraInfo> videoInputs() const override;
-    QAbstractAudioInput *createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) override;
+    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
     QAbstractAudioOutput *createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) override;
 
     void addDevice(GstDevice *);
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp
index fa6999167..8cc18edfd 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp
@@ -41,7 +41,7 @@
 #include "qmediadevices.h"
 #include "qcamerainfo_p.h"
 
-#include "private/qaudioinput_pulse_p.h"
+#include "private/qpulseaudiosource_p.h"
 #include "private/qaudiooutput_pulse_p.h"
 #include "private/qaudiodeviceinfo_pulse_p.h"
 #include "private/qaudioengine_pulse_p.h"
@@ -69,9 +69,9 @@ QList<QCameraInfo> QPulseAudioMediaDevices::videoInputs() const
     return {};
 }
 
-QAbstractAudioInput *QPulseAudioMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QPulseAudioMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
 {
-    return new QPulseAudioInput(deviceInfo.id());
+    return new QPulseAudioSource(deviceInfo.id());
 }
 
 QAbstractAudioOutput *QPulseAudioMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo)
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices_p.h
index 522a9384c..6986a9ec6 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices_p.h
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices_p.h
@@ -67,7 +67,7 @@ public:
     QList<QAudioDeviceInfo> audioInputs() const override;
     QList<QAudioDeviceInfo> audioOutputs() const override;
     QList<QCameraInfo> videoInputs() const override;
-    QAbstractAudioInput *createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) override;
+    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
     QAbstractAudioOutput *createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) override;
 
 private:
diff --git a/src/multimedia/platform/pulseaudio/qaudioinput_pulse.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiosource.cpp
index b7c423f90..f2154306f 100644
--- a/src/multimedia/platform/pulseaudio/qaudioinput_pulse.cpp
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiosource.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/qmath.h>
 #include <private/qaudiohelpers_p.h>
 
-#include "qaudioinput_pulse_p.h"
+#include "qpulseaudiosource_p.h"
 #include "qaudioengine_pulse_p.h"
 #include "qaudiodeviceinfo_pulse_p.h"
 #include "qpulsehelpers_p.h"
@@ -74,7 +74,7 @@ static void inputStreamStateCallback(pa_stream *stream, void *userdata)
         break;
         case PA_STREAM_READY: {
 #ifdef DEBUG_PULSE
-            QPulseAudioInput *audioInput = static_cast<QPulseAudioInput*>(userdata);
+            QPulseAudioSource *audioInput = static_cast<QPulseAudioSource*>(userdata);
             const pa_buffer_attr *buffer_attr = pa_stream_get_buffer_attr(stream);
             qDebug() << "*** maxlength: " << buffer_attr->maxlength;
             qDebug() << "*** prebuf: " << buffer_attr->prebuf;
@@ -125,7 +125,7 @@ static void inputStreamSuccessCallback(pa_stream *stream, int success, void *use
     pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0);
 }
 
-QPulseAudioInput::QPulseAudioInput(const QByteArray &device)
+QPulseAudioSource::QPulseAudioSource(const QByteArray &device)
     : m_totalTimeValue(0)
     , m_audioSource(nullptr)
     , m_errorState(QAudio::NoError)
@@ -144,7 +144,7 @@ QPulseAudioInput::QPulseAudioInput(const QByteArray &device)
     connect(m_timer, SIGNAL(timeout()), SLOT(userFeed()));
 }
 
-QPulseAudioInput::~QPulseAudioInput()
+QPulseAudioSource::~QPulseAudioSource()
 {
     close();
     disconnect(m_timer, SIGNAL(timeout()));
@@ -152,7 +152,7 @@ QPulseAudioInput::~QPulseAudioInput()
     delete m_timer;
 }
 
-void QPulseAudioInput::setError(QAudio::Error error)
+void QPulseAudioSource::setError(QAudio::Error error)
 {
     if (m_errorState == error)
         return;
@@ -161,12 +161,12 @@ void QPulseAudioInput::setError(QAudio::Error error)
     emit errorChanged(error);
 }
 
-QAudio::Error QPulseAudioInput::error() const
+QAudio::Error QPulseAudioSource::error() const
 {
     return m_errorState;
 }
 
-void QPulseAudioInput::setState(QAudio::State state)
+void QPulseAudioSource::setState(QAudio::State state)
 {
     if (m_deviceState == state)
         return;
@@ -175,23 +175,23 @@ void QPulseAudioInput::setState(QAudio::State state)
     emit stateChanged(state);
 }
 
-QAudio::State QPulseAudioInput::state() const
+QAudio::State QPulseAudioSource::state() const
 {
     return m_deviceState;
 }
 
-void QPulseAudioInput::setFormat(const QAudioFormat &format)
+void QPulseAudioSource::setFormat(const QAudioFormat &format)
 {
     if (m_deviceState == QAudio::StoppedState)
         m_format = format;
 }
 
-QAudioFormat QPulseAudioInput::format() const
+QAudioFormat QPulseAudioSource::format() const
 {
     return m_format;
 }
 
-void QPulseAudioInput::start(QIODevice *device)
+void QPulseAudioSource::start(QIODevice *device)
 {
     setState(QAudio::StoppedState);
     setError(QAudio::NoError);
@@ -212,7 +212,7 @@ void QPulseAudioInput::start(QIODevice *device)
     setState(QAudio::ActiveState);
 }
 
-QIODevice *QPulseAudioInput::start()
+QIODevice *QPulseAudioSource::start()
 {
     setState(QAudio::StoppedState);
     setError(QAudio::NoError);
@@ -236,7 +236,7 @@ QIODevice *QPulseAudioInput::start()
     return m_audioSource;
 }
 
-void QPulseAudioInput::stop()
+void QPulseAudioSource::stop()
 {
     if (m_deviceState == QAudio::StoppedState)
         return;
@@ -247,7 +247,7 @@ void QPulseAudioInput::stop()
     setState(QAudio::StoppedState);
 }
 
-bool QPulseAudioInput::open()
+bool QPulseAudioSource::open()
 {
     if (m_opened)
         return true;
@@ -337,7 +337,7 @@ bool QPulseAudioInput::open()
 
     pulseEngine->unlock();
 
-    connect(pulseEngine, &QPulseAudioEngine::contextFailed, this, &QPulseAudioInput::onPulseContextFailed);
+    connect(pulseEngine, &QPulseAudioEngine::contextFailed, this, &QPulseAudioSource::onPulseContextFailed);
 
     m_opened = true;
     m_timer->start(m_periodTime);
@@ -348,7 +348,7 @@ bool QPulseAudioInput::open()
     return true;
 }
 
-void QPulseAudioInput::close()
+void QPulseAudioSource::close()
 {
     if (!m_opened)
         return;
@@ -372,7 +372,7 @@ void QPulseAudioInput::close()
         pulseEngine->unlock();
     }
 
-    disconnect(pulseEngine, &QPulseAudioEngine::contextFailed, this, &QPulseAudioInput::onPulseContextFailed);
+    disconnect(pulseEngine, &QPulseAudioEngine::contextFailed, this, &QPulseAudioSource::onPulseContextFailed);
 
     if (!m_pullMode && m_audioSource) {
         delete m_audioSource;
@@ -381,7 +381,7 @@ void QPulseAudioInput::close()
     m_opened = false;
 }
 
-int QPulseAudioInput::checkBytesReady()
+int QPulseAudioSource::checkBytesReady()
 {
     if (m_deviceState != QAudio::ActiveState && m_deviceState != QAudio::IdleState) {
         m_bytesAvailable = 0;
@@ -392,12 +392,12 @@ int QPulseAudioInput::checkBytesReady()
     return m_bytesAvailable;
 }
 
-qsizetype QPulseAudioInput::bytesReady() const
+qsizetype QPulseAudioSource::bytesReady() const
 {
     return qMax(m_bytesAvailable, 0);
 }
 
-qint64 QPulseAudioInput::read(char *data, qint64 len)
+qint64 QPulseAudioSource::read(char *data, qint64 len)
 {
     m_bytesAvailable = checkBytesReady();
 
@@ -423,7 +423,7 @@ qint64 QPulseAudioInput::read(char *data, qint64 len)
         size_t readLength = 0;
 
 #ifdef DEBUG_PULSE
-        qDebug() << "QPulseAudioInput::read -- " << pa_stream_readable_size(m_stream) << " bytes available from pulse audio";
+        qDebug() << "QPulseAudioSource::read -- " << pa_stream_readable_size(m_stream) << " bytes available from pulse audio";
 #endif
 
         QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance();
@@ -461,12 +461,12 @@ qint64 QPulseAudioInput::read(char *data, qint64 len)
         }
 
 #ifdef DEBUG_PULSE
-        qDebug() << "QPulseAudioInput::read -- wrote " << actualLength << " to client";
+        qDebug() << "QPulseAudioSource::read -- wrote " << actualLength << " to client";
 #endif
 
         if (actualLength < qint64(readLength)) {
 #ifdef DEBUG_PULSE
-            qDebug() << "QPulseAudioInput::read -- appending " << readLength - actualLength << " bytes of data to temp buffer";
+            qDebug() << "QPulseAudioSource::read -- appending " << readLength - actualLength << " bytes of data to temp buffer";
 #endif
             int diff = readLength - actualLength;
             int oldSize = m_tempBuffer.size();
@@ -486,13 +486,13 @@ qint64 QPulseAudioInput::read(char *data, qint64 len)
     }
 
 #ifdef DEBUG_PULSE
-    qDebug() << "QPulseAudioInput::read -- returning after reading " << readBytes << " bytes";
+    qDebug() << "QPulseAudioSource::read -- returning after reading " << readBytes << " bytes";
 #endif
 
     return readBytes;
 }
 
-void QPulseAudioInput::applyVolume(const void *src, void *dest, int len)
+void QPulseAudioSource::applyVolume(const void *src, void *dest, int len)
 {
     if (m_volume < 1.f)
         QAudioHelperInternal::qMultiplySamples(m_volume, m_format, src, dest, len);
@@ -500,7 +500,7 @@ void QPulseAudioInput::applyVolume(const void *src, void *dest, int len)
         memcpy(dest, src, len);
 }
 
-void QPulseAudioInput::resume()
+void QPulseAudioSource::resume()
 {
     if (m_deviceState == QAudio::SuspendedState || m_deviceState == QAudio::IdleState) {
         QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance();
@@ -521,7 +521,7 @@ void QPulseAudioInput::resume()
     }
 }
 
-void QPulseAudioInput::setVolume(qreal vol)
+void QPulseAudioSource::setVolume(qreal vol)
 {
     if (qFuzzyCompare(m_volume, vol))
         return;
@@ -529,22 +529,22 @@ void QPulseAudioInput::setVolume(qreal vol)
     m_volume = qBound(qreal(0), vol, qreal(1));
 }
 
-qreal QPulseAudioInput::volume() const
+qreal QPulseAudioSource::volume() const
 {
     return m_volume;
 }
 
-void QPulseAudioInput::setBufferSize(qsizetype value)
+void QPulseAudioSource::setBufferSize(qsizetype value)
 {
     m_bufferSize = value;
 }
 
-qsizetype QPulseAudioInput::bufferSize() const
+qsizetype QPulseAudioSource::bufferSize() const
 {
     return m_bufferSize;
 }
 
-qint64 QPulseAudioInput::processedUSecs() const
+qint64 QPulseAudioSource::processedUSecs() const
 {
     pa_sample_spec spec = QPulseAudioInternal::audioFormatToSampleSpec(m_format);
     qint64 result = pa_bytes_to_usec(m_totalTimeValue, &spec);
@@ -552,7 +552,7 @@ qint64 QPulseAudioInput::processedUSecs() const
     return result;
 }
 
-void QPulseAudioInput::suspend()
+void QPulseAudioSource::suspend()
 {
     if (m_deviceState == QAudio::ActiveState) {
         setError(QAudio::NoError);
@@ -573,7 +573,7 @@ void QPulseAudioInput::suspend()
     }
 }
 
-void QPulseAudioInput::userFeed()
+void QPulseAudioSource::userFeed()
 {
     if (m_deviceState == QAudio::StoppedState || m_deviceState == QAudio::SuspendedState)
         return;
@@ -584,7 +584,7 @@ void QPulseAudioInput::userFeed()
     deviceReady();
 }
 
-bool QPulseAudioInput::deviceReady()
+bool QPulseAudioSource::deviceReady()
 {
    if (m_pullMode) {
         // reads some audio data and writes it to QIODevice
@@ -604,13 +604,13 @@ bool QPulseAudioInput::deviceReady()
     return true;
 }
 
-void QPulseAudioInput::reset()
+void QPulseAudioSource::reset()
 {
     stop();
     m_bytesAvailable = 0;
 }
 
-void QPulseAudioInput::onPulseContextFailed()
+void QPulseAudioSource::onPulseContextFailed()
 {
     close();
 
@@ -618,9 +618,9 @@ void QPulseAudioInput::onPulseContextFailed()
     setState(QAudio::StoppedState);
 }
 
-PulseInputPrivate::PulseInputPrivate(QPulseAudioInput *audio)
+PulseInputPrivate::PulseInputPrivate(QPulseAudioSource *audio)
 {
-    m_audioDevice = qobject_cast<QPulseAudioInput*>(audio);
+    m_audioDevice = qobject_cast<QPulseAudioSource*>(audio);
 }
 
 qint64 PulseInputPrivate::readData(char *data, qint64 len)
@@ -642,4 +642,4 @@ void PulseInputPrivate::trigger()
 
 QT_END_NAMESPACE
 
-#include "moc_qaudioinput_pulse_p.cpp"
+#include "moc_qpulseaudiosource_p.cpp"
diff --git a/src/multimedia/platform/pulseaudio/qaudioinput_pulse_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiosource_p.h
index 49fa71e5c..e5fee582e 100644
--- a/src/multimedia/platform/pulseaudio/qaudioinput_pulse_p.h
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiosource_p.h
@@ -68,13 +68,13 @@ QT_BEGIN_NAMESPACE
 
 class PulseInputPrivate;
 
-class QPulseAudioInput : public QAbstractAudioInput
+class QPulseAudioSource : public QPlatformAudioSource
 {
     Q_OBJECT
 
 public:
-    QPulseAudioInput(const QByteArray &device);
-    ~QPulseAudioInput();
+    QPulseAudioSource(const QByteArray &device);
+    ~QPulseAudioSource();
 
     qint64 read(char *data, qint64 len);
 
@@ -137,7 +137,7 @@ class PulseInputPrivate : public QIODevice
 {
     Q_OBJECT
 public:
-    PulseInputPrivate(QPulseAudioInput *audio);
+    PulseInputPrivate(QPulseAudioSource *audio);
     ~PulseInputPrivate() {};
 
     qint64 readData(char *data, qint64 len) override;
@@ -146,7 +146,7 @@ public:
     void trigger();
 
 private:
-    QPulseAudioInput *m_audioDevice;
+    QPulseAudioSource *m_audioDevice;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/qnx/audio/qnxaudioinput.cpp b/src/multimedia/platform/qnx/audio/qqnxaudiosource.cpp
index 59c470760..803c22ff4 100644
--- a/src/multimedia/platform/qnx/audio/qnxaudioinput.cpp
+++ b/src/multimedia/platform/qnx/audio/qqnxaudiosource.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qnxaudioinput_p.h"
+#include "qqnxaudiosource_p.h"
 
 #include "qnxaudioutils_p.h"
 
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QnxAudioInput::QnxAudioInput()
+QQnxAudioSource::QQnxAudioSource()
     : m_audioSource(0)
     , m_pcmHandle(0)
     , m_pcmNotifier(0)
@@ -64,12 +64,12 @@ QnxAudioInput::QnxAudioInput()
 {
 }
 
-QnxAudioInput::~QnxAudioInput()
+QQnxAudioSource::~QQnxAudioSource()
 {
     close();
 }
 
-void QnxAudioInput::start(QIODevice *device)
+void QQnxAudioSource::start(QIODevice *device)
 {
     if (m_state != QAudio::StoppedState)
         close();
@@ -89,7 +89,7 @@ void QnxAudioInput::start(QIODevice *device)
     }
 }
 
-QIODevice *QnxAudioInput::start()
+QIODevice *QQnxAudioSource::start()
 {
     if (m_state != QAudio::StoppedState)
         close();
@@ -115,7 +115,7 @@ QIODevice *QnxAudioInput::start()
     return m_audioSource;
 }
 
-void QnxAudioInput::stop()
+void QQnxAudioSource::stop()
 {
     if (m_state == QAudio::StoppedState)
         return;
@@ -125,13 +125,13 @@ void QnxAudioInput::stop()
     close();
 }
 
-void QnxAudioInput::reset()
+void QQnxAudioSource::reset()
 {
     stop();
     m_bytesAvailable = 0;
 }
 
-void QnxAudioInput::suspend()
+void QQnxAudioSource::suspend()
 {
     snd_pcm_capture_pause(m_pcmHandle);
 
@@ -141,7 +141,7 @@ void QnxAudioInput::suspend()
     setState(QAudio::SuspendedState);
 }
 
-void QnxAudioInput::resume()
+void QQnxAudioSource::resume()
 {
     snd_pcm_capture_resume(m_pcmHandle);
 
@@ -155,58 +155,58 @@ void QnxAudioInput::resume()
     }
 }
 
-qsizetype QnxAudioInput::bytesReady() const
+qsizetype QQnxAudioSource::bytesReady() const
 {
     return qMax(m_bytesAvailable, 0);
 }
 
-void QnxAudioInput::setBufferSize(qsizetype bufferSize)
+void QQnxAudioSource::setBufferSize(qsizetype bufferSize)
 {
     m_bufferSize = bufferSize;
 }
 
-qsizetype QnxAudioInput::bufferSize() const
+qsizetype QQnxAudioSource::bufferSize() const
 {
     return m_bufferSize;
 }
 
-qint64 QnxAudioInput::processedUSecs() const
+qint64 QQnxAudioSource::processedUSecs() const
 {
     return qint64(1000000) * m_format.framesForBytes(m_bytesRead) / m_format.sampleRate();
 }
 
-QAudio::Error QnxAudioInput::error() const
+QAudio::Error QQnxAudioSource::error() const
 {
     return m_error;
 }
 
-QAudio::State QnxAudioInput::state() const
+QAudio::State QQnxAudioSource::state() const
 {
     return m_state;
 }
 
-void QnxAudioInput::setFormat(const QAudioFormat &format)
+void QQnxAudioSource::setFormat(const QAudioFormat &format)
 {
     if (m_state == QAudio::StoppedState)
         m_format = format;
 }
 
-QAudioFormat QnxAudioInput::format() const
+QAudioFormat QQnxAudioSource::format() const
 {
     return m_format;
 }
 
-void QnxAudioInput::setVolume(qreal volume)
+void QQnxAudioSource::setVolume(qreal volume)
 {
     m_volume = qBound(qreal(0.0), volume, qreal(1.0));
 }
 
-qreal QnxAudioInput::volume() const
+qreal QQnxAudioSource::volume() const
 {
     return m_volume;
 }
 
-void QnxAudioInput::userFeed()
+void QQnxAudioSource::userFeed()
 {
     if (m_state == QAudio::StoppedState || m_state == QAudio::SuspendedState)
         return;
@@ -214,7 +214,7 @@ void QnxAudioInput::userFeed()
     deviceReady();
 }
 
-bool QnxAudioInput::deviceReady()
+bool QQnxAudioSource::deviceReady()
 {
     if (m_pullMode) {
         // reads some audio data and writes it to QIODevice
@@ -235,13 +235,13 @@ bool QnxAudioInput::deviceReady()
     return true;
 }
 
-bool QnxAudioInput::open()
+bool QQnxAudioSource::open()
 {
     if (!m_format.isValid() || m_format.sampleRate() <= 0) {
         if (!m_format.isValid())
-            qWarning("QnxAudioInput: open error, invalid format.");
+            qWarning("QQnxAudioSource: open error, invalid format.");
         else
-            qWarning("QnxAudioInput: open error, invalid sample rate (%d).", m_format.sampleRate());
+            qWarning("QQnxAudioSource: open error, invalid sample rate (%d).", m_format.sampleRate());
 
         return false;
     }
@@ -251,7 +251,7 @@ bool QnxAudioInput::open()
     int card = 0;
     int device = 0;
     if ((errorCode = snd_pcm_open_preferred(&m_pcmHandle, &card, &device, SND_PCM_OPEN_CAPTURE)) < 0) {
-        qWarning("QnxAudioInput: open error, couldn't open card (0x%x)", -errorCode);
+        qWarning("QQnxAudioSource: open error, couldn't open card (0x%x)", -errorCode);
         return false;
     }
 
@@ -262,7 +262,7 @@ bool QnxAudioInput::open()
     memset(&info, 0, sizeof(info));
     info.channel = SND_PCM_CHANNEL_CAPTURE;
     if ((errorCode = snd_pcm_plugin_info(m_pcmHandle, &info)) < 0) {
-        qWarning("QnxAudioInput: open error, couldn't get channel info (0x%x)", -errorCode);
+        qWarning("QQnxAudioSource: open error, couldn't get channel info (0x%x)", -errorCode);
         close();
         return false;
     }
@@ -270,13 +270,13 @@ bool QnxAudioInput::open()
     snd_pcm_channel_params_t params = QnxAudioUtils::formatToChannelParams(m_format, QAudio::AudioInput, info.max_fragment_size);
 
     if ((errorCode = snd_pcm_plugin_params(m_pcmHandle, &params)) < 0) {
-        qWarning("QnxAudioInput: open error, couldn't set channel params (0x%x)", -errorCode);
+        qWarning("QQnxAudioSource: open error, couldn't set channel params (0x%x)", -errorCode);
         close();
         return false;
     }
 
     if ((errorCode = snd_pcm_plugin_prepare(m_pcmHandle, SND_PCM_CHANNEL_CAPTURE)) < 0) {
-        qWarning("QnxAudioInput: open error, couldn't prepare channel (0x%x)", -errorCode);
+        qWarning("QQnxAudioSource: open error, couldn't prepare channel (0x%x)", -errorCode);
         close();
         return false;
     }
@@ -286,7 +286,7 @@ bool QnxAudioInput::open()
     memset(&setup, 0, sizeof(setup));
     setup.channel = SND_PCM_CHANNEL_CAPTURE;
     if ((errorCode = snd_pcm_plugin_setup(m_pcmHandle, &setup)) < 0) {
-        qWarning("QnxAudioInput: open error, couldn't get channel setup (0x%x)", -errorCode);
+        qWarning("QQnxAudioSource: open error, couldn't get channel setup (0x%x)", -errorCode);
         close();
         return false;
     }
@@ -304,7 +304,7 @@ bool QnxAudioInput::open()
     return true;
 }
 
-void QnxAudioInput::close()
+void QQnxAudioSource::close()
 {
     if (m_pcmHandle)
 #if SND_PCM_VERSION < SND_PROTOCOL_VERSION('P',3,0,2)
@@ -329,7 +329,7 @@ void QnxAudioInput::close()
     }
 }
 
-qint64 QnxAudioInput::read(char *data, qint64 len)
+qint64 QQnxAudioSource::read(char *data, qint64 len)
 {
     int errorCode = 0;
     QByteArray tempBuffer(m_periodSize, 0);
@@ -340,7 +340,7 @@ qint64 QnxAudioInput::read(char *data, qint64 len)
         memset(&status, 0, sizeof(status));
         status.channel = SND_PCM_CHANNEL_CAPTURE;
         if ((errorCode = snd_pcm_plugin_status(m_pcmHandle, &status)) < 0) {
-            qWarning("QnxAudioInput: read error, couldn't get plugin status (0x%x)", -errorCode);
+            qWarning("QQnxAudioSource: read error, couldn't get plugin status (0x%x)", -errorCode);
             close();
             setError(QAudio::FatalError);
             setState(QAudio::StoppedState);
@@ -350,7 +350,7 @@ qint64 QnxAudioInput::read(char *data, qint64 len)
         if (status.status == SND_PCM_STATUS_READY
             || status.status == SND_PCM_STATUS_OVERRUN) {
             if ((errorCode = snd_pcm_plugin_prepare(m_pcmHandle, SND_PCM_CHANNEL_CAPTURE)) < 0) {
-                qWarning("QnxAudioInput: read error, couldn't prepare plugin (0x%x)", -errorCode);
+                qWarning("QQnxAudioSource: read error, couldn't prepare plugin (0x%x)", -errorCode);
                 close();
                 setError(QAudio::FatalError);
                 setState(QAudio::StoppedState);
@@ -378,7 +378,7 @@ qint64 QnxAudioInput::read(char *data, qint64 len)
     return actualRead;
 }
 
-void QnxAudioInput::setError(QAudio::Error error)
+void QQnxAudioSource::setError(QAudio::Error error)
 {
     if (m_error == error)
         return;
@@ -387,7 +387,7 @@ void QnxAudioInput::setError(QAudio::Error error)
     emit errorChanged(m_error);
 }
 
-void QnxAudioInput::setState(QAudio::State state)
+void QQnxAudioSource::setState(QAudio::State state)
 {
     if (m_state == state)
         return;
@@ -396,7 +396,7 @@ void QnxAudioInput::setState(QAudio::State state)
     emit stateChanged(m_state);
 }
 
-InputPrivate::InputPrivate(QnxAudioInput *audio)
+InputPrivate::InputPrivate(QQnxAudioSource *audio)
     : m_audioDevice(audio)
 {
 }
diff --git a/src/multimedia/platform/qnx/audio/qnxaudioinput_p.h b/src/multimedia/platform/qnx/audio/qqnxaudiosource_p.h
index e1132f63f..3432f7544 100644
--- a/src/multimedia/platform/qnx/audio/qnxaudioinput_p.h
+++ b/src/multimedia/platform/qnx/audio/qqnxaudiosource_p.h
@@ -62,13 +62,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QnxAudioInput : public QAbstractAudioInput
+class QQnxAudioSource : public QPlatformAudioSource
 {
     Q_OBJECT
 
 public:
-    QnxAudioInput();
-    ~QnxAudioInput();
+    QQnxAudioSource();
+    ~QQnxAudioSource();
 
     void start(QIODevice*) override;
     QIODevice* start() override;
@@ -126,7 +126,7 @@ class InputPrivate : public QIODevice
 {
     Q_OBJECT
 public:
-    InputPrivate(QnxAudioInput *audio);
+    InputPrivate(QQnxAudioSource *audio);
 
     qint64 readData(char *data, qint64 len) override;
     qint64 writeData(const char *data, qint64 len) override;
@@ -134,7 +134,7 @@ public:
     void trigger();
 
 private:
-    QnxAudioInput *m_audioDevice;
+    QQnxAudioSource *m_audioDevice;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/qnx/qqnxdevicemanager.cpp b/src/multimedia/platform/qnx/qqnxdevicemanager.cpp
index 76096f01c..03c7ceed9 100644
--- a/src/multimedia/platform/qnx/qqnxdevicemanager.cpp
+++ b/src/multimedia/platform/qnx/qqnxdevicemanager.cpp
@@ -41,7 +41,7 @@
 #include "qmediadevices.h"
 #include "qcamerainfo_p.h"
 
-#include "private/qnxaudioinput_p.h"
+#include "private/qqnxaudiosource_p.h"
 #include "private/qnxaudiooutput_p.h"
 #include "private/qnxaudiodeviceinfo_p.h"
 #include "bbcamerasession_p.h"
@@ -109,9 +109,9 @@ QList<QCameraInfo> QQnxMediaDevices::videoInputs() const
     return enumerateCameras();
 }
 
-QAbstractAudioInput *QQnxMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QQnxMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
 {
-    return new QnxAudioInput();
+    return new QQnxAudioSource();
 }
 
 QAbstractAudioOutput *QQnxMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo)
diff --git a/src/multimedia/platform/qnx/qqnxdevicemanager_p.h b/src/multimedia/platform/qnx/qqnxdevicemanager_p.h
index 214cda3d6..00cd3bddf 100644
--- a/src/multimedia/platform/qnx/qqnxdevicemanager_p.h
+++ b/src/multimedia/platform/qnx/qqnxdevicemanager_p.h
@@ -64,7 +64,7 @@ public:
     QList<QAudioDeviceInfo> audioInputs() const override;
     QList<QAudioDeviceInfo> audioOutputs() const override;
     QList<QCameraInfo> videoInputs() const override;
-    QAbstractAudioInput *createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) override;
+    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
     QAbstractAudioOutput *createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) override;
 };
 
diff --git a/src/multimedia/platform/qplatformmediadevices.cpp b/src/multimedia/platform/qplatformmediadevices.cpp
index 500868352..4409594c6 100644
--- a/src/multimedia/platform/qplatformmediadevices.cpp
+++ b/src/multimedia/platform/qplatformmediadevices.cpp
@@ -79,13 +79,13 @@ QCameraInfo QPlatformMediaDevices::videoInput(const QByteArray &id) const
     return QCameraInfo();
 }
 
-QAbstractAudioInput* QPlatformMediaDevices::audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource* QPlatformMediaDevices::audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo)
 {
     QAudioDeviceInfo info = deviceInfo;
     if (info.isNull())
         info = audioInputs().value(0);
 
-    QAbstractAudioInput* p = createAudioInputDevice(info);
+    QPlatformAudioSource* p = createAudioSource(info);
     if (p)
         p->setFormat(format);
     return p;
diff --git a/src/multimedia/platform/qplatformmediadevices_p.h b/src/multimedia/platform/qplatformmediadevices_p.h
index 6fdc90598..f439b5fff 100644
--- a/src/multimedia/platform/qplatformmediadevices_p.h
+++ b/src/multimedia/platform/qplatformmediadevices_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 class QMediaDevices;
 class QAudioDeviceInfo;
 class QCameraInfo;
-class QAbstractAudioInput;
+class QPlatformAudioSource;
 class QAbstractAudioOutput;
 class QAudioFormat;
 
@@ -72,14 +72,14 @@ public:
     virtual QList<QAudioDeviceInfo> audioInputs() const = 0;
     virtual QList<QAudioDeviceInfo> audioOutputs() const = 0;
     virtual QList<QCameraInfo> videoInputs() const = 0;
-    virtual QAbstractAudioInput *createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) = 0;
+    virtual QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) = 0;
     virtual QAbstractAudioOutput *createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) = 0;
 
     QAudioDeviceInfo audioInput(const QByteArray &id) const;
     QAudioDeviceInfo audioOutput(const QByteArray &id) const;
     QCameraInfo videoInput(const QByteArray &id) const;
 
-    QAbstractAudioInput *audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo);
+    QPlatformAudioSource *audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo);
     QAbstractAudioOutput *audioOutputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo);
 
     void addDevices(QMediaDevices *m)
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudioinput.cpp b/src/multimedia/platform/windows/audio/qwindowsaudiosource.cpp
index 87f8571ce..9eb6e98fa 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudioinput.cpp
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiosource.cpp
@@ -49,7 +49,7 @@
 //
 
 
-#include "qwindowsaudioinput_p.h"
+#include "qwindowsaudiosource_p.h"
 
 #include <QtCore/QDataStream>
 #include <QtCore/qtimer.h>
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 
 //#define DEBUG_AUDIO 1
 
-QWindowsAudioInput::QWindowsAudioInput(int deviceId)
+QWindowsAudioSource::QWindowsAudioSource(int deviceId)
 {
     bytesAvailable = 0;
     buffer_size = 0;
@@ -78,20 +78,20 @@ QWindowsAudioInput::QWindowsAudioInput(int deviceId)
     memset(&mixerLineControls, 0, sizeof(mixerLineControls));
 }
 
-QWindowsAudioInput::~QWindowsAudioInput()
+QWindowsAudioSource::~QWindowsAudioSource()
 {
     stop();
 }
 
-void QT_WIN_CALLBACK QWindowsAudioInput::waveInProc( HWAVEIN hWaveIn, UINT uMsg,
+void QT_WIN_CALLBACK QWindowsAudioSource::waveInProc( HWAVEIN hWaveIn, UINT uMsg,
         DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
 {
     Q_UNUSED(dwParam1);
     Q_UNUSED(dwParam2);
     Q_UNUSED(hWaveIn);
 
-    QWindowsAudioInput* qAudio;
-    qAudio = (QWindowsAudioInput*)(dwInstance);
+    QWindowsAudioSource* qAudio;
+    qAudio = (QWindowsAudioSource*)(dwInstance);
     if(!qAudio)
         return;
 
@@ -113,7 +113,7 @@ void QT_WIN_CALLBACK QWindowsAudioInput::waveInProc( HWAVEIN hWaveIn, UINT uMsg,
     }
 }
 
-WAVEHDR* QWindowsAudioInput::allocateBlocks(int size, int count)
+WAVEHDR* QWindowsAudioSource::allocateBlocks(int size, int count)
 {
     int i;
     unsigned char* buffer;
@@ -122,7 +122,7 @@ WAVEHDR* QWindowsAudioInput::allocateBlocks(int size, int count)
 
     if((buffer=(unsigned char*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,
                     totalBufferSize)) == 0) {
-        qWarning("QAudioInput: Memory allocation error");
+        qWarning("QAudioSource: Memory allocation error");
         return 0;
     }
     blocks = (WAVEHDR*)buffer;
@@ -136,7 +136,7 @@ WAVEHDR* QWindowsAudioInput::allocateBlocks(int size, int count)
         blocks[i].dwLoops = 0L;
         result = waveInPrepareHeader(hWaveIn,&blocks[i], sizeof(WAVEHDR));
         if(result != MMSYSERR_NOERROR) {
-            qWarning("QAudioInput: Can't prepare block %d",i);
+            qWarning("QAudioSource: Can't prepare block %d",i);
             return 0;
         }
         buffer += size;
@@ -144,7 +144,7 @@ WAVEHDR* QWindowsAudioInput::allocateBlocks(int size, int count)
     return blocks;
 }
 
-void QWindowsAudioInput::freeBlocks(WAVEHDR* blockArray)
+void QWindowsAudioSource::freeBlocks(WAVEHDR* blockArray)
 {
     WAVEHDR* blocks = blockArray;
 
@@ -157,12 +157,12 @@ void QWindowsAudioInput::freeBlocks(WAVEHDR* blockArray)
     HeapFree(GetProcessHeap(), 0, blockArray);
 }
 
-QAudio::Error QWindowsAudioInput::error() const
+QAudio::Error QWindowsAudioSource::error() const
 {
     return errorState;
 }
 
-QAudio::State QWindowsAudioInput::state() const
+QAudio::State QWindowsAudioSource::state() const
 {
     return deviceState;
 }
@@ -180,7 +180,7 @@ QAudio::State QWindowsAudioInput::state() const
     #define DRVM_MAPPER_CONSOLEVOICECOM_GET (DRVM_MAPPER+23)
 #endif
 
-void QWindowsAudioInput::setVolume(qreal volume)
+void QWindowsAudioSource::setVolume(qreal volume)
 {
     cachedVolume = volume;
     for (DWORD i = 0; i < mixerLineControls.cControls; i++) {
@@ -202,7 +202,7 @@ void QWindowsAudioInput::setVolume(qreal volume)
     }
 }
 
-qreal QWindowsAudioInput::volume() const
+qreal QWindowsAudioSource::volume() const
 {
     for (DWORD i = 0; i < mixerLineControls.cControls; i++) {
         if ((mixerLineControls.pamxctrl[i].dwControlType != MIXERCONTROL_CONTROLTYPE_FADER) &&
@@ -231,18 +231,18 @@ qreal QWindowsAudioInput::volume() const
     return qFuzzyCompare(cachedVolume, qreal(-1.0f)) ? 1.0f : cachedVolume;
 }
 
-void QWindowsAudioInput::setFormat(const QAudioFormat& fmt)
+void QWindowsAudioSource::setFormat(const QAudioFormat& fmt)
 {
     if (deviceState == QAudio::StoppedState)
         settings = fmt;
 }
 
-QAudioFormat QWindowsAudioInput::format() const
+QAudioFormat QWindowsAudioSource::format() const
 {
     return settings;
 }
 
-void QWindowsAudioInput::start(QIODevice* device)
+void QWindowsAudioSource::start(QIODevice* device)
 {
     if(deviceState != QAudio::StoppedState)
         close();
@@ -261,7 +261,7 @@ void QWindowsAudioInput::start(QIODevice* device)
     emit stateChanged(deviceState);
 }
 
-QIODevice* QWindowsAudioInput::start()
+QIODevice* QWindowsAudioSource::start()
 {
     if(deviceState != QAudio::StoppedState)
         close();
@@ -283,7 +283,7 @@ QIODevice* QWindowsAudioInput::start()
     return audioSource;
 }
 
-void QWindowsAudioInput::stop()
+void QWindowsAudioSource::stop()
 {
     if(deviceState == QAudio::StoppedState)
         return;
@@ -292,7 +292,7 @@ void QWindowsAudioInput::stop()
     emit stateChanged(deviceState);
 }
 
-bool QWindowsAudioInput::open()
+bool QWindowsAudioSource::open()
 {
 #ifdef DEBUG_AUDIO
     QTime now(QTime::currentTime());
@@ -303,7 +303,7 @@ bool QWindowsAudioInput::open()
     period_size = 0;
 
     if (!qt_convertFormat(settings, &wfx)) {
-        qWarning("QAudioInput: open error, invalid format.");
+        qWarning("QAudioSource: open error, invalid format.");
     } else if (buffer_size == 0) {
         buffer_size
                 = (settings.sampleRate()
@@ -331,7 +331,7 @@ bool QWindowsAudioInput::open()
         errorState = QAudio::OpenError;
         deviceState = QAudio::StoppedState;
         emit stateChanged(deviceState);
-        qWarning("QAudioInput: failed to open audio device");
+        qWarning("QAudioSource: failed to open audio device");
         return false;
     }
     waveBlocks = allocateBlocks(period_size, buffer_size/period_size);
@@ -341,7 +341,7 @@ bool QWindowsAudioInput::open()
         errorState = QAudio::OpenError;
         deviceState = QAudio::StoppedState;
         emit stateChanged(deviceState);
-        qWarning("QAudioInput: failed to allocate blocks. open failed");
+        qWarning("QAudioSource: failed to allocate blocks. open failed");
         return false;
     }
 
@@ -352,7 +352,7 @@ bool QWindowsAudioInput::open()
     for(int i=0; i<buffer_size/period_size; i++) {
         result = waveInAddBuffer(hWaveIn, &waveBlocks[i], sizeof(WAVEHDR));
         if(result != MMSYSERR_NOERROR) {
-            qWarning("QAudioInput: failed to setup block %d,err=%d",i,result);
+            qWarning("QAudioSource: failed to setup block %d,err=%d",i,result);
             errorState = QAudio::OpenError;
             deviceState = QAudio::StoppedState;
             emit stateChanged(deviceState);
@@ -361,7 +361,7 @@ bool QWindowsAudioInput::open()
     }
     result = waveInStart(hWaveIn);
     if(result) {
-        qWarning("QAudioInput: failed to start audio input");
+        qWarning("QAudioSource: failed to start audio input");
         errorState = QAudio::OpenError;
         deviceState = QAudio::StoppedState;
         emit stateChanged(deviceState);
@@ -374,7 +374,7 @@ bool QWindowsAudioInput::open()
     return true;
 }
 
-void QWindowsAudioInput::close()
+void QWindowsAudioSource::close()
 {
     if(deviceState == QAudio::StoppedState)
         return;
@@ -398,7 +398,7 @@ void QWindowsAudioInput::close()
     }
 }
 
-void QWindowsAudioInput::initMixer()
+void QWindowsAudioSource::initMixer()
 {
     // Get the Mixer ID from the Sound Device ID
     UINT mixerIntID = 0;
@@ -428,13 +428,13 @@ void QWindowsAudioInput::initMixer()
     }
 }
 
-void QWindowsAudioInput::closeMixer()
+void QWindowsAudioSource::closeMixer()
 {
     delete[] mixerLineControls.pamxctrl;
     memset(&mixerLineControls, 0, sizeof(mixerLineControls));
 }
 
-qsizetype QWindowsAudioInput::bytesReady() const
+qsizetype QWindowsAudioSource::bytesReady() const
 {
     if (period_size == 0 || buffer_size == 0)
         return 0;
@@ -447,7 +447,7 @@ qsizetype QWindowsAudioInput::bytesReady() const
     return buf;
 }
 
-qint64 QWindowsAudioInput::read(char* data, qint64 len)
+qint64 QWindowsAudioSource::read(char* data, qint64 len)
 {
     bool done = false;
 
@@ -465,12 +465,12 @@ qint64 QWindowsAudioInput::read(char* data, qint64 len)
 #endif
                 if(l < 0) {
                     // error
-                    qWarning("QAudioInput: IOError");
+                    qWarning("QAudioSource: IOError");
                     errorState = QAudio::IOError;
 
                 } else if(l == 0) {
                     // cant write to IODevice
-                    qWarning("QAudioInput: IOError, can't write to QIODevice");
+                    qWarning("QAudioSource: IOError, can't write to QIODevice");
                     errorState = QAudio::IOError;
 
                 } else {
@@ -522,7 +522,7 @@ qint64 QWindowsAudioInput::read(char* data, qint64 len)
             result = waveInPrepareHeader(hWaveIn,&waveBlocks[header], sizeof(WAVEHDR));
             if(result != MMSYSERR_NOERROR) {
                 result = waveInPrepareHeader(hWaveIn,&waveBlocks[header], sizeof(WAVEHDR));
-                qWarning("QAudioInput: failed to prepare block %d,err=%d",header,result);
+                qWarning("QAudioSource: failed to prepare block %d,err=%d",header,result);
                 errorState = QAudio::IOError;
 
                 mutex.lock();
@@ -533,7 +533,7 @@ qint64 QWindowsAudioInput::read(char* data, qint64 len)
             }
             result = waveInAddBuffer(hWaveIn, &waveBlocks[header], sizeof(WAVEHDR));
             if(result != MMSYSERR_NOERROR) {
-                qWarning("QAudioInput: failed to setup block %d,err=%d",header,result);
+                qWarning("QAudioSource: failed to setup block %d,err=%d",header,result);
                 errorState = QAudio::IOError;
 
                 mutex.lock();
@@ -566,14 +566,14 @@ qint64 QWindowsAudioInput::read(char* data, qint64 len)
     return written;
 }
 
-void QWindowsAudioInput::resume()
+void QWindowsAudioSource::resume()
 {
     if (deviceState == QAudio::SuspendedState) {
         deviceState = QAudio::ActiveState;
         for(int i=0; i<buffer_size/period_size; i++) {
             result = waveInAddBuffer(hWaveIn, &waveBlocks[i], sizeof(WAVEHDR));
             if(result != MMSYSERR_NOERROR) {
-                qWarning("QAudioInput: failed to setup block %d,err=%d",i,result);
+                qWarning("QAudioSource: failed to setup block %d,err=%d",i,result);
                 errorState = QAudio::OpenError;
                 deviceState = QAudio::StoppedState;
                 emit stateChanged(deviceState);
@@ -594,17 +594,17 @@ void QWindowsAudioInput::resume()
     }
 }
 
-void QWindowsAudioInput::setBufferSize(qsizetype value)
+void QWindowsAudioSource::setBufferSize(qsizetype value)
 {
     buffer_size = value;
 }
 
-qsizetype QWindowsAudioInput::bufferSize() const
+qsizetype QWindowsAudioSource::bufferSize() const
 {
     return buffer_size;
 }
 
-qint64 QWindowsAudioInput::processedUSecs() const
+qint64 QWindowsAudioSource::processedUSecs() const
 {
     if (deviceState == QAudio::StoppedState)
         return 0;
@@ -614,7 +614,7 @@ qint64 QWindowsAudioInput::processedUSecs() const
     return result;
 }
 
-void QWindowsAudioInput::suspend()
+void QWindowsAudioSource::suspend()
 {
     if(deviceState == QAudio::ActiveState) {
         deviceState = QAudio::SuspendedState;
@@ -623,7 +623,7 @@ void QWindowsAudioInput::suspend()
     }
 }
 
-void QWindowsAudioInput::feedback()
+void QWindowsAudioSource::feedback()
 {
 #ifdef DEBUG_AUDIO
     QTime now(QTime::currentTime());
@@ -633,7 +633,7 @@ void QWindowsAudioInput::feedback()
         QMetaObject::invokeMethod(this, "deviceReady", Qt::QueuedConnection);
 }
 
-bool QWindowsAudioInput::deviceReady()
+bool QWindowsAudioSource::deviceReady()
 {
     bytesAvailable = bytesReady();
 #ifdef DEBUG_AUDIO
@@ -655,16 +655,16 @@ bool QWindowsAudioInput::deviceReady()
     return true;
 }
 
-void QWindowsAudioInput::reset()
+void QWindowsAudioSource::reset()
 {
     stop();
     if (period_size > 0)
         waveFreeBlockCount = buffer_size / period_size;
 }
 
-InputPrivate::InputPrivate(QWindowsAudioInput* audio)
+InputPrivate::InputPrivate(QWindowsAudioSource* audio)
 {
-    audioDevice = qobject_cast<QWindowsAudioInput*>(audio);
+    audioDevice = qobject_cast<QWindowsAudioSource*>(audio);
 }
 
 InputPrivate::~InputPrivate() {}
@@ -695,4 +695,4 @@ void InputPrivate::trigger()
 
 QT_END_NAMESPACE
 
-#include "moc_qwindowsaudioinput_p.cpp"
+#include "moc_qwindowsaudiosource_p.cpp"
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudioinput_p.h b/src/multimedia/platform/windows/audio/qwindowsaudiosource_p.h
index 6679ae357..42ac1cfc5 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudioinput_p.h
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiosource_p.h
@@ -78,12 +78,12 @@ QT_BEGIN_NAMESPACE
 #  endif
 #endif
 
-class QWindowsAudioInput : public QAbstractAudioInput
+class QWindowsAudioSource : public QPlatformAudioSource
 {
     Q_OBJECT
 public:
-    QWindowsAudioInput(int deviceId);
-    ~QWindowsAudioInput();
+    QWindowsAudioSource(int deviceId);
+    ~QWindowsAudioSource();
 
     qint64 read(char* data, qint64 len);
 
@@ -154,7 +154,7 @@ class InputPrivate : public QIODevice
 {
     Q_OBJECT
 public:
-    InputPrivate(QWindowsAudioInput* audio);
+    InputPrivate(QWindowsAudioSource* audio);
     ~InputPrivate();
 
     qint64 readData( char* data, qint64 len);
@@ -162,7 +162,7 @@ public:
 
     void trigger();
 private:
-    QWindowsAudioInput *audioDevice;
+    QWindowsAudioSource *audioDevice;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices.cpp b/src/multimedia/platform/windows/qwindowsmediadevices.cpp
index 6cc804301..9079755e8 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices.cpp
+++ b/src/multimedia/platform/windows/qwindowsmediadevices.cpp
@@ -42,7 +42,7 @@
 #include "qcamerainfo_p.h"
 #include "qvarlengtharray.h"
 
-#include "private/qwindowsaudioinput_p.h"
+#include "private/qwindowsaudiosource_p.h"
 #include "private/qwindowsaudiooutput_p.h"
 #include "private/qwindowsaudiodeviceinfo_p.h"
 #include "private/qwindowsmultimediautils_p.h"
@@ -534,10 +534,10 @@ QList<QCameraInfo> QWindowsMediaDevices::videoInputs() const
     return cameras;
 }
 
-QAbstractAudioInput *QWindowsMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QWindowsMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
 {
     const auto *devInfo = static_cast<const QWindowsAudioDeviceInfo *>(deviceInfo.handle());
-    return new QWindowsAudioInput(devInfo->waveId());
+    return new QWindowsAudioSource(devInfo->waveId());
 }
 
 QAbstractAudioOutput *QWindowsMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo)
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
index ae5c09809..2e426f8cc 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h
+++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
@@ -74,7 +74,7 @@ public:
     QList<QAudioDeviceInfo> audioInputs() const override;
     QList<QAudioDeviceInfo> audioOutputs() const override;
     QList<QCameraInfo> videoInputs() const override;
-    QAbstractAudioInput *createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) override;
+    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
     QAbstractAudioOutput *createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) override;
 
 private: