commit 63e1ece4bd8cc43c8db4c0108655001c2623ae5b
author Jean-Michel Trivi <jmtrivi@google.com> Thu Jan 27 19:27:02 2022 -0800
committer Jean-Michel Trivi <jmtrivi@google.com> Fri Jan 28 09:53:30 2022 -0800
tree 5e951f80b397e0137e6f6b42da9a1ad1424e1c59
parent d7f33c5ba46b01e3e580597260cd0ffffdf773b6

MediaCodec: unify KEY_MAX_OUTPUT_CHANNEL_COUNT and AAC variant

Make KEY_MAX_OUTPUT_CHANNEL_COUNT behave like
KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT for AAC decoder.

Bug: 198197610
Test: atest DecoderTestAacFormat
Change-Id: Ie0c78d965902fc4561ecfd0bbe3a1d0c0cf457c8

media/codec2/sfplugin/CCodecConfig.cpp

diff --git a/media/codec2/sfplugin/CCodecConfig.cpp b/media/codec2/sfplugin/CCodecConfig.cpp
index c275187..09e24be 100644
--- a/media/codec2/sfplugin/CCodecConfig.cpp
+++ b/media/codec2/sfplugin/CCodecConfig.cpp
@@ -894,6 +894,9 @@
     add(ConfigMapper(KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT, C2_PARAMKEY_MAX_CHANNEL_COUNT, "value")
         .limitTo(D::AUDIO & (D::CONFIG | D::PARAM | D::READ)));
 
+    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_AAC_SBR_MODE, C2_PARAMKEY_AAC_SBR_MODE, "value")
         .limitTo(D::AUDIO & D::ENCODER & (D::CONFIG | D::PARAM | D::READ))
         .withMapper([](C2Value v) -> C2Value {