diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-09-18 11:02:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-18 11:02:04 -0700 |
| commit | 362ebe187a39e063c7434bf3c002a0688fa27cdb (patch) | |
| tree | 8a484d8ba967816d01e822e0dabce4f4e5d8989b /media | |
| parent | 133531663cacc892f19edafac8b1edf244e054aa (diff) | |
| parent | 684e0ae8ac8cfb7c7a9709a7b4fc6caf485dfb8a (diff) | |
| download | frameworks_av-362ebe187a39e063c7434bf3c002a0688fa27cdb.zip frameworks_av-362ebe187a39e063c7434bf3c002a0688fa27cdb.tar.gz frameworks_av-362ebe187a39e063c7434bf3c002a0688fa27cdb.tar.bz2 | |
am 684e0ae8: am 9a98b6de: Merge "Partial fix for SoundPool not terminating" into klp-dev
* commit '684e0ae8ac8cfb7c7a9709a7b4fc6caf485dfb8a':
Partial fix for SoundPool not terminating
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/SoundPool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/SoundPool.cpp b/media/libmedia/SoundPool.cpp index 0985164..5239b2f 100644 --- a/media/libmedia/SoundPool.cpp +++ b/media/libmedia/SoundPool.cpp @@ -740,8 +740,8 @@ void SoundChannel::process(int event, void *info, unsigned long toggle) b->size = count; //ALOGV("buffer=%p, [0]=%d", b->i16, b->i16[0]); } - } else if (event == AudioTrack::EVENT_UNDERRUN) { - ALOGV("process %p channel %d EVENT_UNDERRUN", this, mChannelID); + } else if (event == AudioTrack::EVENT_UNDERRUN || event == AudioTrack::EVENT_BUFFER_END) { + ALOGV("process %p channel %d EVENT_UNDERRUN or EVENT_BUFFER_END", this, mChannelID); mSoundPool->addToStopList(this); } else if (event == AudioTrack::EVENT_LOOP_END) { ALOGV("End loop %p channel %d count %d", this, mChannelID, *(int *)info); |