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

aacparse: fix regression in ADIF src caps setting

Browse source
This commit is contained in:
Mark Nauwelaerts 2010-11-17 15:24:37 +01:00 committed by Tim-Philipp Müller
parent 55da8e46eb
commit 31d387f7b5
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/audioparsers/gstaacparse.c
View file

@ -568,6 +568,11 @@ gst_aacparse_detect_stream (GstAacParse * aacparse,
gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse), 512); gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse), 512);
/* arrange for metadata and get out of the way */
gst_aacparse_set_src_caps (aacparse,
GST_PAD_CAPS (GST_BASE_PARSE_SINK_PAD (aacparse)));
gst_base_parse_set_passthrough (GST_BASE_PARSE (aacparse), TRUE);
*framesize = avail; *framesize = avail;
return TRUE; return TRUE;
} }
@ -654,6 +659,9 @@ gst_aacparse_parse_frame (GstBaseParse * parse, GstBuffer * buffer)
aacparse = GST_AACPARSE (parse); aacparse = GST_AACPARSE (parse);
if (G_UNLIKELY (aacparse->header_type != DSPAAC_HEADER_ADTS))
return ret;
gst_aacparse_parse_adts_header (aacparse, GST_BUFFER_DATA (buffer), gst_aacparse_parse_adts_header (aacparse, GST_BUFFER_DATA (buffer),
&rate, &channels, NULL, NULL); &rate, &channels, NULL, NULL);
GST_LOG_OBJECT (aacparse, "rate: %d, chans: %d", rate, channels); GST_LOG_OBJECT (aacparse, "rate: %d, chans: %d", rate, channels);
@ -673,7 +681,6 @@ gst_aacparse_parse_frame (GstBaseParse * parse, GstBuffer * buffer)
aacparse->sample_rate, 1024, 2, 2); aacparse->sample_rate, 1024, 2, 2);
} }
gst_buffer_set_caps (buffer, GST_PAD_CAPS (parse->srcpad));
return ret; return ret;
} }