summaryrefslogtreecommitdiffstats
path: root/media/jni/soundpool
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-03-09 08:36:09 -0700
committerGlenn Kasten <gkasten@google.com>2015-03-09 08:39:46 -0700
commitb801f73343194cd081f675a5dc2b3e90959cf6d1 (patch)
tree2015aab6d1d2c59fbabb91998cea0a54713e0c1d /media/jni/soundpool
parent1c2bf03d1082fc6b7eb42cbd163c60c07cf2bccc (diff)
downloadframeworks_base-b801f73343194cd081f675a5dc2b3e90959cf6d1.zip
frameworks_base-b801f73343194cd081f675a5dc2b3e90959cf6d1.tar.gz
frameworks_base-b801f73343194cd081f675a5dc2b3e90959cf6d1.tar.bz2
Revert "soundpool: update sample rate when reusing audiotrack"
This reverts commit a7d57a6f0068b1e2a0f07ca427cfba198b12a9b9. Bug: 19635137 Change-Id: I1f53a432936dd3d51459e7d8cd86421bde399150
Diffstat (limited to 'media/jni/soundpool')
-rw-r--r--media/jni/soundpool/SoundPool.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp
index dfe2844..8957b3c 100644
--- a/media/jni/soundpool/SoundPool.cpp
+++ b/media/jni/soundpool/SoundPool.cpp
@@ -743,10 +743,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);