fdkaacenc: rename profile=sbr|ps to profile=he-aac-v1|he-aac-v2

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1785>

diff --git a/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json b/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json
index ba39c4f..7fa588b 100644 (file)
--- a/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json
+++ b/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json
@@ -16708,7 +16708,7 @@
                         "presence": "always"
                     },
                     "src": {
-                        "caps": "audio/mpeg:\n    mpegversion: 4\n           rate: { (int)8000, (int)11025, (int)12000, (int)16000, (int)22050, (int)24000, (int)32000, (int)44100, (int)48000, (int)64000, (int)88200, (int)96000 }\n       channels: { (int)1, (int)2, (int)3, (int)4, (int)5, (int)6, (int)8 }\n  stream-format: { (string)adts, (string)adif, (string)raw }\n        profile: { (string)lc, (string)sbr, (string)ps }\n         framed: true\n",
+                        "caps": "audio/mpeg:\n    mpegversion: 4\n           rate: { (int)8000, (int)11025, (int)12000, (int)16000, (int)22050, (int)24000, (int)32000, (int)44100, (int)48000, (int)64000, (int)88200, (int)96000 }\n       channels: { (int)1, (int)2, (int)3, (int)4, (int)5, (int)6, (int)8 }\n  stream-format: { (string)adts, (string)adif, (string)raw }\n        profile: { (string)lc, (string)he-aac-v1, (string)he-aac-v2, (string)ld }\n         framed: true\n",
                         "direction": "src",
                         "presence": "always"
                     }

diff --git a/subprojects/gst-plugins-bad/ext/fdkaac/gstfdkaacenc.c b/subprojects/gst-plugins-bad/ext/fdkaac/gstfdkaacenc.c
index dcf9dab..fca90e3 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/fdkaac/gstfdkaacenc.c
+++ b/subprojects/gst-plugins-bad/ext/fdkaac/gstfdkaacenc.c
@@ -74,7 +74,8 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
         "rate = (int) { " SAMPLE_RATES " }, "
         "channels = (int) {1, 2, 3, 4, 5, 6, 8}, "
         "stream-format = (string) { adts, adif, raw }, "
-        "profile = (string) { lc, sbr, ps, ld }, " "framed = (boolean) true")
+        "profile = (string) { lc, he-aac-v1, he-aac-v2, ld }, "
+        "framed = (boolean) true")
     );
 
 GST_DEBUG_CATEGORY_STATIC (gst_fdkaacenc_debug);
@@ -174,7 +175,7 @@ gst_fdkaacenc_get_caps (GstAudioEncoder * enc, GstCaps * filter)
     const gchar *profile = NULL;
 
     if ((profile = gst_structure_get_string (s, "profile"))
-        && strcmp (profile, "ps") == 0) {
+        && strcmp (profile, "he-aac-v2") == 0) {
       allow_mono = FALSE;
     }
   }
@@ -258,10 +259,10 @@ gst_fdkaacenc_set_format (GstAudioEncoder * enc, GstAudioInfo * info)
       if (strcmp (str, "lc") == 0) {
         GST_DEBUG_OBJECT (self, "using AAC-LC profile for output");
         aot = AOT_AAC_LC;
-      } else if (strcmp (str, "sbr") == 0) {
-        GST_DEBUG_OBJECT (self, "using SBR (HE-AAC) profile for output");
+      } else if (strcmp (str, "he-aac-v1") == 0) {
+        GST_DEBUG_OBJECT (self, "using SBR (HE-AACv1) profile for output");
         aot = AOT_SBR;
-      } else if (strcmp (str, "ps") == 0) {
+      } else if (strcmp (str, "he-aac-v2") == 0) {
         GST_DEBUG_OBJECT (self, "using PS (HE-AACv2) profile for output");
         aot = AOT_PS;
       } else if (strcmp (str, "ld") == 0) {