1 files changed, 64 insertions, 0 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index dc8e3dab8..9e313f212 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -5,6 +5,7 @@
 
 #include <private/qmultimediautils_p.h>
 #include <private/qplatformmediaintegration_p.h>
+#include <private/qaudiobufferoutput_p.h>
 #include <qvideosink.h>
 #include <qaudiooutput.h>
 
@@ -596,6 +597,12 @@ void QMediaPlayer::setPlaybackRate(qreal rate)
     It does not wait for the media to finish loading and does not check for errors. Listen for
     the mediaStatusChanged() and error() signals to be notified when the media is loaded and
     when an error occurs during loading.
+
+    \note FFmpeg, used by the FFmpeg media backend, restricts use of nested protocols for
+    security reasons. In controlled environments where all inputs are trusted, the list of
+    approved protocols can be overridden using the QT_FFMPEG_PROTOCOL_WHITELIST environment
+    variable. This environment variable is Qt's private API and can change between patch
+    releases without notice.
 */
 
 void QMediaPlayer::setSource(const QUrl &source)
@@ -643,6 +650,63 @@ void QMediaPlayer::setSourceDevice(QIODevice *device, const QUrl &sourceUrl)
 }
 
 /*!
+    \qmlproperty QAudioBufferOutput QtMultimedia::MediaPlayer::audioBufferOutput
+    \since 6.8
+
+    This property holds the target audio buffer output.
+
+    Normal usage of MediaPlayer from QML should not require using this property.
+
+    \sa QMediaPlayer::audioBufferOutput()
+*/
+
+/*!
+    \property QMediaPlayer::audioBufferOutput
+    \since 6.8
+    \brief The output audio buffer used by the media player.
+
+    Sets an audio buffer \a output to the media player.
+
+    If \l QAudioBufferOutput is specified and the media source
+    contains an audio stream, the media player, it will emit
+    the signal \l{QAudioBufferOutput::audioBufferReceived} with
+    audio buffers containing decoded audio data. At the end of
+    the audio stream, \c QMediaPlayer emits an empty \l QAudioBuffer.
+
+    \c QMediaPlayer emits outputs frames at the same time as it
+    pushes the matching data to the audio output if it's specified.
+    However, the sound can be played with a small delay due to
+    audio bufferization.
+*/
+void QMediaPlayer::setAudioBufferOutput(QAudioBufferOutput *output)
+{
+    Q_D(QMediaPlayer);
+
+    QAudioBufferOutput *oldOutput = d->audioBufferOutput;
+    if (oldOutput == output)
+        return;
+
+    d->audioBufferOutput = output;
+
+    if (output) {
+        auto oldPlayer = QAudioBufferOutputPrivate::exchangeMediaPlayer(*oldOutput, this);
+        if (oldPlayer)
+            oldPlayer->setAudioBufferOutput(nullptr);
+    }
+
+    if (d->control)
+        d->control->setAudioBufferOutput(output);
+
+    emit audioBufferOutputChanged();
+}
+
+QAudioBufferOutput *QMediaPlayer::audioBufferOutput() const
+{
+    Q_D(const QMediaPlayer);
+    return d->audioBufferOutput;
+}
+
+/*!
     \qmlproperty AudioOutput QtMultimedia::MediaPlayer::audioOutput
 
     This property holds the target audio output.