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

Commit 2cf312c2 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "fix delay when shutting down wifi display"

parents 1d6fa7af 456fa912

media/libstagefright/SurfaceMediaSource.cpp

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

        return OK;

    }

    }





    mStarted = false;

    mFrameAvailableCondition.signal();



    while (mNumPendingBuffers > 0) {

    while (mNumPendingBuffers > 0) {

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

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

                mNumPendingBuffers);

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

        mMediaBuffersAvailableCondition.wait(mMutex);

    }

    }





    mStarted = false;

    mFrameAvailableCondition.signal();

    mMediaBuffersAvailableCondition.signal();

    mMediaBuffersAvailableCondition.signal();





    return mBufferQueue->consumerDisconnect();

    return mBufferQueue->consumerDisconnect();

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

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




    ALOGV("stopping");

    ALOGV("stopping");





    status_t err = mSource->stop();



    if (mLooper != NULL) {

    if (mLooper != NULL) {

        mLooper->stop();

        mLooper->stop();

        mLooper.clear();

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

        mBuffer = NULL;

    }

    }





    status_t err = mSource->stop();





    ALOGV("stopped");

    ALOGV("stopped");