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

Commit 456fa912 authored by Chong Zhang's avatar Chong Zhang
Browse files

fix delay when shutting down wifi display 

RepeaterSource needs to stop SurfaceMediaSource before stopping
its looper, otherwise the stop could get queued behind the last
read(), which will not return until a new frame comes.

Change SurfaceMediaSource stop to signal frame avalable first, so
that its read() returns EOS to reader upon stop.

Bug: 11677087
Change-Id: Ie331cc8c7f4824fd3930f3e909b53db4463902fb
parent 7ca6e73b

media/libstagefright/SurfaceMediaSource.cpp

+3 −2
Original line number Diff line number Diff line
@@ -202,6 +202,9 @@ status_t SurfaceMediaSource::stop() 
        return OK;

    }



    mStarted = false;

    mFrameAvailableCondition.signal();



    while (mNumPendingBuffers > 0) {

        ALOGI("Still waiting for %d buffers to be returned.",

                mNumPendingBuffers);
@@ -215,8 +218,6 @@ status_t SurfaceMediaSource::stop() 
        mMediaBuffersAvailableCondition.wait(mMutex);

    }



    mStarted = false;

    mFrameAvailableCondition.signal();

    mMediaBuffersAvailableCondition.signal();



    return mBufferQueue->consumerDisconnect();

media/libstagefright/wifi-display/source/RepeaterSource.cpp

+2 −1
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ status_t RepeaterSource::stop() { 


    ALOGV("stopping");



    status_t err = mSource->stop();



    if (mLooper != NULL) {

        mLooper->stop();

        mLooper.clear();
@@ -92,7 +94,6 @@ status_t RepeaterSource::stop() { 
        mBuffer = NULL;

    }



    status_t err = mSource->stop();



    ALOGV("stopped");