mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 02:01:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264parse: Don't insert extra AUD if exists in bitstream already

Browse source 
AUD nalu in packetized format is completely valid and therefore we should not
assume that we should insert AUD for packetized -> bytestream
conversion.

Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/862
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1296>
This commit is contained in:
Seungha Yang 2021-11-03 17:09:52 +09:00 committed by GStreamer Marge Bot
parent aa1d97b0fb
commit 21d7bd09ce
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gst-plugins-bad/gst/videoparsers/gsth264parse.c
View file

@ -237,6 +237,7 @@ gst_h264_parse_reset_frame (GstH264Parse * h264parse)
h264parse->frame_start = FALSE;
h264parse->have_sps_in_frame = FALSE;
h264parse->have_pps_in_frame = FALSE;
h264parse->have_aud_in_frame = FALSE;
gst_adapter_clear (h264parse->frame_out);
}
@ -1130,6 +1131,7 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
if (pres != GST_H264_PARSER_OK)
return FALSE;
h264parse->aud_needed = FALSE;
h264parse->have_aud_in_frame = TRUE;
break;
default:
/* drop anything before the initial SPS */
@ -1231,8 +1233,9 @@ gst_h264_parse_handle_frame_packetized (GstBaseParse * parse,
parse_res = gst_h264_parser_identify_nalu_avc (h264parse->nalparser,
map.data, 0, map.size, nl, &nalu);
/* there is no AUD in AVC, always enable insertion, the pre_push function
* will only add it once, and will only add it for byte-stream output. */
/* Always enable AUD insertion per frame here. The pre_push function
* will only add it once, and will only add it for byte-stream output
* if AUD doesn't exist in the current frame */
h264parse->aud_insert = TRUE;
while (parse_res == GST_H264_PARSER_OK) {
@ -3115,7 +3118,8 @@ gst_h264_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
/* In case of byte-stream, insert au delimiter by default
* if it doesn't exist */
if (h264parse->aud_insert && h264parse->format == GST_H264_PARSE_FORMAT_BYTE) {
if (h264parse->aud_insert && !h264parse->have_aud_in_frame &&
h264parse->format == GST_H264_PARSE_FORMAT_BYTE) {
GST_DEBUG_OBJECT (h264parse, "Inserting AUD into the stream.");
if (h264parse->align == GST_H264_PARSE_ALIGN_AU) {
GstMemory *mem =

14
subprojects/gst-plugins-bad/gst/videoparsers/gsth264parse.h
View file

@ -92,6 +92,16 @@ struct _GstH264Parse
gboolean have_sps_in_frame;
gboolean have_pps_in_frame;
/* per frame AU Delimiter check used when in_format == avc or avc3 */
gboolean have_aud_in_frame;
/* tracing state whether h264parse needs to insert AUD or not.
* Used when in_format == byte-stream */
gboolean aud_needed;
/* For insertion of AU Delimiter */
gboolean aud_insert;
gboolean first_frame;
/* collected SPS and PPS NALUs */
@ -146,10 +156,6 @@ struct _GstH264Parse
GstVideoMultiviewFlags multiview_flags;
gboolean first_in_bundle;
/* For insertion of AU Delimiter */
gboolean aud_needed;
gboolean aud_insert;
GstVideoParseUserData user_data;
GstVideoMasteringDisplayInfo mastering_display_info;