Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 91487425: Merge change I0448ef20 into eclair

Browse Source 
Merge commit '9148742546defc66a23ca1a0fc8f5515ff2c6c61' into eclair-plus-aosp

* commit '9148742546defc66a23ca1a0fc8f5515ff2c6c61':
  Fix SoundPool buffer size rounding error. Bug 2327620.
This commit is contained in:
Dave Sparks
2009-12-15 08:57:24 -08:00
committed by Android Git Automerger
parent 3a0d1a4629 9148742546
commit b5fc8ffcff
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/jni/soundpool/SoundPool.cpp
View File

@@ -501,7 +501,8 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV
} }
int numChannels = sample->numChannels(); int numChannels = sample->numChannels();
uint32_t sampleRate = uint32_t(float(sample->sampleRate()) * rate + 0.5); uint32_t sampleRate = uint32_t(float(sample->sampleRate()) * rate + 0.5);
uint32_t bufferFrames = (afFrameCount * sampleRate) / afSampleRate; uint32_t totalFrames = (kDefaultBufferCount * afFrameCount * sampleRate) / afSampleRate;
uint32_t bufferFrames = (totalFrames + (kDefaultBufferCount - 1)) / kDefaultBufferCount;
uint32_t frameCount = 0; uint32_t frameCount = 0;
if (loop) { if (loop) {
@@ -510,13 +511,13 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV
#ifndef USE_SHARED_MEM_BUFFER #ifndef USE_SHARED_MEM_BUFFER
// Ensure minimum audio buffer size in case of short looped sample // Ensure minimum audio buffer size in case of short looped sample
if(frameCount < kDefaultBufferCount * bufferFrames) { if(frameCount < totalFrames) {
frameCount = kDefaultBufferCount * bufferFrames; frameCount = totalFrames;
} }
#endif #endif
AudioTrack* newTrack; AudioTrack* newTrack;
// mToggle toggles each time a track is started on a given channel. // mToggle toggles each time a track is started on a given channel.
// The toggle is concatenated with the SoundChannel address and passed to AudioTrack // The toggle is concatenated with the SoundChannel address and passed to AudioTrack
// as callback user data. This enables the detection of callbacks received from the old // as callback user data. This enables the detection of callbacks received from the old
@@ -525,7 +526,7 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV
unsigned long toggle = mToggle ^ 1; unsigned long toggle = mToggle ^ 1;
void *userData = (void *)((unsigned long)this | toggle); void *userData = (void *)((unsigned long)this | toggle);
uint32_t channels = (numChannels == 2) ? AudioSystem::CHANNEL_OUT_STEREO : AudioSystem::CHANNEL_OUT_MONO; uint32_t channels = (numChannels == 2) ? AudioSystem::CHANNEL_OUT_STEREO : AudioSystem::CHANNEL_OUT_MONO;
#ifdef USE_SHARED_MEM_BUFFER #ifdef USE_SHARED_MEM_BUFFER
newTrack = new AudioTrack(streamType, sampleRate, sample->format(), newTrack = new AudioTrack(streamType, sampleRate, sample->format(),
channels, sample->getIMemory(), 0, callback, userData); channels, sample->getIMemory(), 0, callback, userData);