From: Gilbok Lee <gilbok.lee@samsung.com>
Date: Mon, 15 Jul 2024 07:25:16 +0000 (+0900)
Subject: aacparser: Revert 'Add codec_data in caps, even if stream-format is adts'
X-Git-Tag: accepted/tizen/7.0/unified/20240717.120953^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F314555%2F1;p=platform%2Fupstream%2Fgstreamer.git

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
---

diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec
index f275624925..190a7f1624 100644
--- a/packaging/gstreamer.spec
+++ b/packaging/gstreamer.spec
@@ -62,7 +62,7 @@
 
 Name:           %{_name}
 Version:        1.20.0
-Release:        59
+Release:        60
 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 1fb5cb0fb0..16cb828f4e 100644
--- a/subprojects/gst-plugins-good/gst/audioparsers/gstaacparse.c
+++ b/subprojects/gst-plugins-good/gst/audioparsers/gstaacparse.c
@@ -266,19 +266,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)) {
     GST_DEBUG_OBJECT (GST_BASE_PARSE (aacparse)->srcpad,