summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-09-18 17:56:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-18 17:56:05 +0000
commit9a98b6de791aeb130192df10744f5b35f8b6ef1a (patch)
tree9f1831027ba0c6b5b0ecf85eccbe418ef189ec7a /media
parentab6c93b4bea96dc4f44a7acfefee1e11a3abda5b (diff)
parent8d0fda9660aee7059f802f400875247b01226084 (diff)
downloadframeworks_av-9a98b6de791aeb130192df10744f5b35f8b6ef1a.zip
frameworks_av-9a98b6de791aeb130192df10744f5b35f8b6ef1a.tar.gz
frameworks_av-9a98b6de791aeb130192df10744f5b35f8b6ef1a.tar.bz2
Merge "Partial fix for SoundPool not terminating" into klp-dev
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/SoundPool.cpp4
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);