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

Commit 25783112 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Keep AOT type to support AAC offload feature"

parents 54d68420 b2a805cd

media/extractors/aac/AACExtractor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ AACExtractor::AACExtractor( 


    mMeta = AMediaFormat_new();

    MakeAACCodecSpecificData(mMeta, profile, sf_index, channel);

    AMediaFormat_setInt32(mMeta, AMEDIAFORMAT_KEY_AAC_PROFILE, profile + 1);



    off64_t streamSize, numFrames = 0;

    size_t frameSize = 0;

media/libstagefright/Utils.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1703,6 +1703,11 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) { 
            meta->setInt32(kKeyIsADTS, isADTS);

        }



        int32_t aacProfile = -1;

        if (msg->findInt32("aac-profile", &aacProfile)) {

            meta->setInt32(kKeyAACAOT, aacProfile);

        }



        int32_t pcmEncoding;

        if (msg->findInt32("pcm-encoding", &pcmEncoding)) {

            meta->setInt32(kKeyPcmEncoding, pcmEncoding);