From d3ef7421fec7b4d83336f49af271993d35ca5df9 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 23 Sep 2022 14:02:42 +0800
Subject: [PATCH] Update to 1.3.0

---
 app/build.gradle                                     |  4 ++--
 .../java/com/fongmi/android/tv/player/Players.java   | 12 +-----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3edaf22ea..6803a6f58 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk 21
         targetSdk 33
-        versionCode 29
-        versionName "1.2.9"
+        versionCode 30
+        versionName "1.3.0"
         resValue "string", "url", ""
         ndk { abiFilters "armeabi-v7a", "arm64-v8a" }
     }
diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java
index 4bc321455..e239b48ce 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/Players.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java
@@ -12,7 +12,6 @@ import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.mediacodec.MediaCodecDecoderException;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.util.Util;
 
@@ -26,7 +25,6 @@ public class Players implements Player.Listener, ParseTask.Callback {
     private Formatter formatter;
     private ExoPlayer exoPlayer;
     private ParseTask parseTask;
-    private boolean fallback;
     private int retry;
 
     public Players init() {
@@ -37,8 +35,7 @@ public class Players implements Player.Listener, ParseTask.Callback {
     }
 
     private void setupPlayer() {
-        DefaultRenderersFactory factory = new DefaultRenderersFactory(App.get()).setEnableDecoderFallback(true);
-        factory.setExtensionRendererMode(fallback ? DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER : DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON);
+        DefaultRenderersFactory factory = new DefaultRenderersFactory(App.get()).setEnableDecoderFallback(true).setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON);
         exoPlayer = new ExoPlayer.Builder(App.get()).setRenderersFactory(factory).setTrackSelector(new DefaultTrackSelector(App.get())).build();
         exoPlayer.addListener(this);
     }
@@ -164,12 +161,6 @@ public class Players implements Player.Listener, ParseTask.Callback {
         exoPlayer.prepare();
     }
 
-    private void onFallback() {
-        fallback = true;
-        release();
-        setupPlayer();
-    }
-
     @Override
     public void onParseSuccess(Map<String, String> headers, String url, String from) {
         if (from.length() > 0) Notify.show(ResUtil.getString(R.string.parse_from, from));
@@ -183,7 +174,6 @@ public class Players implements Player.Listener, ParseTask.Callback {
 
     @Override
     public void onPlayerError(@NonNull PlaybackException error) {
-        if (error.getCause() instanceof MediaCodecDecoderException && !fallback) onFallback();
         PlayerEvent.error(R.string.error_play_format, true);
     }