diff options
| author | Andreas Huber <andih@google.com> | 2012-11-29 14:08:24 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-29 14:08:25 -0800 |
| commit | db2919e9b87226a883f01e7b399419c9bf43800c (patch) | |
| tree | c4302b6cc8c717e8e329fee40839bba316aa4716 /media | |
| parent | c67d057596d81aea8fcd4868453cfcb501157297 (diff) | |
| parent | f6f38287b97ec69b169387add6458f859b770e65 (diff) | |
| download | frameworks_av-db2919e9b87226a883f01e7b399419c9bf43800c.zip frameworks_av-db2919e9b87226a883f01e7b399419c9bf43800c.tar.gz frameworks_av-db2919e9b87226a883f01e7b399419c9bf43800c.tar.bz2 | |
Merge "Clear the sticky EOS flags when transitioning to LOADED state"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index a135222..8f3dc6c 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -3106,11 +3106,6 @@ bool ACodec::UninitializedState::onAllocateComponent(const sp<AMessage> &msg) { mCodec->mOMX = omx; mCodec->mNode = node; - mCodec->mPortEOS[kPortIndexInput] = - mCodec->mPortEOS[kPortIndexOutput] = false; - - mCodec->mInputEOSResult = OK; - { sp<AMessage> notify = mCodec->mNotify->dup(); notify->setInt32("what", ACodec::kWhatComponentAllocated); @@ -3132,6 +3127,11 @@ ACodec::LoadedState::LoadedState(ACodec *codec) void ACodec::LoadedState::stateEntered() { ALOGV("[%s] Now Loaded", mCodec->mComponentName.c_str()); + mCodec->mPortEOS[kPortIndexInput] = + mCodec->mPortEOS[kPortIndexOutput] = false; + + mCodec->mInputEOSResult = OK; + if (mCodec->mShutdownInProgress) { bool keepComponentAllocated = mCodec->mKeepComponentAllocated; |