Merge "Revert "Revert "soundpool: update sample rate when reusing audiotrack"""

2015-03-17 23:13:07 +00:00
parent 9bd868fe7a bc4537393b
commit 2bec0fe3a7
1 changed files with 2 additions and 0 deletions
--- 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);