From e0637978f89dd70d4aa33febb45b4f07f2932da4 Mon Sep 17 00:00:00 2001 From: Gilbok Lee Date: Mon, 15 Jul 2024 16:25:16 +0900 Subject: [PATCH] aacparser: Revert 'Add codec_data in caps, even if stream-format is adts' - revert 0cee0329b1e88a86fd63dd032f43f923da898abc commit in gst-plugins-good - When decoding 8-channel ADTS contents in avdec, an error occurs. Change-Id: I14ec9dbc2f816ec415bcca1eb0fd5934de09358b --- packaging/gstreamer.spec | 2 +- .../gst-plugins-good/gst/audioparsers/gstaacparse.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec index 33459e4561..c18139b47c 100644 --- a/packaging/gstreamer.spec +++ b/packaging/gstreamer.spec @@ -62,7 +62,7 @@ Name: %{_name} Version: 1.22.0 -Release: 39 +Release: 40 Summary: Streaming-Media Framework Runtime License: LGPL-2.0+ Group: Multimedia/Framework diff --git a/subprojects/gst-plugins-good/gst/audioparsers/gstaacparse.c b/subprojects/gst-plugins-good/gst/audioparsers/gstaacparse.c index 13105738a2..6b6c24a7db 100644 --- a/subprojects/gst-plugins-good/gst/audioparsers/gstaacparse.c +++ b/subprojects/gst-plugins-good/gst/audioparsers/gstaacparse.c @@ -268,19 +268,6 @@ gst_aac_parse_set_src_caps (GstAacParse * aacparse, GstCaps * sink_caps) if (stream_format) gst_structure_set (s, "stream-format", G_TYPE_STRING, stream_format, NULL); -#ifdef TIZEN_FEATURE_AACPARSE_MODIFICATION - if (!gst_structure_get_value (s, "codec_data")) { - GstBuffer *codec_data_buffer; - GST_WARNING("Insert codec_data to src_caps"); - /* The codec_data data is according to AudioSpecificConfig, - ISO/IEC 14496-3, 1.6.2.1 */ - codec_data_buffer = gst_buffer_new_and_alloc (2); - gst_buffer_fill (codec_data_buffer, 0, codec_data, 2); - gst_caps_set_simple (src_caps, "codec_data", GST_TYPE_BUFFER, codec_data_buffer, NULL); - gst_buffer_unref (codec_data_buffer); - } -#endif - peercaps = gst_pad_peer_query_caps (GST_BASE_PARSE_SRC_PAD (aacparse), NULL); if (peercaps && !gst_caps_can_intersect (src_caps, peercaps)) { GstCaps *convcaps = gst_caps_copy (src_caps); -- 2.34.1