commit b28a72ca396548c97dbfb2be77bc630b40a54aad
author Jean-Michel Trivi <jmtrivi@google.com> Thu May 05 01:01:01 2022 +0000
committer Jean-Michel Trivi <jmtrivi@google.com> Thu May 05 01:01:01 2022 +0000
tree 2c337faac584318e314053e5ae32edc18f5a08f1
parent 65fab753c8b3164d608854a30e991e432c82dfd9

C2: channel mask mapper

Add mapper for audio channel mask in
CCodecConfig::initializeStandardParams() method.

Bug: 198197610
Bug: 211823739
Test: atest DecoderTestAacFormat
Change-Id: I489cd9f96dc99e84a701c9a59fce054ca2d02273

media/codec2/sfplugin/CCodecConfig.cpp

diff --git a/media/codec2/sfplugin/CCodecConfig.cpp b/media/codec2/sfplugin/CCodecConfig.cpp
index 836d2a7..068e423 100644
--- a/media/codec2/sfplugin/CCodecConfig.cpp
+++ b/media/codec2/sfplugin/CCodecConfig.cpp
@@ -905,6 +905,9 @@
     add(ConfigMapper(KEY_MAX_OUTPUT_CHANNEL_COUNT, C2_PARAMKEY_MAX_CHANNEL_COUNT, "value")
         .limitTo(D::AUDIO & (D::CONFIG | D::PARAM | D::READ)));
 
+    add(ConfigMapper(KEY_CHANNEL_MASK, C2_PARAMKEY_CHANNEL_MASK, "value")
+        .limitTo(D::AUDIO & D::DECODER & D::READ));
+
     add(ConfigMapper(KEY_AAC_SBR_MODE, C2_PARAMKEY_AAC_SBR_MODE, "value")
         .limitTo(D::AUDIO & D::ENCODER & (D::CONFIG | D::PARAM | D::READ))
         .withMapper([](C2Value v) -> C2Value {