Ticket #6612: NVP_PrebufferEnoughFrames_tweaks.diff

mythtv/libs/libmythtv/NuppelVideoPlayer.cpp

@@ -2740 +2740 @@
             audio_paused = prebuffering;
         }
 
-        VERBOSE(VB_PLAYBACK, LOC + QString("Waiting for prebuffer.. %1 %2")
-                .arg(prebuffer_tries_total + prebuffer_tries, 2)
-                .arg(videoOutput->GetFrameStatus()));
-        if (!prebuffering_wait.wait(&prebuffering_lock,
-                                    frame_interval * 4 / 1000))
+        bool ret = false;
+        if (!prebuffering_wait.wait(&prebuffering_lock, (prebuffer_tries + 1) *
+                                    frame_interval * 3 / 1000))
         {
-            // timed out.. do we need to know?
+            VERBOSE(VB_PLAYBACK, LOC + QString("Prebuffering time out. %1 %2")
+                    .arg(prebuffer_tries).arg(videoOutput->GetFrameStatus()));
+            ++prebuffer_tries;
         }
-        ++prebuffer_tries;
+        else
+        {
+            prebuffer_tries = 0;
+            ret = true;
+        }
+
         if (prebuffering && (prebuffer_tries >= 10))
         {
             prebuffer_tries_total += prebuffer_tries;
@@ -2778 +2783 @@
         prebuffering_lock.unlock();
         videosync->Start();
 
-        return false;
+        return ret;
     }
     prebuffering_lock.unlock();