Merge pull request wang-bin#1 from wang-bin/master

pull the newest src code
jaychen0719 · Nov 19, 2018 · b0a47ca · b0a47ca
2 parents 3894f91 + f26fbf0
commit b0a47ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/AVPlayer.cpp b/src/AVPlayer.cpp
@@ -1234,13 +1234,14 @@ void AVPlayer::playInternal()
         d->vthread->start();
     }
 
-    d->read_thread->setMediaEndAction(mediaEndAction());
-    d->read_thread->start();
-
     if (d->demuxer.audioCodecContext() && d->athread)
         d->athread->waitForStarted();
     if (d->demuxer.videoCodecContext() && d->vthread)
         d->vthread->waitForStarted();
+
+    d->read_thread->setMediaEndAction(mediaEndAction());
+    d->read_thread->start();
+
     /// demux thread not started, seek tasks will be cleared
     d->read_thread->waitForStarted();
     if (d->timer_id < 0) {

diff --git a/src/FrameReader.cpp b/src/FrameReader.cpp
@@ -353,7 +353,7 @@ void FrameReader::readMoreInternal()
             d->vframes.put(frame);
             Q_EMIT frameRead(frame);
             //qDebug("frame got @%.3f, queue enough: %d", frame.timestamp(), vframes.isEnough());
-            if (d->vframes.isEnough())
+            if (d->vframes.isFull())
                 break;
         } else {
             qDebug("dec error, continue to decoder");

diff --git a/widgets/global.cpp b/widgets/global.cpp
@@ -24,7 +24,7 @@
 #include <QBoxLayout>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QTableWidget>
+#include <QTabWidget>
 #include <QTextBrowser>
 
 #include "QtAVWidgets/WidgetRenderer.h"