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

Commit 29060718 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add AudioPresentation Support in MPEG4 Extractor" am: 33bbd02f am:... 

Merge "Add AudioPresentation Support in MPEG4 Extractor" am: 33bbd02f am: 333af87e am: 3f68c2cb am: e13adc76 am: cc419fa7

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



Change-Id: Ic8b321360458464249043ba35ca5c365f0d41465
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7bcde082 cc419fa7

media/module/extractors/mp4/MPEG4Extractor.cpp

+10 −0
Original line number Original line Diff line number Diff line
@@ -6500,6 +6500,16 @@ media_status_t MPEG4Source::read( 
            AMediaFormat_setInt32(meta, AMEDIAFORMAT_KEY_IS_SYNC_FRAME, 1);

            AMediaFormat_setInt32(meta, AMEDIAFORMAT_KEY_IS_SYNC_FRAME, 1);

        }

        }





        void *presentationsData;

        size_t presentationsSize;

        if (AMediaFormat_getBuffer(

                    mFormat, AMEDIAFORMAT_KEY_AUDIO_PRESENTATION_INFO,

                    &presentationsData, &presentationsSize)) {

            AMediaFormat_setBuffer(

                    meta, AMEDIAFORMAT_KEY_AUDIO_PRESENTATION_INFO,

                    presentationsData, presentationsSize);

        }



        ++mCurrentSampleIndex;

        ++mCurrentSampleIndex;





        *out = mBuffer;

        *out = mBuffer;