diff --git a/app/build.gradle b/app/build.gradle index b1055002b..136ecab77 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,12 +21,12 @@ android { leanback { dimension "mode" versionCode 207 - versionName "20231109" + versionName "20231109#2" } mobile { dimension "mode" versionCode 207 - versionName "20231109" + versionName "20231109#2" } java { dimension "api" @@ -86,13 +86,14 @@ dependencies { implementation project(':jianpian') implementation project(':forcetech') implementation project(':ijkplayer') - implementation project(':media3ext') + //implementation project(':media3ext') pythonImplementation project(':pyramid') implementation project(':media-lib-database') implementation project(':media-lib-datasource') implementation project(':media-lib-datasource-okhttp') implementation project(':media-lib-datasource-rtmp') implementation project(':media-lib-decoder-av1') + implementation project(':media-lib-decoder-ffmpeg') implementation project(':media-lib-exoplayer') implementation project(':media-lib-exoplayer-dash') implementation project(':media-lib-exoplayer-hls') diff --git a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java index 2bc2b5709..76d34ad87 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java @@ -22,6 +22,7 @@ import androidx.media3.datasource.cache.NoOpCacheEvictor; import androidx.media3.datasource.cache.SimpleCache; import androidx.media3.datasource.okhttp.OkHttpDataSource; import androidx.media3.exoplayer.DefaultLoadControl; +import androidx.media3.exoplayer.DefaultRenderersFactory; import androidx.media3.exoplayer.ExoPlayer; import androidx.media3.exoplayer.LoadControl; import androidx.media3.exoplayer.RenderersFactory; @@ -53,7 +54,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import io.github.anilbeesetti.nextlib.media3ext.ffdecoder.NextRenderersFactory; import okhttp3.Call; public class ExoUtil { @@ -75,7 +75,7 @@ public class ExoUtil { } public static RenderersFactory buildRenderersFactory() { - return new NextRenderersFactory(App.get()).setEnableDecoderFallback(true).setExtensionRendererMode(Math.abs(Setting.getDecode() - 2)); + return new DefaultRenderersFactory(App.get()).setEnableDecoderFallback(true).setExtensionRendererMode(Math.abs(Setting.getDecode() - 2)); } public static CaptionStyleCompat getCaptionStyle() {