From 00707ead6cf51e79d765c119b917a699ee9d9ea6 Mon Sep 17 00:00:00 2001
From: kugel <kugel@a1c6a512-1295-4272-9138-f99709370657>
Date: Sun, 12 Sep 2010 09:42:21 +0000
Subject: [PATCH] Use getMinBufferSize instead of hardcoding a buffer size.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Seems to fix problems on Samsung Galaxy S, thanks to István Nagy.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28059 a1c6a512-1295-4272-9138-f99709370657
---
 android/src/org/rockbox/RockboxPCM.java | 25 +++++++++++--------------
 docs/CREDITS                            |  1 +
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/android/src/org/rockbox/RockboxPCM.java b/android/src/org/rockbox/RockboxPCM.java
index f11f37f358..b39aaef5e4 100644
--- a/android/src/org/rockbox/RockboxPCM.java
+++ b/android/src/org/rockbox/RockboxPCM.java
@@ -33,11 +33,15 @@ import android.util.Log;
 
 public class RockboxPCM extends AudioTrack 
 {
-	byte[] raw_data;
-	private int buf_len;
+	private byte[] raw_data;
 	private PCMListener l;
 	private HandlerThread ht;
 	private Handler h = null;
+	private static final int samplerate = 44100;
+    /* should be CHANNEL_OUT_STEREO in 2.0 and above */
+	private static final int channels = AudioFormat.CHANNEL_CONFIGURATION_STEREO;
+	private static final int encoding = AudioFormat.ENCODING_PCM_16BIT;
+	private static final int buf_len  = getMinBufferSize(44100, channels, encoding);
 
 	private void LOG(CharSequence text)
 	{
@@ -46,20 +50,13 @@ public class RockboxPCM extends AudioTrack
 
 	public RockboxPCM()
 	{
-		super(AudioManager.STREAM_MUSIC, 
-			    44100,
-			    /* should be CHANNEL_OUT_STEREO in 2.0 and above */
-			    AudioFormat.CHANNEL_CONFIGURATION_STEREO,
-			    AudioFormat.ENCODING_PCM_16BIT,
-			    24<<10,
-			    AudioTrack.MODE_STREAM);
+		super(AudioManager.STREAM_MUSIC, samplerate,  channels, encoding,
+				buf_len, AudioTrack.MODE_STREAM);
 		ht = new HandlerThread("audio thread", Process.THREAD_PRIORITY_URGENT_AUDIO);
 		ht.start();
-		buf_len = 24<<10; /* in bytes */
-
-	    raw_data = new byte[buf_len]; /* in shorts */
-	    Arrays.fill(raw_data, (byte) 0);
-	    l = new PCMListener(buf_len);
+		raw_data = new byte[buf_len]; /* in shorts */
+		Arrays.fill(raw_data, (byte) 0);
+		l = new PCMListener(buf_len);
 	}    
 
 	int bytes2frames(int bytes) {
diff --git a/docs/CREDITS b/docs/CREDITS
index c78fe42163..82790135aa 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -558,6 +558,7 @@ Hayden Pearce
 Rodrigo Barretto
 Daniel Rigby
 Alexey Polkhirev
+István Nagy
 
 The libmad team
 The wavpack team
-- 
2.11.4.GIT