commit d930ab64fd3e2619fb247ce5c4b7633c1bf8350c
author Wonsik Kim <wonsik@google.com> Tue Apr 13 05:28:59 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 13 05:28:59 2021 +0000
tree 06d1320331ee052836163a80190ff200a153e3df
parent bf58beb65e4338dce79e210b1f07e27254a55f27
parent 189d4db8f57825721b4f4b44220a77b3aed2796e

Merge "CCodecConfig: Add mapper for aac-profile"

media/codec2/sfplugin/CCodecConfig.cpp

diff --git a/media/codec2/sfplugin/CCodecConfig.cpp b/media/codec2/sfplugin/CCodecConfig.cpp
index 090c02a..12b3db0 100644
--- a/media/codec2/sfplugin/CCodecConfig.cpp
+++ b/media/codec2/sfplugin/CCodecConfig.cpp
@@ -733,6 +733,17 @@
             return C2Value();
         }));
 
+    add(ConfigMapper(KEY_AAC_PROFILE, C2_PARAMKEY_PROFILE_LEVEL, "profile")
+        .limitTo(D::AUDIO & D::ENCODER & (D::CONFIG | D::PARAM))
+        .withMapper([mapper](C2Value v) -> C2Value {
+            C2Config::profile_t c2 = PROFILE_UNUSED;
+            int32_t sdk;
+            if (mapper && v.get(&sdk) && mapper->mapProfile(sdk, &c2)) {
+                return c2;
+            }
+            return PROFILE_UNUSED;
+        }));
+
     // convert to dBFS and add default
     add(ConfigMapper(KEY_AAC_DRC_TARGET_REFERENCE_LEVEL, C2_PARAMKEY_DRC_TARGET_REFERENCE_LEVEL, "value")
         .limitTo(D::AUDIO & D::DECODER & (D::CONFIG | D::PARAM | D::READ))