diff options
| author | Chong Zhang <chz@google.com> | 2014-11-26 02:17:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-26 02:17:16 +0000 |
| commit | 5d2c5fcb5cbd262b6a238886a7ce43add03eee20 (patch) | |
| tree | 0e4a31ccb807b5f06663e022de92c406b9c2bd20 /media | |
| parent | 087eb332cdd64026de27c914194127f8fda1a846 (diff) | |
| parent | d9e0603a1be07dbb347c55050c7d4629ea7492e8 (diff) | |
| download | frameworks_av-5d2c5fcb5cbd262b6a238886a7ce43add03eee20.zip frameworks_av-5d2c5fcb5cbd262b6a238886a7ce43add03eee20.tar.gz frameworks_av-5d2c5fcb5cbd262b6a238886a7ce43add03eee20.tar.bz2 | |
Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-mr1-dev
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; |