mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

aacparse: fix srcpad caps handling

Browse source
This commit is contained in:
Wim Taymans 2012-02-03 16:12:59 +01:00
parent 78ed46cc4f
commit 3a095a26b2
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gst/audioparsers/gstaacparse.c
View file

@ -878,9 +878,11 @@ gst_aac_parse_detect_stream (GstAacParse * aacparse,
gst_base_parse_set_min_frame_size (GST_BASE_PARSE (aacparse), 512);
/* arrange for metadata and get out of the way */
sinkcaps = gst_pad_get_current_caps (GST_BASE_PARSE_SINK_PAD (aacparse));
gst_aac_parse_set_src_caps (aacparse, sinkcaps);
gst_caps_unref (sinkcaps);
if ((sinkcaps =
gst_pad_get_current_caps (GST_BASE_PARSE_SINK_PAD (aacparse)))) {
gst_aac_parse_set_src_caps (aacparse, sinkcaps);
gst_caps_unref (sinkcaps);
}
/* not syncable, not easily seekable (unless we push data from start */
gst_base_parse_set_syncable (GST_BASE_PARSE_CAST (aacparse), FALSE);
@ -1024,12 +1026,14 @@ gst_aac_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
aacparse->sample_rate = rate;
aacparse->channels = channels;
sinkcaps = gst_pad_get_current_caps (GST_BASE_PARSE (aacparse)->sinkpad);
if (!gst_aac_parse_set_src_caps (aacparse, sinkcaps)) {
/* If linking fails, we need to return appropriate error */
ret = GST_FLOW_NOT_LINKED;
if ((sinkcaps =
gst_pad_get_current_caps (GST_BASE_PARSE (aacparse)->sinkpad))) {
if (!gst_aac_parse_set_src_caps (aacparse, sinkcaps)) {
/* If linking fails, we need to return appropriate error */
ret = GST_FLOW_NOT_LINKED;
}
gst_caps_unref (sinkcaps);
}
gst_caps_unref (sinkcaps);
gst_base_parse_set_frame_rate (GST_BASE_PARSE (aacparse),
aacparse->sample_rate, aacparse->frame_samples, 2, 2);
@ -1059,13 +1063,16 @@ gst_aac_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
before knowing about rate/channels. */
if (setcaps
|| !gst_pad_has_current_caps (GST_BASE_PARSE_SRC_PAD (aacparse))) {
GstCaps *sinkcaps =
gst_pad_get_current_caps (GST_BASE_PARSE (aacparse)->sinkpad);
if (!gst_aac_parse_set_src_caps (aacparse, sinkcaps)) {
/* If linking fails, we need to return appropriate error */
ret = GST_FLOW_NOT_LINKED;
GstCaps *sinkcaps;
if ((sinkcaps =
gst_pad_get_current_caps (GST_BASE_PARSE (aacparse)->sinkpad))) {
if (!gst_aac_parse_set_src_caps (aacparse, sinkcaps)) {
/* If linking fails, we need to return appropriate error */
ret = GST_FLOW_NOT_LINKED;
}
gst_caps_unref (sinkcaps);
}
gst_caps_unref (sinkcaps);
gst_base_parse_set_frame_rate (GST_BASE_PARSE (aacparse),
aacparse->sample_rate, aacparse->frame_samples, 2, 2);