diff options
| author | Eric Laurent <elaurent@google.com> | 2013-10-13 11:08:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-13 11:08:06 -0700 |
| commit | b930056ed4c6e1f8288d4f2cef828c3c02940482 (patch) | |
| tree | 336decc434ba33fbcd6c0e3e2208dad2fb3e5a93 /media/libmedia | |
| parent | 1810a287ecc81c243983051f9b1e32ff92ef1365 (diff) | |
| parent | b3cb72a17d9a472883e9e2faa18b42eac533fe99 (diff) | |
| download | frameworks_av-b930056ed4c6e1f8288d4f2cef828c3c02940482.zip frameworks_av-b930056ed4c6e1f8288d4f2cef828c3c02940482.tar.gz frameworks_av-b930056ed4c6e1f8288d4f2cef828c3c02940482.tar.bz2 | |
am b3cb72a1: SoundPool: handle new audio track event
* commit 'b3cb72a17d9a472883e9e2faa18b42eac533fe99':
SoundPool: handle new audio track event
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/SoundPool.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/libmedia/SoundPool.cpp b/media/libmedia/SoundPool.cpp index 8434d43..22e9fad 100644 --- a/media/libmedia/SoundPool.cpp +++ b/media/libmedia/SoundPool.cpp @@ -744,11 +744,16 @@ 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) { - ALOGV("process %p channel %d EVENT_UNDERRUN or EVENT_BUFFER_END", this, mChannelID); + } else if (event == AudioTrack::EVENT_UNDERRUN || event == AudioTrack::EVENT_BUFFER_END || + event == AudioTrack::EVENT_NEW_IAUDIOTRACK) { + ALOGV("process %p channel %d event %s", + this, mChannelID, (event == AudioTrack::EVENT_UNDERRUN) ? "UNDERRUN" : + (event == AudioTrack::EVENT_BUFFER_END) ? "BUFFER_END" : "NEW_IAUDIOTRACK"); mSoundPool->addToStopList(this); } else if (event == AudioTrack::EVENT_LOOP_END) { ALOGV("End loop %p channel %d", this, mChannelID); + } else { + ALOGW("SoundChannel::process unexpected event %d", event); } } |