Merge "MediaCodec: handle errors during flushing." into lmp-dev (848726d8) · Commits · e / os / android_frameworks_av

media/libstagefright/MediaCodec.cpp

+10 −6

Original line number	Diff line number	Diff line
		@@ -722,7 +722,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
		mFlags \|= kFlagSawMediaServerDie;
		}

		bool sendErrorReponse = true;
		bool sendErrorResponse = true;

		switch (mState) {
		case INITIALIZING:
		@@ -749,7 +749,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
		// Ignore the error, assuming we'll still get
		// the shutdown complete notification.

		sendErrorReponse = false;
		sendErrorResponse = false;

		if (mFlags & kFlagSawMediaServerDie) {
		// MediaServer died, there definitely won't
		@@ -780,7 +780,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
		case FLUSHED:
		case STARTED:
		{
		sendErrorReponse = false;
		sendErrorResponse = false;

		setStickyError(err);
		postActivityNotificationIfPossible();
		@@ -805,7 +805,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {

		default:
		{
		sendErrorReponse = false;
		sendErrorResponse = false;

		setStickyError(err);
		postActivityNotificationIfPossible();
		@@ -831,7 +831,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
		}
		}

		if (sendErrorReponse) {
		if (sendErrorResponse) {
		PostReplyWithError(mReplyID, err);
		}
		break;
		@@ -1118,7 +1118,11 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {

		case CodecBase::kWhatFlushCompleted:
		{
		CHECK_EQ(mState, FLUSHING);
		if (mState != FLUSHING) {
		ALOGW("received FlushCompleted message in state %d",
		mState);
		break;
		}

		if (mFlags & kFlagIsAsync) {
		setState(FLUSHED);