Simplify audio track initialization

protyposis · Jan 2, 2017 · ae14207 · ae14207
1 parent df8bca6
commit ae14207
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/MediaPlayer.java b/MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/MediaPlayer.java
@@ -282,13 +282,6 @@ public void setDataSource(Context context, Uri uri) throws IOException {
     }
 
     private void prepareInternal() throws IOException, IllegalStateException {
-        if (mAudioFormat != null) {
-            mAudioPlayback = new AudioPlayback();
-            // Initialize settings in case they have already been set before the preparation
-            mAudioPlayback.setAudioSessionId(mAudioSessionId);
-            setVolume(mVolumeLeft, mVolumeRight); // sets the volume on mAudioPlayback
-        }
-
         MediaCodecDecoder.OnDecoderEventListener decoderEventListener = new MediaCodecDecoder.OnDecoderEventListener() {
             @Override
             public void onBuffering(MediaCodecDecoder decoder) {
@@ -324,13 +317,19 @@ public void onBuffering(MediaCodecDecoder decoder) {
         }
 
         if(mAudioTrackIndex != MediaCodecDecoder.INDEX_NONE) {
+            mAudioPlayback = new AudioPlayback();
+            // Initialize settings in case they have already been set before the preparation
+            mAudioPlayback.setAudioSessionId(mAudioSessionId);
+            setVolume(mVolumeLeft, mVolumeRight); // sets the volume on mAudioPlayback
+
             try {
                 boolean passive = (mAudioExtractor == mVideoExtractor || mAudioExtractor == null);
                 MediaCodecDecoder ad = new MediaCodecAudioDecoder(mAudioExtractor != null ? mAudioExtractor : mVideoExtractor,
                         passive, mAudioTrackIndex, decoderEventListener, mAudioPlayback);
                 mDecoders.addDecoder(ad);
             } catch (Exception e) {
                 Log.e(TAG, "cannot create audio decoder: " + e.getMessage());
+                mAudioPlayback = null;
             }
         }