summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-04-04 11:43:40 -0700
committerAndreas Huber <andih@google.com>2011-04-04 11:43:40 -0700
commit51c1e0e86a0ad95bf3d890a9a2f51e54b8ef9444 (patch)
tree622fba590fbbf4fafcdf3230ee6d25ae4976ca65 /media/libstagefright
parent94baecca5e14b083c46615a1bcf18ea6cf7cad46 (diff)
downloadframeworks_av-51c1e0e86a0ad95bf3d890a9a2f51e54b8ef9444.zip
frameworks_av-51c1e0e86a0ad95bf3d890a9a2f51e54b8ef9444.tar.gz
frameworks_av-51c1e0e86a0ad95bf3d890a9a2f51e54b8ef9444.tar.bz2
This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491
Instead of returning 0-filled buffers after EOS from AudioTrack we do this work in AudioOutput instead. That way the EOS signal (0 frames returned) is preserved in AudioCache which otherwise would lead to a heap size overflow filling everything with zeroes. Change-Id: I7e07429ba887957a4340dd4b21eef4bba76248cd related-to-bug: 3514073
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/AudioPlayer.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index 162d2e6..00c749e 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -306,9 +306,7 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) {
}
if (mReachedEOS) {
- memset(data, 0, size);
-
- return size;
+ return 0;
}
size_t size_done = 0;