Force shutdown of the omx decoder even if it's in a wedged state... (40fe18f2) · Commits · e / os / android_frameworks_av

media/libstagefright/OMXCodec.cpp

+31 −7

Original line number	Diff line number	Diff line
		@@ -2475,7 +2475,12 @@ void OMXCodec::onCmdComplete(OMX_COMMANDTYPE cmd, OMX_U32 data) {
		} else {
		err = allocateBuffersOnPort(portIndex);
		if (err != OK) {
		CODEC_LOGE("allocateBuffersOnPort failed (err = %d)", err);
		CODEC_LOGE("allocateBuffersOnPort (%s) failed "
		"(err = %d)",
		portIndex == kPortIndexInput
		? "input" : "output",
		err);

		setState(ERROR);
		}
		}
		@@ -3658,6 +3663,23 @@ status_t OMXCodec::stop() {

		case ERROR:
		{
		if (mPortStatus[kPortIndexOutput] == ENABLING) {
		// Codec is in a wedged state (technical term)
		// We've seen an output port settings change from the codec,
		// We've disabled the output port, then freed the output
		// buffers, initiated re-enabling the output port but
		// failed to reallocate the output buffers.
		// There doesn't seem to be a way to orderly transition
		// from executing->idle and idle->loaded now that the
		// output port hasn't been reenabled yet...
		// Simply free as many resources as we can and pretend
		// that we're in LOADED state so that the destructor
		// will free the component instance without asserting.
		freeBuffersOnPort(kPortIndexInput, true /* onlyThoseWeOwn */);
		freeBuffersOnPort(kPortIndexOutput, true /* onlyThoseWeOwn */);
		setState(LOADED);
		break;
		} else {
		OMX_STATETYPE state = OMX_StateInvalid;
		status_t err = mOMX->getState(mNode, &state);
		CHECK_EQ(err, (status_t)OK);
		@@ -3666,6 +3688,8 @@ status_t OMXCodec::stop() {
		break;
		}
		// else fall through to the idling code
		}

		isError = true;
		}