Merge "MediaCodec: move to UNINITIALIZED state on codec error" (118e7ff2) · Commits · e / os / android_frameworks_av

media/libstagefright/MediaCodec.cpp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -603,6 +603,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
	postActivityNotificationIfPossible();		postActivityNotificationIfPossible();

	cancelPendingDequeueOperations();		cancelPendingDequeueOperations();
			setState(UNINITIALIZED);
	break;		break;
	}		}

	@@ -612,6 +613,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {

	mFlags \|= kFlagStickyError;		mFlags \|= kFlagStickyError;
	postActivityNotificationIfPossible();		postActivityNotificationIfPossible();
			setState(UNINITIALIZED);
	break;		break;
	}		}
	}		}