diff options
author | Lajos Molnar <lajos@google.com> | 2013-09-12 16:45:01 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-12 16:45:01 -0700 |
commit | fc94bcfa39edcae9528a8e47a36a01626137841a (patch) | |
tree | 60d9778bc88cb9ae12178bfa8bc680a683334f2b /media | |
parent | f523897787b64cf2217d0ab4946b564420c675fe (diff) | |
parent | 49d62d66a1578da3a2115ab9f5f128f8916659e4 (diff) | |
download | frameworks_av-fc94bcfa39edcae9528a8e47a36a01626137841a.zip frameworks_av-fc94bcfa39edcae9528a8e47a36a01626137841a.tar.gz frameworks_av-fc94bcfa39edcae9528a8e47a36a01626137841a.tar.bz2 |
am 49d62d66: am 877c673c: Merge "ACodec: fix flush/resume for decoder-output-meta-data mode" into klp-dev
* commit '49d62d66a1578da3a2115ab9f5f128f8916659e4':
ACodec: fix flush/resume for decoder-output-meta-data mode
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/ACodec.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 2e55c4f..5c3abd0 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -2366,6 +2366,10 @@ void ACodec::waitUntilAllPossibleNativeWindowBuffersAreReturnedToUs() { while (countBuffersOwnedByNativeWindow() > (size_t)minUndequeuedBufs && dequeueBufferFromNativeWindow() != NULL) { + // these buffers will be submitted as regular buffers; account for this + if (mStoreMetaDataInOutputBuffers && mMetaDataBuffersToSubmit > 0) { + --mMetaDataBuffersToSubmit; + } } } @@ -4000,10 +4004,9 @@ void ACodec::ExecutingState::submitRegularOutputBuffers() { } void ACodec::ExecutingState::submitOutputBuffers() { + submitRegularOutputBuffers(); if (mCodec->mStoreMetaDataInOutputBuffers) { submitOutputMetaBuffers(); - } else { - submitRegularOutputBuffers(); } } |