summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorJean-Michel Trivi <>2009-03-24 19:32:26 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 19:32:26 -0700
commit5d2d43356e4ffa29f3f8047ca776f67990e86714 (patch)
tree422d9765e1a887f5f7852606b5275e3b30256bb3 /core/jni
parent99c6026218a87074e50b3c0921c1ab7786887cc8 (diff)
downloadframeworks_base-5d2d43356e4ffa29f3f8047ca776f67990e86714.zip
frameworks_base-5d2d43356e4ffa29f3f8047ca776f67990e86714.tar.gz
frameworks_base-5d2d43356e4ffa29f3f8047ca776f67990e86714.tar.bz2
Automated import from //branches/cupcake/...@142370,142370
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_media_AudioTrack.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index f625ffb..b8d6586 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -744,6 +744,7 @@ static jint android_media_AudioTrack_get_min_buff_size(JNIEnv *env, jobject thi
// Ensure that buffer depth covers at least audio hardware latency
uint32_t minBufCount = afLatency / ((1000 * afFrameCount)/afSamplingRate);
+ if (minBufCount < 2) minBufCount = 2;
uint32_t minFrameCount = (afFrameCount*sampleRateInHertz*minBufCount)/afSamplingRate;
int minBuffSize = minFrameCount
* (audioFormat == javaAudioTrackFields.PCM16 ? 2 : 1)