Ticket #1926: h264utils.diff

mythtv/libs/libmythtv/mpeg/h264utils.h

@@ -195 +195 @@
 
     bool    saw_AU_delimiter;
     bool    saw_first_VCL_NAL_unit;
+    bool    saw_sps;
 
     bool    did_evaluate_once;
     bool    keyframe;

mythtv/libs/libmythtv/mpeg/h264utils.cpp

@@ -62 +62 @@
 
     saw_AU_delimiter = false;
     saw_first_VCL_NAL_unit = false;
+    saw_sps = false;
 
     did_evaluate_once = false;
     keyframe = false;
@@ -113 +114 @@
         }
     }
 
-    // stage 2: determine if it's an IDR AU
-    if (!saw_first_VCL_NAL_unit && new_NAL_type == NALUnitType::SLICE_IDR)
+    if (!saw_first_VCL_NAL_unit && !saw_sps && new_NAL_type == NALUnitType::SPS)
     {
-        keyframe = true;
+        saw_sps = true;
+        state_changed = true;
+        keyframe = false;
     }
 
-    // stage 3: did we see the AU's first VCL NAL unit yet?
     if (!saw_first_VCL_NAL_unit && NALUnitType::IsVCLType(new_NAL_type))
     {
         saw_first_VCL_NAL_unit = true;
         saw_AU_delimiter = false;
+        state_changed = true;
+        if (saw_sps)
+            keyframe = true;
+        saw_sps = false;
     }
 }
 
@@ -152 +157 @@
                     read_first_NAL_byte = false;
                     keyframe = false;
 
-                    state_changed = true;
                     return local_bytes - bytes;
                 }
                 else
@@ -167 +171 @@
             local_bytes++;
         }
     }
-
+    state_changed = false;
     if (synced && !read_first_NAL_byte && local_bytes < local_bytes_end)
     {
         KeyframePredicate(*local_bytes);
@@ -178 +182 @@
         synced = false;
         read_first_NAL_byte = true;
 
-        state_changed = true;
         return local_bytes - bytes;
     }
 
-    state_changed = false;
+
     return local_bytes - bytes;
 }