From 51c1e0e86a0ad95bf3d890a9a2f51e54b8ef9444 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Mon, 4 Apr 2011 11:43:40 -0700
Subject: 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
---
 media/libstagefright/AudioPlayer.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'media/libstagefright/AudioPlayer.cpp')

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;
-- 
cgit v1.1