diff options
| author | Wei Jia <wjia@google.com> | 2014-08-23 01:49:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-23 01:49:27 +0000 |
| commit | 848726d845b51da04364bdaf4ec915c85d593c0e (patch) | |
| tree | c85e5055ac17b756d7afa59ce43fb6664261b3f5 | |
| parent | 052efa490b595d17d1452ec019979996fe470a05 (diff) | |
| parent | 5530f7a7f9dff5280be84f2675b3be081beb5540 (diff) | |
| download | frameworks_av-848726d845b51da04364bdaf4ec915c85d593c0e.zip frameworks_av-848726d845b51da04364bdaf4ec915c85d593c0e.tar.gz frameworks_av-848726d845b51da04364bdaf4ec915c85d593c0e.tar.bz2 | |
Merge "MediaCodec: handle errors during flushing." into lmp-dev
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index 814adab..76f730f 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -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); |