bug fixed: playNextFrame() not work

continue will never decode the next packet
xtfvje · Jan 17, 2013 · 1052d04 · 1052d04
1 parent ce718ef
commit 1052d04
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/AudioThread.cpp b/src/AudioThread.cpp
@@ -62,8 +62,11 @@ void AudioThread::run()
     static const double max_len = 0.02;
     d.last_pts = 0;
     while (!d.stop) {
-        if (tryPause())
-            continue; //the queue is empty and may block. should setBlocking(false) wake up cond empty?
+        //TODO: why put it at the end of loop then playNextFrame() not work?
+        if (tryPause()) { //DO NOT continue, or playNextFrame() will fail
+            if (d.stop)
+                break; //the queue is empty and may block. should setBlocking(false) wake up cond empty?
+        }
         QMutexLocker locker(&d.mutex);
         Q_UNUSED(locker);
         if (d.packets.isEmpty() && !d.stop) {

diff --git a/src/VideoThread.cpp b/src/VideoThread.cpp
@@ -87,8 +87,11 @@ void VideoThread::run()
     VideoDecoder *dec = static_cast<VideoDecoder*>(d.dec);
     VideoRenderer* vo = static_cast<VideoRenderer*>(d.writer);
     while (!d.stop) {
-        if (tryPause())
-            continue; //the queue is empty and may block. should setBlocking(false) wake up cond empty?
+        //TODO: why put it at the end of loop then playNextFrame() not work?
+        if (tryPause()) { //DO NOT continue, or playNextFrame() will fail
+            if (d.stop)
+                break; //the queue is empty and may block. should setBlocking(false) wake up cond empty?
+        }
         QMutexLocker locker(&d.mutex);
         Q_UNUSED(locker);
         if (d.packets.isEmpty() && !d.stop) {