diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-03-10 01:06:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-10 01:06:29 +0000 |
| commit | 01771a9f7d9a76dd9bf8adb14717c9bea288ff97 (patch) | |
| tree | 71f9aa2afa45e9095fff078f12d3664ae29234e2 /media | |
| parent | d1eca77c3c1294c8d48147ed9c500032d3dac57f (diff) | |
| parent | b801f73343194cd081f675a5dc2b3e90959cf6d1 (diff) | |
| download | frameworks_base-01771a9f7d9a76dd9bf8adb14717c9bea288ff97.zip frameworks_base-01771a9f7d9a76dd9bf8adb14717c9bea288ff97.tar.gz frameworks_base-01771a9f7d9a76dd9bf8adb14717c9bea288ff97.tar.bz2 | |
Merge "Revert "soundpool: update sample rate when reusing audiotrack""
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 10233f3..80b438b 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -745,10 +745,8 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV // From now on, AudioTrack callbacks received with previous toggle value will be ignored. mToggle = toggle; mAudioTrack = newTrack; - ALOGV("using new track %p for sample %d", newTrack.get(), sample->sampleID()); } else { newTrack = mAudioTrack; - newTrack->setSampleRate(sampleRate); ALOGV("reusing track %p for sample %d", mAudioTrack.get(), sample->sampleID()); } newTrack->setVolume(leftVolume, rightVolume); |