build.gradle

app/build.gradle

@@ -94,22 +94,19 @@ dependencies {
     implementation project(':jianpian')
     implementation project(':forcetech')
     implementation project(':ijkplayer')
-    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')
-    implementation project(':media-lib-exoplayer-rtsp')
-    implementation project(':media-lib-exoplayer-smoothstreaming')
-    implementation project(':media-lib-extractor')
-    implementation project(':media-lib-session')
-    implementation project(':media-lib-ui')
     implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.20')
+    implementation 'androidx.media3:media3-database:' + media3Version
+    implementation 'androidx.media3:media3-datasource:' + media3Version
+    implementation 'androidx.media3:media3-datasource-okhttp:' + media3Version
+    implementation 'androidx.media3:media3-datasource-rtmp:' + media3Version
+    implementation 'androidx.media3:media3-exoplayer:' + media3Version
+    implementation 'androidx.media3:media3-exoplayer-dash:' + media3Version
+    implementation 'androidx.media3:media3-exoplayer-hls:' + media3Version
+    implementation 'androidx.media3:media3-exoplayer-rtsp:' + media3Version
+    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:' + media3Version
+    implementation 'androidx.media3:media3-extractor:' + media3Version
+    implementation 'androidx.media3:media3-session:' + media3Version
+    implementation 'androidx.media3:media3-ui:' + media3Version
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.biometric:biometric:1.1.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'

app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java

@@ -43,7 +43,6 @@ import com.fongmi.android.tv.bean.Channel;
 import com.fongmi.android.tv.bean.Drm;
 import com.fongmi.android.tv.bean.Result;
 import com.fongmi.android.tv.bean.Sub;
-import com.fongmi.android.tv.utils.Sniffer;
 import com.fongmi.android.tv.utils.UrlUtil;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Path;
@@ -67,7 +66,7 @@ public class ExoUtil {
     private static Cache cache;
 
     public static LoadControl buildLoadControl() {
-        return new DefaultLoadControl(Setting.getBuffer());
+        return new DefaultLoadControl();
     }
 
     public static TrackSelector buildTrackSelector() {
@@ -116,7 +115,6 @@ public class ExoUtil {
 
     private static String getMimeType(String format, int errorCode) {
         if (format != null) return format;
-        if (errorCode == PlaybackException.ERROR_CODE_PARSING_MANIFEST_UNSUPPORTED || errorCode == PlaybackException.ERROR_CODE_PARSING_MANIFEST_MALFORMED) return MimeTypes.APPLICATION_OCTET;
         if (errorCode == PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED || errorCode == PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED) return MimeTypes.APPLICATION_M3U8;
         return null;
     }
@@ -145,9 +143,7 @@ public class ExoUtil {
         MediaItem.Builder builder = new MediaItem.Builder().setUri(uri);
         if (subs.size() > 0) builder.setSubtitleConfigurations(getSubtitles(subs));
         if (drm != null) builder.setDrmConfiguration(drm.get());
-        builder.setAllowChunklessPreparation(Players.isHard());
         if (mimeType != null) builder.setMimeType(mimeType);
-        builder.setAds(Sniffer.getRegex(uri));
         return builder.build();
     }
 

build.gradle

@@ -12,6 +12,7 @@ tasks.register('clean', Delete) {
 project.ext {
     gsonVersion = '2.10.1'
     jsoupVersion = '1.15.3'
+    media3Version = '1.2.0'
     okhttpVersion = '4.11.0'
     annotationVersion = '1.3.0'
 }

catvod/build.gradle

@@ -12,7 +12,7 @@ android {
 }
 
 dependencies {
-    api project(':media-lib-common')
+    api 'androidx.media3:media3-common:' + media3Version
     api 'androidx.annotation:annotation:' + annotationVersion
     api 'androidx.preference:preference:1.2.1'
     api 'com.google.code.gson:gson:' + gsonVersion

ijkplayer/build.gradle

@@ -17,5 +17,5 @@ android {
 
 dependencies {
     implementation project(':catvod')
-    implementation project(':media-lib-ui')
+    implementation 'androidx.media3:media3-ui:1.1.1'
 }

settings.gradle

@@ -29,12 +29,9 @@ include ':hook'
 include ':tvbus'
 include ':catvod'
 include ':danmaku'
-include ':pyramid'
 include ':quickjs'
 include ':thunder'
 include ':jianpian'
 include ':forcetech'
 include ':ijkplayer'
 rootProject.name = "TV"
-gradle.ext.androidxMediaModulePrefix = 'media-'
-apply from: file("/media/core_settings.gradle")