summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ACodec.cpp
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-06-26 15:33:17 -0700
committerLajos Molnar <lajos@google.com>2015-07-01 00:42:40 +0000
commit264bac95912efe121d6a60026612617f04f42966 (patch)
treeac73aada986fed92fba30ca624eff7e4fa033c1c /media/libstagefright/ACodec.cpp
parent064b2bf712788d30928b9a8bafecd0f3308d7aa4 (diff)
downloadframeworks_av-264bac95912efe121d6a60026612617f04f42966.zip
frameworks_av-264bac95912efe121d6a60026612617f04f42966.tar.gz
frameworks_av-264bac95912efe121d6a60026612617f04f42966.tar.bz2
stagefright: prevent allocating stale buffers for OMX decoders
Also fix some issues encountered once using generationNumbers: - properly account outstanding buffers in MediaSync - don't release arbitrary frame if attach fails Bug: 11990461 Change-Id: Icee5ea188ca4eb856138feb5e6ec5d4ee5e44008
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
-rw-r--r--media/libstagefright/ACodec.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index bb53ce6..383966f 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -5234,6 +5234,7 @@ void ACodec::BaseState::onOutputBufferDrained(const sp<AMessage> &msg) {
if (err == OK) {
info->mStatus = BufferInfo::OWNED_BY_NATIVE_WINDOW;
} else {
+ ALOGE("queueBuffer failed in onOutputBufferDrained: %d", err);
mCodec->signalError(OMX_ErrorUndefined, makeNoSideEffectStatus(err));
info->mStatus = BufferInfo::OWNED_BY_US;
// keeping read fence as write fence to avoid clobbering