diff options
| author | Andreas Huber <andih@google.com> | 2011-01-26 11:43:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 11:43:50 -0800 |
| commit | aeb38af82d525015ec4d3f2d51671093cd80a0dc (patch) | |
| tree | f1785b55e530ed23bf165864126d1d2b0ed8822a /media | |
| parent | a0c51bbd0ea4c0266b12c9ffa450ccc297160b19 (diff) | |
| parent | 6e1cc6e6e5477693a279185c372b90863778a10b (diff) | |
| download | frameworks_av-aeb38af82d525015ec4d3f2d51671093cd80a0dc.zip frameworks_av-aeb38af82d525015ec4d3f2d51671093cd80a0dc.tar.gz frameworks_av-aeb38af82d525015ec4d3f2d51671093cd80a0dc.tar.bz2 | |
am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
* commit 'd030359ff10a031c762d4f229d9c1bdfd366cb50':
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) { } if (mReachedEOS) { - return 0; + memset(data, 0, size); + + return size; } size_t size_done = 0; |