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

Commit e6144d7a authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 42d89e5d: am b904d53f: am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding" 

* commit '42d89e5d':
  stagefright: do not offload LD-AAC decoding
parents 864866a6 42d89e5d

include/media/stagefright/MetaData.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ enum { 
    kKeyRequiresSecureBuffers = 'secu',  // bool (int32_t)



    kKeyIsADTS            = 'adts',  // bool (int32_t)

    kKeyAACAOT            = 'aaot',  // int32_t



    // If a MediaBuffer's data represents (at least partially) encrypted

    // data, the following fields aid in decryption.

media/libstagefright/MPEG4Extractor.cpp

+3 −0
Original line number Diff line number Diff line
@@ -2431,6 +2431,9 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio( 
        objectType = 32 + br.getBits(6);

    }



    //keep AOT type

    mLastTrack->meta->setInt32(kKeyAACAOT, objectType);



    uint32_t freqIndex = br.getBits(4);



    int32_t sampleRate = 0;

media/libstagefright/Utils.cpp

+11 −0
Original line number Diff line number Diff line
@@ -562,6 +562,17 @@ bool canOffloadStream(const sp<MetaData>& meta, bool hasVideo, 
        return false;

    }



    // check whether it is ELD/LD content -> no offloading

    // FIXME: this should depend on audio DSP capabilities. mapMimeToAudioFormat() should use the

    // metadata to refine the AAC format and the audio HAL should only list supported profiles.

    int32_t aacaot = -1;

    if (meta->findInt32(kKeyAACAOT, &aacaot)) {

        if (aacaot == 23 || aacaot == 39 ) {

            ALOGV("track of type '%s' is ELD/LD content", mime);

            return false;

        }

    }



    int32_t srate = -1;

    if (!meta->findInt32(kKeySampleRate, &srate)) {

        ALOGV("track of type '%s' does not publish sample rate", mime);