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

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

Merge changes from topic "presubmit-am-69e72d7f5fff431a85844c1c65db9de8" into... 

Merge changes from topic "presubmit-am-69e72d7f5fff431a85844c1c65db9de8" into sc-v2-dev-plus-aosp am: 7782c14a

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

Change-Id: Idc78a26e212276d533543e86117ec87cbf215ba0
parents 3e32b5d9 7782c14a

media/codec2/sfplugin/CCodecConfig.cpp

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

media/libstagefright/ACodec.cpp

+4 −1
Original line number Diff line number Diff line
@@ -2195,8 +2195,11 @@ status_t ACodec::configureCodec( 
            }



            if (!msg->findInt32("aac-max-output-channel_count", &maxOutputChannelCount)) {

                // check non AAC-specific key

                if (!msg->findInt32("max-output-channel-count", &maxOutputChannelCount)) {

                    maxOutputChannelCount = -1;

                }

            }

            if (!msg->findInt32("aac-pcm-limiter-enable", &pcmLimiterEnable)) {

                // value is unknown

                pcmLimiterEnable = -1;

media/libstagefright/include/media/stagefright/MediaCodecConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -809,6 +809,7 @@ constexpr char KEY_MAX_BIT_RATE[] = "max-bitrate"; 
constexpr char KEY_MAX_FPS_TO_ENCODER[] = "max-fps-to-encoder";

constexpr char KEY_MAX_HEIGHT[] = "max-height";

constexpr char KEY_MAX_INPUT_SIZE[] = "max-input-size";

constexpr char KEY_MAX_OUTPUT_CHANNEL_COUNT[] = "max-output-channel-count";

constexpr char KEY_MAX_PTS_GAP_TO_ENCODER[] = "max-pts-gap-to-encoder";

constexpr char KEY_MAX_WIDTH[] = "max-width";

constexpr char KEY_MIME[] = "mime";