Ticket #6285: livetv_keyframedist2.diff

libs/libmythtv/avformatdecoder.cpp

@@ -993 +993 @@
     }
 
     // If we don't have a position map, set up ffmpeg for seeking
-    if (!recordingHasPositionMap)
+    if (!recordingHasPositionMap && !livetv)
     {
         VERBOSE(VB_PLAYBACK, LOC +
                 "Recording has no position -- using libavformat seeking.");
@@ -2364 +2364 @@
         int tempKeyFrameDist = framesRead - 1 - prevgoppos;
         bool reset_kfd = false;
 
-        if (!gopset) // gopset: we've seen 2 keyframes
+        if (!gopset || livetv) // gopset: we've seen 2 keyframes
         {
             VERBOSE(VB_PLAYBACK, LOC + "HandleGopStart: "
                     "gopset not set, syncing positionMap");
             SyncPositionMap();
-            if (tempKeyFrameDist > 0)
+            if (tempKeyFrameDist > 0 && !livetv)
             {
                 VERBOSE(VB_PLAYBACK, LOC + "HandleGopStart: " +
                         QString("Initial key frame distance: %1.")

libs/libmythtv/decoderbase.cpp

@@ -180 +180 @@
 
 bool DecoderBase::PosMapFromEnc(void)
 {
-    if (!m_parent)
+    if (!m_parent || keyframedist < 1)
         return false;
 
     unsigned long long start = 0;