Ticket #1088: mpegrec_gopbyframe.diff

libs/libmythtv/mpegrecorder.cpp

@@ -1021 +1021 @@
     buildbuffersize = 0;
 
     if (curRecording)
-        curRecording->ClearPositionMap(MARK_GOP_START);
+        curRecording->ClearPositionMap(MARK_GOP_BYFRAME);
 }
 
 void MpegRecorder::Pause(bool clear)
@@ -1065 +1065 @@
  */
 void MpegRecorder::HandleKeyframe(void)
 {
+    long long frameNum = framesWritten;
+    
     // Add key frame to position map
     bool save_map = false;
     positionMapLock.lock();
-    if (!positionMap.contains(numgops))
+    if (!positionMap.contains(frameNum))
     {
-        positionMapDelta[numgops] = lastpackheaderpos;
-        positionMap[numgops]      = lastpackheaderpos;
+        positionMapDelta[frameNum] = lastpackheaderpos;
+        positionMap[frameNum]      = lastpackheaderpos;
         save_map = true;
     }
     positionMapLock.unlock();
@@ -1102 +1104 @@
     if (curRecording && force)
     {
         curRecording->SetPositionMapDelta(positionMapDelta,
-                                          MARK_GOP_START);
+                                          MARK_GOP_BYFRAME);
         // Stop setting the filesize here until we get the contention issue
         // between with this thread and the scheduler worked out.
         //curRecording->SetFilesize(lastpackheaderpos);