An attempt to fix a deadlock between OMXCodec::start and upstream ::read (284f513a) · Commits · e / os / android_frameworks_av

include/media/stagefright/OMXCodec.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ private:
		State mState;
		Vector<BufferInfo> mPortBuffers[2];
		PortStatus mPortStatus[2];
		bool mInitialBufferSubmit;
		bool mSignalledEOS;
		bool mNoMoreOutputData;
		int64_t mSeekTimeUs;

+17 −3

Original line number	Diff line number	Diff line
		@@ -634,6 +634,7 @@ OMXCodec::OMXCodec(
		mSource(source),
		mCodecSpecificDataIndex(0),
		mState(LOADED),
		mInitialBufferSubmit(true),
		mSignalledEOS(false),
		mNoMoreOutputData(false),
		mSeekTimeUs(-1) {
		@@ -666,7 +667,7 @@ OMXCodec::~OMXCodec() {
		}

		status_t OMXCodec::init() {
		Mutex::Autolock autoLock(mLock);
		// mLock is held.

		CHECK_EQ(mState, LOADED);

		@@ -1107,8 +1108,11 @@ void OMXCodec::onStateChange(OMX_STATETYPE newState) {

		setState(EXECUTING);

		drainInputBuffers();
		fillOutputBuffers();
		// Buffers will be submitted to the component in the first
		// call to OMXCodec::read as mInitialBufferSubmit is true at
		// this point. This ensures that this on_message call returns,
		// releases the lock and ::init can notice the state change and
		// itself return.
		break;
		}

		@@ -1603,6 +1607,8 @@ void OMXCodec::clearCodecSpecificData() {
		}

		status_t OMXCodec::start(MetaData *) {
		Mutex::Autolock autoLock(mLock);

		if (mState != LOADED) {
		return UNKNOWN_ERROR;
		}
		@@ -1618,6 +1624,7 @@ status_t OMXCodec::start(MetaData *) {
		}

		mCodecSpecificDataIndex = 0;
		mInitialBufferSubmit = true;
		mSignalledEOS = false;
		mNoMoreOutputData = false;
		mSeekTimeUs = -1;
		@@ -1699,6 +1706,13 @@ status_t OMXCodec::read(

		Mutex::Autolock autoLock(mLock);

		if (mInitialBufferSubmit) {
		mInitialBufferSubmit = false;

		drainInputBuffers();
		fillOutputBuffers();
		}

		if (mState != EXECUTING && mState != RECONFIGURING) {
		return UNKNOWN_ERROR;
		}