diff options
| author | Lajos Molnar <lajos@google.com> | 2014-04-01 18:41:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-01 18:41:59 +0000 |
| commit | 118e7ff24af2e470ffed2bf7b37c9afa69afee92 (patch) | |
| tree | a9d4444c4003557e34ed5150cca36cacd3fe96a3 | |
| parent | 2ade30003882f0c3782d68018d06cb81b99dfeb2 (diff) | |
| parent | ec5f7cc4756d389505e761b9d803a1a3a46b64d7 (diff) | |
| download | frameworks_av-118e7ff24af2e470ffed2bf7b37c9afa69afee92.zip frameworks_av-118e7ff24af2e470ffed2bf7b37c9afa69afee92.tar.gz frameworks_av-118e7ff24af2e470ffed2bf7b37c9afa69afee92.tar.bz2 | |
Merge "MediaCodec: move to UNINITIALIZED state on codec error"
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index e0419ca..601dccf 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -603,6 +603,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { postActivityNotificationIfPossible(); cancelPendingDequeueOperations(); + setState(UNINITIALIZED); break; } @@ -612,6 +613,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { mFlags |= kFlagStickyError; postActivityNotificationIfPossible(); + setState(UNINITIALIZED); break; } } |