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

Commit 25dc5f30 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Don't coalesce more than 250ms worth of encoded data into a single... 

Merge "Don't coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo
parents 8ccbd4ba 2dd8ff8c

media/libstagefright/OMXCodec.cpp

+12 −2
Original line number Diff line number Diff line
@@ -2004,9 +2004,12 @@ void OMXCodec::drainInputBuffer(BufferInfo *info) { 
               (const uint8_t *)srcBuffer->data() + srcBuffer->range_offset(),

               srcBuffer->range_length());



        if (offset == 0) {

            CHECK(srcBuffer->meta_data()->findInt64(kKeyTime, &timestampUs));

        int64_t lastBufferTimeUs;

        CHECK(srcBuffer->meta_data()->findInt64(kKeyTime, &lastBufferTimeUs));

        CHECK(timestampUs >= 0);



        if (offset == 0) {

            timestampUs = lastBufferTimeUs;

        }



        offset += srcBuffer->range_length();
@@ -2019,6 +2022,13 @@ void OMXCodec::drainInputBuffer(BufferInfo *info) { 
        if (!(mQuirks & kSupportsMultipleFramesPerInputBuffer)) {

            break;

        }



        int64_t coalescedDurationUs = lastBufferTimeUs - timestampUs;



        if (coalescedDurationUs > 250000ll) {

            // Don't coalesce more than 250ms worth of encoded data at once.

            break;

        }

    }



    if (n > 1) {