Ticket #2434: mythplayback2.diff

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -147 +147 @@
       // Window stuff
       parentWidget(NULL), embedid(0), embx(-1), emby(-1), embw(-1), embh(-1),
       // State
+      pause_signal(false),
       eof(false),                   m_double_framerate(false),
       m_can_double(false),          paused(false),
       pausevideo(false),            actuallypaused(false),
@@ -461 +462 @@
     video_actually_paused = false;
     pausevideo = true;
 
-    for (uint i = 0; wait && !video_actually_paused; i++)
-    {
-        videoThreadPaused.wait(&pauseUnpauseLock, 250);
+    VERBOSE(VB_IMPORTANT, QString("PauseVideo() Called wait=%1").arg(wait));
 
-        if (video_actually_paused || eof)
+    if (wait && !video_actually_paused) {
+        uint i=0;
+        while (!pause_signal && videoThreadPause.wait(&pauseUnpauseLock, 250)) {
+
+            if (video_actually_paused || eof) {
+                pause_signal=false;
             break;
+            }
 
         if ((i % 10) == 9)
-            VERBOSE(VB_IMPORTANT, "Waited too long for video out to pause");
+                VERBOSE(VB_IMPORTANT, QString("Waited too long for video out to pause %1").arg(i));
     }
 }
+    pause_signal=false;
+}
 
 void NuppelVideoPlayer::UnpauseVideo(bool wait)
 {
+    VERBOSE(VB_IMPORTANT, QString("UnpauseVideo() Called wait=%1").arg(wait));
+
     QMutexLocker locker(&pauseUnpauseLock);
     pausevideo = false;
 
-    for (uint i = 0; wait && video_actually_paused; i++)
-    {
-        videoThreadUnpaused.wait(&pauseUnpauseLock, 250);
+    if (wait && video_actually_paused) {
+      uint i=0;
+      while (!pause_signal && videoThreadPause.wait(&pauseUnpauseLock, 250)) {
 
-        if (!video_actually_paused || eof)
+        if (!video_actually_paused || eof) {
+          pause_signal=false;
             break;
+        }
+        ++i;
 
         if ((i % 10) == 9)
             VERBOSE(VB_IMPORTANT, "Waited too long for video out to unpause");
     }
 }
+    pause_signal=false;
+}
 
 void NuppelVideoPlayer::SetVideoActuallyPaused(bool val)
 {
     QMutexLocker locker(&pauseUnpauseLock);
     video_actually_paused = val;
-
-    if (val)
-        videoThreadPaused.wakeAll();
-    else
-        videoThreadUnpaused.wakeAll();
+    pause_signal=true;
+    videoThreadPause.wakeAll();
 }
 
+
 bool NuppelVideoPlayer::IsVideoActuallyPaused(void) const
 {
     QMutexLocker locker(&pauseUnpauseLock);

libs/libmythtv/NuppelVideoPlayer.h

@@ -525 +525 @@
 
     // State
     QWaitCondition decoderThreadPaused;
-    QWaitCondition videoThreadPaused;
-    QWaitCondition videoThreadUnpaused;
+    QWaitCondition videoThreadPause;
     mutable QMutex vidExitLock;
     mutable QMutex pauseUnpauseLock;
     mutable QMutex internalPauseLock;
+    bool     pause_signal;
     bool     eof;             ///< At end of file/ringbuffer
     bool     m_double_framerate;///< Output fps is double Video (input) rate
     bool     m_can_double;    ///< VideoOutput capable of doubling frame rate