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

Commit ceabf0ac authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Ensure proper EOS behavior"

parents e6b94a33 4c44e9fe

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp

+6 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { 
        OMX_BUFFERHEADERTYPE *outHeader =

            port->mBuffers.editItemAt(mNumSamplesOutput & 1).mHeader;



        if (inHeader->nFlags & OMX_BUFFERFLAG_EOS) {

        if ((inHeader->nFlags & OMX_BUFFERFLAG_EOS) && inHeader->nFilledLen == 0) {

            inQueue.erase(inQueue.begin());

            inInfo->mOwnedByUs = false;

            notifyEmptyBufferDone(inHeader);
@@ -445,6 +445,11 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { 


        inHeader->nOffset += bufferSize;

        inHeader->nFilledLen = 0;

        if (inHeader->nFlags & OMX_BUFFERFLAG_EOS) {

            outHeader->nFlags = OMX_BUFFERFLAG_EOS;

        } else {

            outHeader->nFlags = 0;

        }



        if (inHeader->nFilledLen == 0) {

            inInfo->mOwnedByUs = false;
@@ -458,7 +463,6 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { 


        outHeader->nOffset = 0;

        outHeader->nFilledLen = (mWidth * mHeight * 3) / 2;

        outHeader->nFlags = 0;



        List<BufferInfo *>::iterator it = outQueue.begin();

        while ((*it)->mHeader != outHeader) {

media/libstagefright/codecs/on2/h264dec/SoftAVC.cpp

+3 −7
Original line number Diff line number Diff line
@@ -311,18 +311,14 @@ void SoftAVC::onQueueFilled(OMX_U32 portIndex) { 
        BufferInfo *inInfo = *inQueue.begin();

        OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;

        ++mPicId;

        if (inHeader->nFlags & OMX_BUFFERFLAG_EOS) {

            inQueue.erase(inQueue.begin());

            inInfo->mOwnedByUs = false;

            notifyEmptyBufferDone(inHeader);

            mEOSStatus = INPUT_EOS_SEEN;

            continue;

        }



        OMX_BUFFERHEADERTYPE *header = new OMX_BUFFERHEADERTYPE;

        memset(header, 0, sizeof(OMX_BUFFERHEADERTYPE));

        header->nTimeStamp = inHeader->nTimeStamp;

        header->nFlags = inHeader->nFlags;

        if (header->nFlags & OMX_BUFFERFLAG_EOS) {

            mEOSStatus = INPUT_EOS_SEEN;

        }

        mPicToHeaderMap.add(mPicId, header);

        inQueue.erase(inQueue.begin());