Ticket #9511: 103-livetv_buffer_underrun_v3a.patch

libs/libmythtv/avformatdecoder.cpp

@@ -3913 +3913 @@
                 if (retval == -EAGAIN)
                     continue;
 
-                ateof = true;
-                m_parent->SetEof();
+                if (livetv)
+                {
+                    // When video synchronization is fater than than stream bitrate
+                    // playback thread will drain ringbuffer at edge and in very rare
+                    // situation it crash playback. This hack will recover playback 
+                    // from this issue
+                    VERBOSE(VB_IMPORTANT, LOC_ERR + "hardware timing error detected");
+                    ic->pb->eof_reached = 0;
+                }
+                else
+                {
+                    ateof = true;
+                    m_parent->SetEof();
+                }
                 delete pkt;
                 return false;
             }

libs/libmythtv/ringbuffer.cpp

@@ -942 +942 @@
            !request_pause && !commserror && readaheadrunning)
     {
         wanttoread = count;
-        generalWait.wait(&rwlock, 250);
-        avail = ReadBufAvail();
 
         if ((ateof || setswitchtonext) && avail < count)
             count = avail;
+        else
+            generalWait.wait(&rwlock, 250);
+
+        avail = ReadBufAvail();
 
         if (avail < count)
         {