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

Commit d260bad4 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Ignore edit list if values don't make sense 

Some applications apparently put bogus values in the edit list,
causing some files to not play correctly.
Ignore the edit list if the values don't make sense.

Bug: 80513071
Test: manual
Change-Id: I6035fbe8174ec462a5bdf42088682a2bb9dd814b
parent 34affaed

media/extractors/mp4/MPEG4Extractor.cpp

+9 −2
Original line number Diff line number Diff line
@@ -467,8 +467,15 @@ status_t MPEG4Extractor::getTrackMetaData( 
            if (__builtin_mul_overflow(media_time, samplerate, &delay) ||

                    __builtin_add_overflow(delay, halfscale, &delay) ||

                    (delay /= mHeaderTimescale, false) ||

                    delay > INT32_MAX ||

                    delay < INT32_MIN) {

                    /* the calculated delay should be small, but some apps

                     * appear to write a bogus edit list that causes a really

                     * large delay, resulting in playback problems.

                     * Ignore such edit lists.

                     * (4096 is enough to drop 4 full samples)

                     */

                    delay > 4096 ||

                    delay < 0) {

                ALOGW("ignoring edit list with bogus values");

                return;

            }

            ALOGV("delay = %" PRId64, delay);