Merge pull request #503 from valbok/crash-on-switch

Don't accept packets if the abort is called
valbok · Dec 7, 2024 · 79105ca · 79105ca
2 parents 746db80 + ed380f3
commit 79105ca
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/QtAVPlayer/qavpacketqueue_p.h b/src/QtAVPlayer/qavpacketqueue_p.h
@@ -146,11 +146,12 @@ class QAVPacketQueue
     void enqueue(const QAVPacket &packet)
     {
         QMutexLocker locker(&m_mutex);
+        if (m_abort)
+            return;
         m_packets.append(packet);
         m_bytes += packet.packet()->size + sizeof(packet);
         m_duration += packet.duration();
         m_consumerWaiter.wakeAll();
-        m_abort = false;
         m_waitingForPackets = false;
     }
 
@@ -180,10 +181,10 @@ class QAVPacketQueue
             m_producerWaiter.wait(&m_mutex);
     }
 
-    void abort()
+    void abort(bool aborted = true)
     {
         QMutexLocker locker(&m_mutex);
-        m_abort = true;
+        m_abort = aborted;
         m_waitingForPackets = true;
         m_consumerWaiter.wakeAll();
         m_producerWaiter.wakeAll();

diff --git a/src/QtAVPlayer/qavplayer.cpp b/src/QtAVPlayer/qavplayer.cpp
@@ -333,6 +333,9 @@ void QAVPlayerPrivate::terminate()
     loaderFuture.waitForFinished();
     videoPlayFuture.waitForFinished();
     audioPlayFuture.waitForFinished();
+    videoQueue.abort(false);
+    audioQueue.abort(false);
+    subtitleQueue.abort(false);
     demuxer.abort(false);
 
     pendingPosition = 0;

diff --git a/tests/auto/integration/qavplayer/tst_qavplayer.cpp b/tests/auto/integration/qavplayer/tst_qavplayer.cpp
@@ -103,6 +103,7 @@ private slots:
     void multiFilterInputs_data();
     void multiFilterInputs();
     void streamMetadataRotate();
+    void switchingSource();
 };
 
 void tst_QAVPlayer::initTestCase()
@@ -3426,5 +3427,20 @@ void tst_QAVPlayer::streamMetadataRotate()
     QCOMPARE(p.currentVideoStreams()[0].metadata()["rotate"], "90");
 }
 
+void tst_QAVPlayer::switchingSource()
+{
+    QAVPlayer p;
+    QList<QString> files = {"av_sample.mkv", "test.mkv", "small.mp4"};
+    p.setSynced(false);
+    for (const auto &f : files) {
+        QFileInfo file(testData(f));
+        p.setSource(file.absoluteFilePath());
+        p.play();
+        QTRY_VERIFY(p.mediaStatus() == QAVPlayer::LoadedMedia || p.mediaStatus() == QAVPlayer::EndOfMedia);
+    }
+
+    QTRY_COMPARE(p.mediaStatus(), QAVPlayer::EndOfMedia);
+}
+
 QTEST_MAIN(tst_QAVPlayer)
 #include "tst_qavplayer.moc"