summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-11-25 17:14:00 -0800
committerChong Zhang <chz@google.com>2014-11-26 01:48:56 +0000
commitd9e0603a1be07dbb347c55050c7d4629ea7492e8 (patch)
treea0f6d8ec6e5f7d22beb3d13516f05f7f18286ce9 /media
parentbc0f452b9a76dd8c8244e775bc9c5aa85cae3ddf (diff)
downloadframeworks_av-d9e0603a1be07dbb347c55050c7d4629ea7492e8.zip
frameworks_av-d9e0603a1be07dbb347c55050c7d4629ea7492e8.tar.gz
frameworks_av-d9e0603a1be07dbb347c55050c7d4629ea7492e8.tar.bz2
MediaCodec: resume codec if state is FLUSHED in async mode
bug: 18513091 Change-Id: I192625c61834584f711de76db788c2c0332ae774
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/MediaCodec.cpp2
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;