summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2009-12-11 09:14:31 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2009-12-11 09:14:31 -0800
commit0a57ac4b4bf178c463850be6d4264cbf49bcb023 (patch)
tree7265123bb8d23dc5202ca9080e16d66928294d1f
parentfe7923aa92922b8a2f7784acedfea4b8fc3997bb (diff)
parent554647e963432d34c41e69e4c6c0c6e4cb08e80e (diff)
am 554647e9: am 6ddcf01a: remote destructors are not synchronously executed by the binder...
Merge commit '554647e963432d34c41e69e4c6c0c6e4cb08e80e' * commit '554647e963432d34c41e69e4c6c0c6e4cb08e80e': remote destructors are not synchronously executed by the binder...
-rw-r--r--media/libstagefright/AwesomePlayer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index d4ad972288fa..570e431ff3e0 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -544,6 +544,9 @@ void AwesomePlayer::onEvent(int32_t code) {
}
if (mVideoBuffer->range_length() == 0) {
+ // Some decoders, notably the PV AVC software decoder
+ // return spurious empty buffers that we just want to ignore.
+
mVideoBuffer->release();
mVideoBuffer = NULL;
continue;