Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cdf185f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "c2_channel_mask" into tm-dev am: 03ad8074 am:... 

Merge changes from topic "c2_channel_mask" into tm-dev am: 03ad8074 am: 68b43159 am: fc21771d am: bddf6131

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18176407



Change-Id: Icebe3991cff21821d48e6564e2e01048f80fba34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff20d6ae bddf6131

media/codec2/sfplugin/CCodecConfig.cpp

+3 −0
Original line number Diff line number Diff line
@@ -905,6 +905,9 @@ void CCodecConfig::initializeStandardParams() { 
    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 {