diff options
| author | Chong Zhang <chz@google.com> | 2014-11-26 18:42:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 18:42:45 +0000 |
| commit | b438123fb1ee0a8c232fd66de658d5382d2083cf (patch) | |
| tree | 4c602627c059d51395376975490d1a6696363e6f /media | |
| parent | 51a7a41514622e68998b4f77022f8a93af530588 (diff) | |
| parent | 9574c274bf03900b56628b0c923d40f03cb30562 (diff) | |
| download | frameworks_av-b438123fb1ee0a8c232fd66de658d5382d2083cf.zip frameworks_av-b438123fb1ee0a8c232fd66de658d5382d2083cf.tar.gz frameworks_av-b438123fb1ee0a8c232fd66de658d5382d2083cf.tar.bz2 | |
am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-mr1-dev
* commit '9574c274bf03900b56628b0c923d40f03cb30562':
MediaCodec: resume codec if state is FLUSHED in async mode
Diffstat (limited to 'media')
| -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 11069e4..e1c8a41 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1326,8 +1326,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; |