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

Commit 07bf5b82 authored by Marco Nelissen's avatar Marco Nelissen Committed by Automerger Merge Worker
Browse files

Merge "Fix USAC seeking" into rvc-dev am: ae87d21c 

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

Change-Id: I1022561fea4b8d662d4086e62a2f8136f0487967
parents f35533e9 ae87d21c

media/extractors/mp4/MPEG4Extractor.cpp

+11 −4
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ private: 


    bool mIsHeif;

    bool mIsAudio;

    bool mIsUsac = false;

    sp<ItemTable> mItemTable;



    /* Shift start offset (move to earlier time) when media_time > 0,
@@ -4476,7 +4477,7 @@ typedef enum { 
    //AOT_SLS              = 38, /**< SLS                                       */

    //AOT_ER_AAC_ELD       = 39, /**< AAC Enhanced Low Delay                    */



    //AOT_USAC             = 42, /**< USAC                                      */

    AOT_USAC               = 42, /**< USAC                                      */

    //AOT_SAOC             = 43, /**< SAOC                                      */

    //AOT_LD_MPEGS         = 44, /**< Low Delay MPEG Surround                   */
@@ -4624,7 +4625,7 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio( 
    ABitReader br(csd, csd_size);

    uint32_t objectType = br.getBits(5);



    if (objectType == 31) {  // AAC-ELD => additional 6 bits

    if (objectType == AOT_ESCAPE) {  // AAC-ELD => additional 6 bits

        objectType = 32 + br.getBits(6);

    }
@@ -5000,6 +5001,12 @@ MPEG4Source::MPEG4Source( 
    mIsPcm = !strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_RAW);

    mIsAudio = !strncasecmp(mime, "audio/", 6);



    int32_t aacObjectType = -1;



    if (AMediaFormat_getInt32(format, AMEDIAFORMAT_KEY_AAC_PROFILE, &aacObjectType)) {

        mIsUsac = (aacObjectType == AOT_USAC);

    }



    if (mIsPcm) {

        int32_t numChannels = 0;

        int32_t bitsPerSample = 0;
@@ -5993,10 +6000,10 @@ media_status_t MPEG4Source::read( 
            }



            uint32_t syncSampleIndex = sampleIndex;

            // assume every audio sample is a sync sample. This works around

            // assume every non-USAC audio sample is a sync sample. This works around

            // seek issues with files that were incorrectly written with an

            // empty or single-sample stss block for the audio track

            if (err == OK && !mIsAudio) {

            if (err == OK && (!mIsAudio || mIsUsac)) {

                err = mSampleTable->findSyncSampleNear(

                        sampleIndex, &syncSampleIndex, findFlags);

            }