Ticket #1088: gopbyframe.diff

libs/libmythtv/avformatdecoder.cpp

@@ -841 +841 @@
         // we will not see a position map from db or remote encoder,
         // set the gop interval to 15 frames.  if we guess wrong, the
         // auto detection will change it.
-        keyframedist = 15;
-        positionMapType = MARK_GOP_START;
+//        keyframedist = 15;
+//        positionMapType = MARK_GOP_START;
 
-        if (!strcmp(fmt->name, "avi"))
-        {
+//        if (!strcmp(fmt->name, "avi"))
+//        {
             // avi keyframes are too irregular
-            keyframedist = 1;
-            positionMapType = MARK_GOP_BYFRAME;
-        }
+//            keyframedist = 1;
+//            positionMapType = MARK_GOP_BYFRAME;
+//        }
+
+        keyframedist = 1;
+        positionMapType = MARK_GOP_BYFRAME;
 
         dontSyncPositionMap = true;
     }

libs/libmythtv/decoderbase.cpp

@@ -109 +109 @@
     if (ringBuffer->isDVD())
     {
         long long totframes;
-        keyframedist = 15;
+//        keyframedist = 15;
+        keyframedist = 1;
         fps = ringBuffer->DVD()->GetFrameRate();
-        if (fps < 26 && fps > 24)
-           keyframedist = 12;
+//        if (fps < 26 && fps > 24)
+//           keyframedist = 12;
         totframes = (long long)(ringBuffer->DVD()->GetTotalTimeOfTitle() * fps);
         posMap[totframes] = ringBuffer->DVD()->GetTotalReadPosition();
     }