Ticket #9511: 103-livetv_buffer_underrun.patch

external/FFmpeg/libavformat/mpegts.c

@@ -2096 +2096 @@
 
     for(;;) {
         len = get_buffer(pb, buf, TS_PACKET_SIZE);
-        if (len != TS_PACKET_SIZE)
-            return AVERROR(EIO);
+        if (len != TS_PACKET_SIZE) {
+            if (pb->error == AVERROR(EAGAIN)) {
+                /* workarround to solve livetv ringbuffer underrun */
+                pb->error = pb->eof_reached = 0;
+                return AVERROR(EAGAIN);
+            } else
+                return AVERROR(EIO);
+        }
         /* check paquet sync byte */
         if (buf[0] != 0x47) {
             /* find a new packet start */

libs/libmythtv/ringbuffer.cpp

@@ -1149 +1148 @@
     {
         // this can happen under a few conditions but the most
         // notable is an exit from the read ahead thread or
-        // the end of the file stream has been reached.
-        VERBOSE(VB_FILE, LOC + loc_desc + ": ReadBufAvail() == 0");
+        // the end of the file stream has been reached or
+        // encoder stream underrun when live tv switching to
+        // next program
+        VERBOSE(VB_FILE, LOC + loc_desc + ": ReadBufAvail() == 0" +
+            QString(" livetvchain=%1")
+            .arg(livetvchain ? 1 : 0));
         rwlock.unlock();
-        return count;
+        return livetvchain ? -EAGAIN : -EIO;
     }
 
     if (peek)