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

Commit a5a778f3 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "C2: channel mask can be input to encoder" into udc-dev am: 3f90f49f... 

Merge "C2: channel mask can be input to encoder" into udc-dev am: 3f90f49f am: 4140458c am: 2e5295f9

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



Change-Id: I37df7da608a3c7f904659f63b74e203860a1b893
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f700336f 2e5295f9

media/codec2/core/include/C2Config.h

+2 −1
Original line number Diff line number Diff line
@@ -2016,7 +2016,8 @@ constexpr char C2_PARAMKEY_MAX_CHANNEL_COUNT[] = "raw.max-channel-count"; 
constexpr char C2_PARAMKEY_MAX_CODED_CHANNEL_COUNT[] = "coded.max-channel-count";



/**

 * Audio channel mask. Used by decoder to express audio channel mask of decoded content.

 * Audio channel mask. Used by decoder to express audio channel mask of decoded content,

 * or by encoder for the channel mask of the encoded content once decoded.

 * Channel representation is specified according to the Java android.media.AudioFormat

 * CHANNEL_OUT_* constants.

 */

media/codec2/sfplugin/CCodecConfig.cpp

+3 −0
Original line number Diff line number Diff line
@@ -940,6 +940,9 @@ void CCodecConfig::initializeStandardParams() { 
    add(ConfigMapper(KEY_CHANNEL_MASK, C2_PARAMKEY_CHANNEL_MASK, "value")

        .limitTo(D::AUDIO & D::DECODER & D::READ));



    add(ConfigMapper(KEY_CHANNEL_MASK, C2_PARAMKEY_CHANNEL_MASK, "value")

        .limitTo(D::AUDIO & D::ENCODER & D::CONFIG));



    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 {