diff options
| author | Andy Hung <hunga@google.com> | 2014-12-12 15:50:13 -0800 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2015-01-06 10:58:10 -0800 |
| commit | efbe92ef50b115e13034a80a16967b53cda7e4e1 (patch) | |
| tree | 18debf459e40229645fc14fe7fc45f1f0d175b36 /media/libmedia | |
| parent | b126b43fcbfe10643245396fcae462c541a94ccf (diff) | |
| download | frameworks_av-efbe92ef50b115e13034a80a16967b53cda7e4e1.zip frameworks_av-efbe92ef50b115e13034a80a16967b53cda7e4e1.tar.gz frameworks_av-efbe92ef50b115e13034a80a16967b53cda7e4e1.tar.bz2 | |
SoundPool: Do not stop AudioTrack on EVENT_NEW_IAUDIOTRACK
Bug: 17964637
Change-Id: I2865959e476bee2f6e1a7344d9464b083cee88d2
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/SoundPool.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/libmedia/SoundPool.cpp b/media/libmedia/SoundPool.cpp index d2e381b..76f11dc 100644 --- a/media/libmedia/SoundPool.cpp +++ b/media/libmedia/SoundPool.cpp @@ -756,14 +756,15 @@ 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 || event == AudioTrack::EVENT_BUFFER_END || - event == AudioTrack::EVENT_NEW_IAUDIOTRACK) { + } else if (event == AudioTrack::EVENT_UNDERRUN || event == AudioTrack::EVENT_BUFFER_END) { ALOGV("process %p channel %d event %s", this, mChannelID, (event == AudioTrack::EVENT_UNDERRUN) ? "UNDERRUN" : - (event == AudioTrack::EVENT_BUFFER_END) ? "BUFFER_END" : "NEW_IAUDIOTRACK"); + "BUFFER_END"); mSoundPool->addToStopList(this); } else if (event == AudioTrack::EVENT_LOOP_END) { ALOGV("End loop %p channel %d", this, mChannelID); + } else if (event == AudioTrack::EVENT_NEW_IAUDIOTRACK) { + ALOGV("process %p channel %d NEW_IAUDIOTRACK", this, mChannelID); } else { ALOGW("SoundChannel::process unexpected event %d", event); } |