Ticket #9546: 104-corrupted_stream_fix.patch

libs/libmythtv/mythplayer.cpp

@@ -340 +340 @@
     next_normal_speed = false;
     PauseVideo();
     audio.Pause(true);
-    PauseBuffer();
     PauseDecoder();
+    PauseBuffer();
     allpaused = decoderPaused && videoPaused && bufferPaused;
     {
         QMutexLocker locker(&decoder_change_lock);

libs/libmythtv/ringbuffer.cpp

@@ -936 +936 @@
     int avail = ReadBufAvail();
     count = (ateof && avail < count) ? avail : count;
 
+    if (setswitchtonext && avail < count)
+    {
+        VERBOSE(VB_IMPORTANT, "Checking to see if there's a "
+                "new livetv program to switch to..");
+        livetvchain->ReloadAll();
+
+        return false;
+    }
+
     MythTimer t;
     t.start();
     while ((avail < count) && !stopreads &&
@@ -945 +954 @@
         generalWait.wait(&rwlock, 250);
         avail = ReadBufAvail();
 
-        if ((ateof || setswitchtonext) && avail < count)
+        if (ateof && avail < count)
             count = avail;
 
         if (avail < count)
@@ -964 +973 @@
                         " seconds for data \n\t\t\tto become available..." +
                         QString(" %2 < %3")
                         .arg(avail).arg(count));
-                if (livetvchain)
-                {
-                    VERBOSE(VB_IMPORTANT, "Checking to see if there's a "
-                                          "new livetv program to switch to..");
-                    livetvchain->ReloadAll();
-                }
             }
 
-            bool quit = livetvchain && (livetvchain->NeedsToSwitch() ||
-                                        livetvchain->NeedsToJump() ||
-                                        setswitchtonext);
-
-            if (elapsed > 16000 || quit)
+            if (elapsed > 16000)
             {
-                if (!quit)
-                    VERBOSE(VB_IMPORTANT, LOC_ERR + "Waited " +
-                            QString("%1").arg(elapsed/1000) +
-                            " seconds for data, aborting.");
-                else
-                    VERBOSE(VB_IMPORTANT, LOC + "Timing out wait due to "
-                            "impending livetv switch.");
-
+                VERBOSE(VB_IMPORTANT, LOC_ERR + "Waited " +
+                        QString("%1").arg(elapsed/1000) +
+                        " seconds for data, aborting.");
                 return false;
             }
         }