From 136f42974da30f421384d2b263255f0f812d7f45 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Wed, 1 Feb 2012 12:03:04 +0100
Subject: [PATCH] h264parse: unbreak optimized packetized NALU collection
 processing

... in that it was so optimized it did not consider grouping NALU into AU
altogether.

Fixes #668627.
---
 gst/videoparsers/gsth264parse.c | 33 ++++++++++++++++++++++++---------
 gst/videoparsers/gsth264parse.h |  1 +
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c
index 2e4da48..d5e3473 100644
--- a/gst/videoparsers/gsth264parse.c
+++ b/gst/videoparsers/gsth264parse.c
@@ -575,10 +575,6 @@ gst_h264_parse_collect_nal (GstH264Parse * h264parse, const guint8 * data,
   GstH264NalUnitType nal_type = nalu->type;
   GstH264NalUnit nnalu;
 
-  if (h264parse->align == GST_H264_PARSE_ALIGN_NAL) {
-    return TRUE;
-  }
-
   GST_DEBUG_OBJECT (h264parse, "parsing collected nal");
   parse_res = gst_h264_parser_identify_nalu (h264parse->nalparser, data,
       nalu->offset + nalu->size, size, &nnalu);
@@ -657,6 +653,8 @@ gst_h264_parse_check_valid_frame (GstBaseParse * parse,
   nalu = h264parse->nalu;
   current_off = h264parse->current_off;
 
+  g_assert (current_off < size);
+
   GST_DEBUG_OBJECT (h264parse, "last parse position %u", current_off);
   while (TRUE) {
     GstH264ParserResult pres;
@@ -691,6 +689,10 @@ gst_h264_parse_check_valid_frame (GstBaseParse * parse,
             current_off = nalu.sc_offset;
             goto more;
           }
+        } else if (h264parse->packetized) {
+          /* normal next nal based collection not possible,
+           * _chain will have to tell us whether this was last one for AU */
+          drain = h264parse->packetized_last;
         }
         break;
       case GST_H264_PARSER_BROKEN_LINK:
@@ -752,14 +754,24 @@ gst_h264_parse_check_valid_frame (GstBaseParse * parse,
         data, nalu.offset, nalu.size);
 
     gst_h264_parse_process_nal (h264parse, &nalu);
+
+    /* simulate no next nal if none needed */
+    drain = drain || (h264parse->align == GST_H264_PARSE_ALIGN_NAL);
+
+    /* In packetized mode we know there's only on NALU in each input packet,
+     * but we may not have seen the whole AU already, possibly need more */
+    if (h264parse->packetized) {
+      if (drain)
+        break;
+      /* next NALU expected at end of current data */
+      current_off = size;
+      goto more;
+    }
+
     /* if no next nal, we know it's complete here */
     if (drain || gst_h264_parse_collect_nal (h264parse, data, size, &nalu))
       break;
 
-    /* In packetized mode we know there's only on NALU in each input packet */
-    if (h264parse->packetized)
-      break;
-
     GST_DEBUG_OBJECT (h264parse, "Looking for more");
   }
 
@@ -1834,7 +1846,10 @@ gst_h264_parse_chain (GstPad * pad, GstBuffer * buffer)
             nalu.data + nalu.offset, nalu.size);
         /* at least this should make sense */
         GST_BUFFER_TIMESTAMP (sub) = GST_BUFFER_TIMESTAMP (buffer);
-        GST_LOG_OBJECT (h264parse, "pushing NAL of size %d", nalu.size);
+        h264parse->packetized_last =
+            (nalu.offset + nalu.size + nl >= GST_BUFFER_SIZE (buffer));
+        GST_LOG_OBJECT (h264parse, "pushing NAL of size %d, last = %d",
+            nalu.size, h264parse->packetized_last);
         ret = h264parse->parse_chain (pad, sub);
       } else {
         /* pass-through: no looking for frames (and nal processing),
diff --git a/gst/videoparsers/gsth264parse.h b/gst/videoparsers/gsth264parse.h
index 1064ff8..a97dfcb 100644
--- a/gst/videoparsers/gsth264parse.h
+++ b/gst/videoparsers/gsth264parse.h
@@ -71,6 +71,7 @@ struct _GstH264Parse
   guint align;
   guint format;
   guint current_off;
+  gboolean packetized_last;
 
   GstClockTime last_report;
   gboolean push_codec;
-- 
2.7.4