Merge "Log which OMX component is not returning all buffers to us on executing->idle." into jb-dev (6d0780ae) · Commits · e / os / android_frameworks_av

media/libstagefright/OMXCodec.cpp

+16 −6

Original line number	Diff line number	Diff line
		@@ -2588,13 +2588,23 @@ void OMXCodec::onStateChange(OMX_STATETYPE newState) {
		} else {
		CHECK_EQ((int)mState, (int)EXECUTING_TO_IDLE);

		CHECK_EQ(
		if (countBuffersWeOwn(mPortBuffers[kPortIndexInput]) !=
		mPortBuffers[kPortIndexInput].size()) {
		ALOGE("Codec did not return all input buffers "
		"(received %d / %d)",
		countBuffersWeOwn(mPortBuffers[kPortIndexInput]),
		mPortBuffers[kPortIndexInput].size());
		TRESPASS();
		}

		CHECK_EQ(
		if (countBuffersWeOwn(mPortBuffers[kPortIndexOutput]) !=
		mPortBuffers[kPortIndexOutput].size()) {
		ALOGE("Codec did not return all output buffers "
		"(received %d / %d)",
		countBuffersWeOwn(mPortBuffers[kPortIndexOutput]),
		mPortBuffers[kPortIndexOutput].size());
		TRESPASS();
		}

		status_t err = mOMX->sendCommand(
		mNode, OMX_CommandStateSet, OMX_StateLoaded);