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

Commit 073dec19 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 22990fe1: Merge "Back to the old way of making sure that no more buffers... 

am 22990fe1: Merge "Back to the old way of making sure that no more buffers are submitted" into klp-dev

* commit '22990fe1':
  Back to the old way of making sure that no more buffers are submitted
parents 5c2379fd 22990fe1

media/libstagefright/omx/GraphicBufferSource.cpp

+4 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void GraphicBufferSource::omxIdle() { 
    if (mExecuting) {

        // We are only interested in the transition from executing->idle,

        // not loaded->idle.

        mEndOfStream = mEndOfStreamSent = true;

        mExecuting = false;

    }

}
@@ -206,7 +206,9 @@ void GraphicBufferSource::addCodecBuffer(OMX_BUFFERHEADERTYPE* header) { 
void GraphicBufferSource::codecBufferEmptied(OMX_BUFFERHEADERTYPE* header) {

    Mutex::Autolock autoLock(mMutex);



    CHECK(mExecuting);  // could this happen if app stop()s early?

    if (!mExecuting) {

        return;

    }



    int cbi = findMatchingCodecBuffer_l(header);

    if (cbi < 0) {