Ticket #10080: firewire-h264.patch

mythtv/libs/libmythtv/firewirerecorder.cpp

@@ -31 +31 @@
     if (!isopen)
         isopen = channel->GetFirewireDevice()->OpenPort();
 
+    memset(_stream_id,  0, sizeof(_stream_id));
+
     return isopen;
 }
 
@@ -140 +142 @@
         // Pass or reject packets based on PID, and parse info from them
         if (lpid == GetStreamData()->VideoPIDSingleProgram())
         {
-            _buffer_packets = !FindMPEG2Keyframes(&tspacket);
+            uint streamType = _stream_id[tspacket.PID()];
+
+            // Check for keyframes and count frames
+            if (streamType == StreamID::H264Video)
+            {
+                _buffer_packets = !FindH264Keyframes(&tspacket);
+                if (!_seen_sps)
+                    return;
+            }
+            else
+            {
+                _buffer_packets = !FindMPEG2Keyframes(&tspacket);
+            }
             BufferedWrite(tspacket);
         }
         else if (GetStreamData()->IsAudioPID(lpid))
@@ -216 +230 @@
     if (!pmt)
         return;
 
+    // collect stream types for H.264 (MPEG-4 AVC) keyframe detection
+    for (uint i = 0; i < pmt->StreamCount(); i++)
+        _stream_id[pmt->StreamPID(i)] = pmt->StreamType(i);
+
     int next = (pmt->tsheader()->ContinuityCounter()+1)&0xf;
     pmt->tsheader()->SetContinuityCounter(next);
     BufferedWrite(*(reinterpret_cast<const TSPacket*>(pmt->tsheader())));

mythtv/libs/libmythtv/firewirerecorder.h

@@ -63 +63 @@
     FirewireChannel       *channel;
     bool                   isopen;
     vector<unsigned char>  buffer;
+
+    unsigned char _stream_id[0x1fff + 1];
 };
 
 #endif //  _FIREWIRERECORDER_H_