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

Commit ba812e3b authored by Andy McFadden's avatar Andy McFadden
Browse files

Don't abort on unusual state transition 

The state transition check was too strict, and we were crashing
mediaserver inappropriately.

Bug 9819944

Change-Id: I1482ed1cfee37088d4893ee81cf1b2b950d2e930
parent 288abb6f

media/libstagefright/omx/GraphicBufferSource.cpp

+5 −3
Original line number Diff line number Diff line
@@ -130,10 +130,12 @@ void GraphicBufferSource::omxExecuting() { 


void GraphicBufferSource::omxLoaded(){

    Mutex::Autolock autoLock(mMutex);

    ALOGV("--> loaded");

    CHECK(mExecuting);

    if (!mExecuting) {

        // This can happen if something failed very early.

        ALOGW("Dropped back down to Loaded without Executing");

    }



    ALOGV("Dropped down to loaded, avail=%d eos=%d eosSent=%d",

    ALOGV("--> loaded; avail=%d eos=%d eosSent=%d",

            mNumFramesAvailable, mEndOfStream, mEndOfStreamSent);



    // Codec is no longer executing.  Discard all codec-related state.