diff options
| author | Andy Hung <hunga@google.com> | 2015-03-17 23:13:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-17 23:14:24 +0000 |
| commit | 2bec0fe3a7287c65db14fbb6fad784e38179efc4 (patch) | |
| tree | 64134dc25ebbbabdfffeabbc7fccf7b5f06c3ac9 /media/jni/soundpool | |
| parent | 9bd868fe7ae712507211fff14b30981195dc96ce (diff) | |
| parent | bc4537393b02b39433e07fed4ed57186d8e5959f (diff) | |
| download | frameworks_base-2bec0fe3a7287c65db14fbb6fad784e38179efc4.zip frameworks_base-2bec0fe3a7287c65db14fbb6fad784e38179efc4.tar.gz frameworks_base-2bec0fe3a7287c65db14fbb6fad784e38179efc4.tar.bz2 | |
Merge "Revert "Revert "soundpool: update sample rate when reusing audiotrack"""
Diffstat (limited to 'media/jni/soundpool')
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 80b438b..10233f3 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -745,8 +745,10 @@ 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); |