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

Commit 1e47cb09 authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

Merge "stagefright: Document that MPEG4Writer does not support muxing out of... 

Merge "stagefright: Document that MPEG4Writer does not support muxing out of order frames." into nyc-dev
parents 601b5a5f f85a83af

media/libstagefright/MPEG4Writer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2550,8 +2550,8 @@ status_t MPEG4Writer::Track::threadEntry() { 
            ((timestampUs * mTimeScale + 500000LL) / 1000000LL -

                (lastTimestampUs * mTimeScale + 500000LL) / 1000000LL);

        if (currDurationTicks < 0ll) {

            ALOGE("timestampUs %" PRId64 " < lastTimestampUs %" PRId64 " for %s track",

                timestampUs, lastTimestampUs, trackName);

            ALOGE("do not support out of order frames (timestamp: %lld < last: %lld for %s track",

                    (long long)timestampUs, (long long)lastTimestampUs, trackName);

            copy->release();

            mSource->stop();

            return UNKNOWN_ERROR;