diff options
| author | Wei Jia <wjia@google.com> | 2014-08-30 02:04:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-30 02:04:48 +0000 |
| commit | c9d62de72b67f069a517f24c13ff9c4e4593f76a (patch) | |
| tree | 85432f840a5421629b8b19c55709b2ca7c9ea507 /media/libstagefright | |
| parent | b6b927fc437389a9fa499eaad69da88969ec9ffc (diff) | |
| parent | c22c695660ed9edaba0d4cd7c0ab3a794216fe80 (diff) | |
| download | frameworks_av-c9d62de72b67f069a517f24c13ff9c4e4593f76a.zip frameworks_av-c9d62de72b67f069a517f24c13ff9c4e4593f76a.tar.gz frameworks_av-c9d62de72b67f069a517f24c13ff9c4e4593f76a.tar.bz2 | |
Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." into lmp-dev
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index 76f730f..fc2dd30 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -733,13 +733,15 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { case CONFIGURING: { - setState(INITIALIZED); + setState(actionCode == ACTION_CODE_FATAL ? + UNINITIALIZED : INITIALIZED); break; } case STARTING: { - setState(CONFIGURED); + setState(actionCode == ACTION_CODE_FATAL ? + UNINITIALIZED : CONFIGURED); break; } |