diff options
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 6 | 
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index e5b7202..b576cd9 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1160,6 +1160,12 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {                  case CodecBase::kWhatComponentConfigured:                  { +                    if (mState == UNINITIALIZED || mState == INITIALIZED) { +                        // In case a kWhatError message came in and replied with error, +                        // we log a warning and ignore. +                        ALOGW("configure interrupted by error, current state %d", mState); +                        break; +                    }                      CHECK_EQ(mState, CONFIGURING);                      // reset input surface flag  | 
