Catch decoder thread exceptions and fail

AntennaPod · Mar 3, 2016 · 9b4f648 · 9b4f648
1 parent d6e4939
commit 9b4f648
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java b/library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java
@@ -725,24 +725,14 @@ public void run() {
                             mTrack.release();
                             final MediaFormat oFormat = mCodec.getOutputFormat();
                             Log.d("PCM", "Output format has changed to " + oFormat);
-                            try {
-                                int sampleRate = oFormat.getInteger(MediaFormat.KEY_SAMPLE_RATE);
-                                Log.d(TAG, "new sample rate: " + sampleRate);
-                                int channelCount = oFormat.getInteger(MediaFormat.KEY_CHANNEL_COUNT);
-                                Log.d(TAG, "new channel count: " + channelCount);
-                                if(sampleRate > 0 && channelCount > 0) {
-                                    initDevice(sampleRate, channelCount);
-                                    outputBuffers = mCodec.getOutputBuffers();
-                                }
-                            } catch(Throwable t) {
-                                Log.e(TAG, Log.getStackTraceString(t));
-                                error();
-                            }
-                            if(mTrack.getState() != AudioTrack.STATE_INITIALIZED) {
-                                error();
-                            } else {
-                                mTrack.play();
+                            int sampleRate = oFormat.getInteger(MediaFormat.KEY_SAMPLE_RATE);
+                            int channelCount = oFormat.getInteger(MediaFormat.KEY_CHANNEL_COUNT);
+                            if (sampleRate != mSonic.getSampleRate() ||
+                                    channelCount != mSonic.getNumChannels()) {
+                                initDevice(sampleRate, channelCount);
+                                outputBuffers = mCodec.getOutputBuffers();
                             }
+                            mTrack.play();
                             mLock.unlock();
                         }
                     } while (res == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED ||
@@ -790,6 +780,13 @@ public void run() {
                 }
             }
         });
+        mDecoderThread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+            @Override
+            public void uncaughtException(Thread thread, Throwable ex) {
+                Log.e(TAG_TRACK, Log.getStackTraceString(ex));
+                error();
+            }
+        });
         mDecoderThread.setDaemon(true);
         mDecoderThread.start();
     }