Ticket #3786: mythtv_tsreset.2.patch

libs/libmyth/remotefile.h

@@ -22 +22 @@
 
     int Read(void *data, int size);
     void Reset(void);
+    int GetStarvedCount() const { return starvedCount; };
 
     bool SaveAs(QByteArray &data);
 
@@ -47 +48 @@
     bool            timeoutisfast;
     long long       readposition;
     int             recordernum;
+    int             starvedCount;
 
     mutable QMutex  lock;
     MythSocket     *controlSock;

libs/libmyth/remotefile.cpp

@@ -224 +224 @@
     strlist << QString::number(size);
     controlSock->writeStringList(strlist);
 
+    starvedCount = 0;
     sent = size;
     
     while (recv < sent && !error && zerocnt++ < 50)
@@ -235 +236 @@
             {
                 recv += ret;
             }
+            else if (ret == 0)
+            {
+                starvedCount++;
+            }
             else if (sock->error() != MythSocket::NoError)
             {
                 VERBOSE(VB_IMPORTANT, "RemoteFile::Read(): socket error");

libs/libmythtv/RingBuffer.h

@@ -57 +57 @@
                bool toAdjust      = false,
                bool resetInternal = false);
 
+    int  GetStarvedCount() const { return starvedCount; }
+
     // Seeks
     long long Seek(long long pos, int whence);
 
@@ -172 +174 @@
     LiveTVChain *livetvchain;
     bool ignoreliveeof;
 
+    int starvedCount;
+
     long long readAdjust;
 
     /// Condition to signal that the read ahead thread is running

libs/libmythtv/RingBuffer.cpp

@@ -100 +100 @@
       numfailures(0),           commserror(false),
       dvdPriv(NULL),            oldfile(false),
       livetvchain(NULL),        ignoreliveeof(false),
+      starvedCount(0),
       readAdjust(0)
 {
     pthread_rwlock_init(&rwlock, NULL);
@@ -396 +397 @@
     unsigned errcnt = 0;
     unsigned zerocnt = 0;
 
+    if (!readaheadrunning)
+        starvedCount = 0;
+
     if (fd < 0)
     {
         VERBOSE(VB_IMPORTANT, LOC_ERR +
@@ -446 +450 @@
         if (tot < sz)
             usleep(60000);
     }
+    if (!readaheadrunning)
+        starvedCount = zerocnt;
+
     return tot;
 }
 
@@ -461 +468 @@
 {
     int ret = 0;
 
+    if (!readaheadrunning)
+        starvedCount = 0;
+
     ret = rf->Read(data, sz);
     if (ret < 0)
     {
@@ -471 +481 @@
         ret = 0;
         numfailures++;
      }
+    if (!readaheadrunning)
+        starvedCount = rf->GetStarvedCount();
 
     return ret;
 }
@@ -935 +947 @@
     bool readone = false;
     int readErr = 0;
     
+    starvedCount = 0;
+
     if (readaheadpaused && stopreads)
     {
         readone = true;
@@ -1021 +1035 @@
                 availWaitMutex.unlock();
                 return 0;
             }
+            starvedCount++;
         }
 
         wanttoread = 0;

libs/libmythtv/decoderbase.h

@@ -123 +123 @@
     bool GetWaitForChange(void);
     void SetReadAdjust(long long adjust);
 
+    int  GetStarvedCount() const { return starvedCount; }
+
     // DVD public stuff
     void ChangeDVDTrack(bool ffw);
     long long DVDFindPosition(long long desiredFrame);
@@ -213 +215 @@
     bool getrawframes;
     bool getrawvideo;
 
+    int  starvedCount;
+
     bool errored;
 
     bool waitingForChange;

libs/libmythtv/decoderbase.cpp

@@ -39 +39 @@
 
       hasKeyFrameAdjustTable(false), lowbuffers(false),
       getrawframes(false), getrawvideo(false),
+      starvedCount(0),
       errored(false), waitingForChange(false), readAdjust(0),
       justAfterChange(false),
       // language preference

libs/libmythtv/avformatdecoder.cpp

@@ -2835 +2835 @@
                     delete pkt;
                 return false;
             }
+            starvedCount = avfRingBuffer->GetRingBuffer()->GetStarvedCount();
+#if 1
+            // for debugging
+            if (starvedCount > 0)
+            {
+                VERBOSE(VB_PLAYBACK, LOC_ERR + QString("AVF Starved %1").arg(starvedCount));
+            }
+#endif
 
             if (waitingForChange && pkt->pos >= readAdjust)
                 FileChanged();

libs/libmythtv/nuppeldecoder.cpp

@@ -988 +988 @@
     int seeklen = 0;
 
     decoded_video_frame = NULL;
+    starvedCount = 0;
 
     while (!gotvideo)
     {
@@ -1005 +1006 @@
             return false;
         }
 
+        starvedCount += ringBuffer->GetStarvedCount();
 
         if (!ringBuffer->LiveMode() && 
             ((frameheader.frametype == 'Q') || (frameheader.frametype == 'K')))
@@ -1031 +1033 @@
                 GetNVP()->SetEof();
                 return false;
             }
+            starvedCount += ringBuffer->GetStarvedCount();
             seeklen = 1;
         }
 
@@ -1046 +1049 @@
                 GetNVP()->SetEof();
                 return false;
             }
+            starvedCount += ringBuffer->GetStarvedCount();
 
             delete [] dummy;
             continue;
@@ -1115 +1119 @@
                 GetNVP()->SetEof();
                 return false;
             }
+            starvedCount += ringBuffer->GetStarvedCount();
         }
         else
             continue;

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -1265 +1265 @@
     CheckPrebuffering();
 
     if ((play_speed > 1.01f) && (audio_stretchfactor > 1.01f) && 
-         livetv && IsNearEnd())
+         (livetv || (watchingrecording && nvr_enc && nvr_enc->IsValidRecorder()))
+         && (IsNearEnd() || GetDecoder()->GetStarvedCount()>0))
     {
         VERBOSE(VB_PLAYBACK, LOC + "Near end, Slowing down playback.");
         Play(1.0f, true, true);