Sonic: Improve creation of AudioTrack buffer

1 files changed, 36 insertions, 5 deletions

diff --git a/library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java b/library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java
index 5aa616b..df07f8a 100644
--- a/library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java
+++ b/library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java
@@ -546,15 +546,46 @@ public class SonicAudioPlayer extends AbstractAudioPlayer {
     private void initDevice(int sampleRate, int numChannels) {
         mLock.lock();
         final int format = findFormatFromChannels(numChannels);
-        final int minSize = AudioTrack.getMinBufferSize(sampleRate, format,
-                AudioFormat.ENCODING_PCM_16BIT);
-        mTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, format,
-                AudioFormat.ENCODING_PCM_16BIT, minSize * 4,
-                AudioTrack.MODE_STREAM);
+        int oldBufferSize = mBufferSize;
+        mBufferSize = AudioTrack.getMinBufferSize(sampleRate, format, AudioFormat.ENCODING_PCM_16BIT);
+        if(mBufferSize != oldBufferSize) {
+            if (mTrack != null) {
+                mTrack.release();
+            }
+            mTrack = createAudioTrack(sampleRate, format, mBufferSize);
+        }
         mSonic = new Sonic(sampleRate, numChannels);
         mLock.unlock();
     }
 
+    private AudioTrack createAudioTrack(int sampleRate,
+                                        int channelConfig,
+                                        int minBufferSize) {
+        for (int i = 4; i >= 1; i--) {
+            int bufferSize = minBufferSize * i;
+
+            AudioTrack audioTrack = null;
+            try {
+                audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
+                        channelConfig, AudioFormat.ENCODING_PCM_16BIT, bufferSize,
+                        AudioTrack.MODE_STREAM);
+                if (audioTrack.getState() == AudioTrack.STATE_INITIALIZED) {
+                    mBufferSize = bufferSize;
+                    return audioTrack;
+                } else {
+                    audioTrack.release();
+                }
+            } catch (IllegalArgumentException e) {
+                Log.e(TAG, Log.getStackTraceString(e));
+                if (audioTrack != null) {
+                    audioTrack.release();
+                }
+            }
+        }
+        throw new IllegalStateException("Could not create buffer for AudioTrack");
+    }
+
+
     @SuppressWarnings("deprecation")
     public void decode() {
         mDecoderThread = new Thread(new Runnable() {