From: Tim-Philipp Müller <tim@centricular.com>
Date: Tue, 20 Apr 2021 19:04:33 +0000 (+0100)
Subject: openh264enc: fix broken header AU emission by base class
X-Git-Tag: 1.19.3~507^2~92
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67a49be61fadaf264daf08619d66e92d86d9a333;p=platform%2Fupstream%2Fgstreamer.git

openh264enc: fix broken header AU emission by base class

This encoder advertises alignment=au as output format, which means
each output frame should contain a full decodable access unit.

The video encoder base class is not aware of our output alignment
and will output spurious buffers with just the SPS/PPS inside when
we call gst_video_encoder_set_headers(), which is broken because
each buffer is supposed to contain a full decodable access unit
in our case.

Just don't tell the base class about our headers, they will be
sent at the beginning of each IDR frame anyway.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2178>
---

diff --git a/ext/openh264/gstopenh264enc.cpp b/ext/openh264/gstopenh264enc.cpp
index 502eca9..30af8e2 100644
--- a/ext/openh264/gstopenh264enc.cpp
+++ b/ext/openh264/gstopenh264enc.cpp
@@ -885,7 +885,6 @@ gst_openh264enc_handle_frame (GstVideoEncoder * encoder,
   gfloat fps;
   gint i, j;
   gsize buf_length = 0;
-  GList* headers = NULL;
 
   GST_OBJECT_LOCK (openh264enc);
 
@@ -1034,34 +1033,10 @@ gst_openh264enc_handle_frame (GstVideoEncoder * encoder,
     for (j = 0; j < frame_info.sLayerInfo[i].iNalCount; j++) {
       layer_size += frame_info.sLayerInfo[i].pNalLengthInByte[j];
     }
-    /* detect header with NON_VIDEO_CODING_LAYER and fill headers list */
-    if (frame_info.sLayerInfo[i].uiLayerType == NON_VIDEO_CODING_LAYER) {
-        int nal_type;
-        gint nal_offset = 0;
-        GstBuffer* hdr = gst_buffer_new_and_alloc (layer_size);
-        GST_BUFFER_FLAG_SET (hdr, GST_BUFFER_FLAG_HEADER);
-        for (j = 0; j < frame_info.sLayerInfo[i].iNalCount; j++) {
-          if (j > 0)
-            nal_offset = nal_offset + frame_info.sLayerInfo[i].pNalLengthInByte[j-1];
-          nal_type = ((* (frame_info.sLayerInfo[i].pBsBuf + nal_offset + 4)) & 0x1f);
-          /* Note: This only works if SPS/PPS are the first two NALs in which case
-           * nal_offset is the same for both the output and the bitstream buffer */
-          if (nal_type == NAL_SPS || nal_type == NAL_PPS) {
-            gst_buffer_fill (hdr, nal_offset,
-                frame_info.sLayerInfo[i].pBsBuf + nal_offset,
-                frame_info.sLayerInfo[i].pNalLengthInByte[j]);
-          }
-        }
-        headers = g_list_append (headers, hdr);    /* take ownership of hdr */
-    }
     gst_buffer_fill (frame->output_buffer, buf_length, frame_info.sLayerInfo[i].pBsBuf, layer_size);
     buf_length += layer_size;
   }
 
-  /*Set headers from the frame_info*/
-  if (headers)
-    gst_video_encoder_set_headers (encoder, headers);
-
   GST_LOG_OBJECT (openh264enc, "openh264 picture %scoded OK!",
       (ret != cmResultSuccess) ? "NOT " : "");