Merge "fix delay when shutting down wifi display" (2cf312c2) · Commits · e / os / android_frameworks_av

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();

+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");