Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Ia1bc95c071d29653a85e753964d15826ce3706f8

4 files changed, 18 insertions, 7 deletions

diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
index 0855c1f67..51cdde026 100644
--- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
@@ -528,6 +528,21 @@ qreal QSoundEffectPrivate::volume() const
     return m_volume;
 }
 
+static void volume_stream_flush_callback(pa_stream *s, int success, void *userdata)
+{
+    Q_UNUSED(s);
+    QSoundEffectRef *ref = reinterpret_cast<QSoundEffectRef *>(userdata);
+    QSoundEffectPrivate *self = ref->soundEffect();
+    ref->release();
+    if (!self)
+        return;
+
+    if (!success)
+        qWarning("QSoundEffect(pulseaudio): failed to drain");
+
+    QMetaObject::invokeMethod(self, "prepare", Qt::QueuedConnection);
+}
+
 void QSoundEffectPrivate::setVolume(qreal volume)
 {
     QMutexLocker locker(&m_volumeLock);
@@ -537,6 +552,8 @@ void QSoundEffectPrivate::setVolume(qreal volume)
 
     m_volume = qBound(qreal(0), volume, qreal(1));
     locker.unlock();
+    if (!m_playing && m_pulseStream)
+        pa_stream_flush(m_pulseStream, volume_stream_flush_callback, m_ref->getRef());
     emit volumeChanged();
 }
 
diff --git a/src/plugins/directshow/player/directshowioreader.cpp b/src/plugins/directshow/player/directshowioreader.cpp
index ced10ea10..3318d57b5 100644
--- a/src/plugins/directshow/player/directshowioreader.cpp
+++ b/src/plugins/directshow/player/directshowioreader.cpp
@@ -155,7 +155,7 @@ HRESULT DirectShowIOReader::Request(IMediaSample *pSample, DWORD_PTR dwUser)
         return VFW_E_SAMPLE_TIME_NOT_SET;
     }
     LONGLONG position = startTime / 10000000;
-    LONG length = (endTime - startTime) / 10000000;
+    LONG length = qMin<qint64>((endTime - startTime) / 10000000, m_availableLength);
 
     auto request = new DirectShowSampleRequest(pSample, dwUser, position, length, buffer);
 
diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
index b9417f7c2..6dd1e8d62 100644
--- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
+++ b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
@@ -15,8 +15,6 @@ HEADERS += \
 TESTDATA += testdata/*
 
 boot2qt: {
-    # Yocto sysroot does not have gstreamer/wav
-    QMAKE_CXXFLAGS += -DWAV_SUPPORT_NOT_FORCED
     # OGV testing is unstable with qemu
     QMAKE_CXXFLAGS += -DSKIP_OGV_TEST
 }
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index a2217afc8..ec520e901 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -179,11 +179,7 @@ QMediaContent tst_QMediaPlayerBackend::selectVideoFile(const QStringList& mediaC
 
 bool tst_QMediaPlayerBackend::isWavSupported()
 {
-#ifdef WAV_SUPPORT_NOT_FORCED
     return !localWavFile.isNull();
-#else
-    return true;
-#endif
 }
 
 void tst_QMediaPlayerBackend::initTestCase()