mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264parse: ignore codec_data if stream-format=byte-stream

Browse source 
Some encoders set codec_data even when outputting byte-stream. Before this patch
h264parse would incorrectly detect such streams as AVC.
This commit is contained in:
Alessandro Decina 2011-07-06 23:24:27 +02:00 committed by Alessandro Decina
parent 177e00f809
commit 7bcc0c71b8
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/videoparsers/gsth264parse.c
View file

@ -952,8 +952,12 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
gst_structure_get_fraction (str, "framerate", &h264parse->fps_num, gst_structure_get_fraction (str, "framerate", &h264parse->fps_num,
&h264parse->fps_den); &h264parse->fps_den);
/* get upstream format and align from caps */
gst_h264_parse_format_from_caps (caps, &format, &align);
/* packetized video has a codec_data */ /* packetized video has a codec_data */
if ((value = gst_structure_get_value (str, "codec_data"))) { if (format != GST_H264_PARSE_FORMAT_BYTE &&
(value = gst_structure_get_value (str, "codec_data"))) {
guint8 *data; guint8 *data;
guint num_sps, num_pps, profile, len; guint num_sps, num_pps, profile, len;
gint i; gint i;
@ -1024,9 +1028,6 @@ gst_h264_parse_set_caps (GstBaseParse * parse, GstCaps * caps)
/* negotiate with downstream, sets ->format and ->align */ /* negotiate with downstream, sets ->format and ->align */
gst_h264_parse_negotiate (h264parse); gst_h264_parse_negotiate (h264parse);
/* get upstream format and align from caps */
gst_h264_parse_format_from_caps (caps, &format, &align);
/* if upstream sets codec_data without setting stream-format and alignment, we /* if upstream sets codec_data without setting stream-format and alignment, we
* assume stream-format=avc,alignment=au */ * assume stream-format=avc,alignment=au */
if (format == GST_H264_PARSE_FORMAT_NONE) { if (format == GST_H264_PARSE_FORMAT_NONE) {