commit b9b84ec91ba7b300bc5ab9378448387733b5048e
author Andreas Huber <andih@google.com> Wed Jan 26 11:48:01 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 26 11:48:01 2011 -0800
tree 5117ced8a7be67fdc66ec9b4e53bc34b6f09dec7
parent 80458176c35e87358bd8de677e7b32e0af4f8d13
parent aeb38af82d525015ec4d3f2d51671093cd80a0dc

am 807398e7: am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb

* commit '807398e7f0718aaa9e8f53c556d0707c083819cf':
  Instead of not feeding the AudioTrack any data after EOS, play silence instead.

media/libstagefright/AudioPlayer.cpp

diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index 5ff934d..e7c0299 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -286,7 +286,9 @@
     }
 
     if (mReachedEOS) {
-        return 0;
+        memset(data, 0, size);
+
+        return size;
     }
 
     size_t size_done = 0;