Merge "libstagefright: Don't set a global ERROR state for same-state changes" into gingerbread (30e78650) · Commits · e / os / android_frameworks_base

media/libstagefright/OMXCodec.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -1981,6 +1981,10 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) {

		case OMX_EventError:
		{
		if (data1 && (OMX_S32)data1 == OMX_ErrorSameState) {
		/* Don't raise fatal errors for samestate changes */
		break;
		}
		CODEC_LOGE("ERROR(0x%08lx, %ld)", data1, data2);

		setState(ERROR);