diff options
| author | Wei Jia <wjia@google.com> | 2014-09-02 17:34:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-02 17:34:15 +0000 |
| commit | d299f92796f30d249f08f8bf3bcfe289bc9d3627 (patch) | |
| tree | 3e1574131113224a965dc15ba98e5a9d7a8135e3 /media/libstagefright/MediaCodec.cpp | |
| parent | d2503caa1e7d7c362f05424838dbac479a5c84e5 (diff) | |
| parent | f910a3dfeb3fb58c297a37757e28150462fe1e9e (diff) | |
| download | frameworks_av-d299f92796f30d249f08f8bf3bcfe289bc9d3627.zip frameworks_av-d299f92796f30d249f08f8bf3bcfe289bc9d3627.tar.gz frameworks_av-d299f92796f30d249f08f8bf3bcfe289bc9d3627.tar.bz2 | |
am f910a3df: am c9d62de7: Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." into lmp-dev
* commit 'f910a3dfeb3fb58c297a37757e28150462fe1e9e':
MediaCodec: set state to UNINITIALIZED when receiving fatal error.
Diffstat (limited to 'media/libstagefright/MediaCodec.cpp')
| -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 91aa9ab..d5ec412 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -743,13 +743,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; } |