diff options
| author | Marco Nelissen <marcone@google.com> | 2013-04-12 17:20:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-12 17:20:51 +0000 |
| commit | 91b4e0d2b2dc0d3eeee375d51f48ff8cc243f6ca (patch) | |
| tree | 02d1a7cdcbbe372468b0b4e69efb9dfdfc9f7d7d /media/libstagefright/ACodec.cpp | |
| parent | 99076b990cfc6514b7de3a4809b3b3ff3d76e43d (diff) | |
| parent | b3ac921cae96686ec0902796bb8f8ef99ae08abd (diff) | |
| download | frameworks_av-91b4e0d2b2dc0d3eeee375d51f48ff8cc243f6ca.zip frameworks_av-91b4e0d2b2dc0d3eeee375d51f48ff8cc243f6ca.tar.gz frameworks_av-91b4e0d2b2dc0d3eeee375d51f48ff8cc243f6ca.tar.bz2 | |
Merge "Fix MediaCodec.flush()" into jb-mr2-dev
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 6490608..ee49033 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -3659,7 +3659,6 @@ bool ACodec::ExecutingState::onMessageReceived(const sp<AMessage> &msg) { (status_t)OK); mCodec->changeState(mCodec->mFlushingState); - handled = true; break; } @@ -4174,6 +4173,10 @@ void ACodec::FlushingState::changeStateIfWeOwnAllBuffers() { mCodec->mInputEOSResult = OK; + if (mCodec->mSkipCutBuffer != NULL) { + mCodec->mSkipCutBuffer->clear(); + } + mCodec->changeState(mCodec->mExecutingState); } } |