diff options
| author | Chong Zhang <chz@google.com> | 2014-11-26 19:57:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 19:57:33 +0000 |
| commit | 67d93552f0fca5a2ac6a451569cc1b1e15cd138a (patch) | |
| tree | bc6cae1b1664e7ed538c1ead29b0a0c92e749f07 /media/libstagefright/MediaCodec.cpp | |
| parent | 059c8b62e037452ff806a0b15d693c86936d87ef (diff) | |
| parent | b438123fb1ee0a8c232fd66de658d5382d2083cf (diff) | |
| download | frameworks_av-67d93552f0fca5a2ac6a451569cc1b1e15cd138a.zip frameworks_av-67d93552f0fca5a2ac6a451569cc1b1e15cd138a.tar.gz frameworks_av-67d93552f0fca5a2ac6a451569cc1b1e15cd138a.tar.bz2 | |
am b438123f: am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-mr1-dev
* commit 'b438123fb1ee0a8c232fd66de658d5382d2083cf':
MediaCodec: resume codec if state is FLUSHED in async mode
Diffstat (limited to 'media/libstagefright/MediaCodec.cpp')
| -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 3622eb7..93b6f75 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1336,8 +1336,10 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { CHECK(msg->senderAwaitsResponse(&replyID)); if (mState == FLUSHED) { + setState(STARTED); mCodec->signalResume(); PostReplyWithError(replyID, OK); + break; } else if (mState != CONFIGURED) { PostReplyWithError(replyID, INVALID_OPERATION); break; |