Ticket #6602: ringbuffer_reset_v2.diff

libs/libmythtv/recorderbase.cpp

@@ -241 +241 @@
         rb_changed = true;
 
         StartNewFile();
+
+        ResetStreamParser();
     }
     nextRingBufferLock.unlock();
 

libs/libmythtv/mpegrecorder.h

@@ -63 +63 @@
     // ReaderPausedCB
     virtual void ReaderPaused(int fd) { pauseWait.wakeAll(); }
 
+    // Reset stream parsers when necessary
+    virtual void ResetStreamParser(void);
+
   private:
     void SetIntOption(RecordingProfile *profile, const QString &name);
     void SetStrOption(RecordingProfile *profile, const QString &name);

libs/libmythtv/recorderbase.h

@@ -212 +212 @@
      */
     virtual void CheckForRingBufferSwitch(void);
 
+    /** \brief Inherited method for the stream parser to be reset after
+               a ringbuffer change. Used mainly in mpegrecorder for H264Parser.
+     */
+    virtual void ResetStreamParser(void) { };
+
     /** \brief Save the seektable to the DB
      */
     void SavePositionMap(bool force = false);

libs/libmythtv/mpegrecorder.cpp

@@ -1430 +1430 @@
     {
         VERBOSE(VB_RECORD, LOC + "PauseAndWait unpause");
 
-        if (driver == "hdpvr")
-        {
-            m_h264_parser.Reset();
-            _wait_for_keyframe_option = true;
-            _seen_sps = false;
-        }
+        ResetStreamParser();
 
         // Some drivers require streaming to be disabled before
         // an input switch and other channel format setting.
@@ -1500 +1495 @@
 
     if (ioctl(fd, VIDIOC_ENCODER_CMD, &command) == 0)
     {
-        if (driver == "hdpvr")
-        {
-            m_h264_parser.Reset();
-            _wait_for_keyframe_option = true;
-            _seen_sps = false;
-        }
+        ResetStreamParser();
 
         VERBOSE(VB_RECORD, LOC + "Encoding started");
         return true;
@@ -1762 +1752 @@
         SetBitrate(bitrate, maxbitrate, "New");
     }
 }
+
+void MpegRecorder::ResetStreamParser(void)               
+{        
+    if (driver == "hdpvr")      
+    {
+        m_h264_parser.Reset();
+        _wait_for_keyframe_option = true;
+        _seen_sps = false;
+    }
+
+    RecorderBase::ResetStreamParser();
+}