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

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

Merge "Workaround for some hardware decoders not properly signaling end-of-output-stream properly."

parents 3c5f6dde dbcb2c68

media/libstagefright/OMXCodec.cpp

+17 −0
Original line number Diff line number Diff line
@@ -1786,6 +1786,21 @@ void OMXCodec::enablePortAsync(OMX_U32 portIndex) { 
void OMXCodec::fillOutputBuffers() {

    CHECK_EQ(mState, EXECUTING);



    // This is a workaround for some decoders not properly reporting

    // end-of-output-stream. If we own all input buffers and also own

    // all output buffers and we already signalled end-of-input-stream,

    // the end-of-output-stream is implied.

    if (mSignalledEOS

            && countBuffersWeOwn(mPortBuffers[kPortIndexInput])

                == mPortBuffers[kPortIndexInput].size()

            && countBuffersWeOwn(mPortBuffers[kPortIndexOutput])

                == mPortBuffers[kPortIndexOutput].size()) {

        mNoMoreOutputData = true;

        mBufferFilled.signal();



        return;

    }



    Vector<BufferInfo> *buffers = &mPortBuffers[kPortIndexOutput];

    for (size_t i = 0; i < buffers->size(); ++i) {

        fillOutputBuffer(&buffers->editItemAt(i));
@@ -1833,6 +1848,8 @@ void OMXCodec::drainInputBuffer(BufferInfo *info) { 


        mNoMoreOutputData = false;



        CODEC_LOGV("calling emptyBuffer with codec specific data");



        status_t err = mOMX->emptyBuffer(

                mNode, info->mBuffer, 0, size,

                OMX_BUFFERFLAG_ENDOFFRAME | OMX_BUFFERFLAG_CODECCONFIG,