diff --git a/app/build.gradle b/app/build.gradle index 6872b58a6..06ed2e5e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -87,7 +87,7 @@ dependencies { implementation project(':catvod') implementation project(':forcetech') implementation project(':ijkplayer') - pythonImplementation project(':pyramid') + //pythonImplementation project(':pyramid') implementation 'androidx.media3:media3-database:1.0.2' implementation 'androidx.media3:media3-datasource:1.0.2' implementation 'androidx.media3:media3-datasource-okhttp:1.0.2' 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 c59fe8140..c09584824 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 @@ -113,10 +113,7 @@ public class ExoUtil { private static MediaItem getMediaItem(Uri uri, List subs, int errorCode) { MediaItem.Builder builder = new MediaItem.Builder().setUri(uri); if (errorCode == PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED || errorCode == PlaybackException.ERROR_CODE_IO_UNSPECIFIED) builder.setMimeType(MimeTypes.APPLICATION_M3U8); - else if (errorCode == PlaybackException.ERROR_CODE_PARSING_MANIFEST_MALFORMED) builder.setMimeType(MimeTypes.APPLICATION_OCTET); if (subs.size() > 0) builder.setSubtitleConfigurations(getSubtitles(subs)); - builder.setAllowChunklessPreparation(Players.isHard()); - builder.setAds(Sniffer.getAdsRegex(uri)); return builder.build(); } diff --git a/drpy/build.gradle b/drpy/build.gradle index 8617b370b..66e5a1143 100644 --- a/drpy/build.gradle +++ b/drpy/build.gradle @@ -13,8 +13,8 @@ android { dependencies { implementation project(':catvod') - implementation project(':media-lib-common') implementation 'androidx.annotation:annotation:1.5.0' + implementation 'androidx.media3:media3-common:1.0.2' implementation 'wang.harlon.quickjs:wrapper-android:0.19.3' api 'com.google.code.gson:gson:' + gsonVersion api 'com.squareup.okhttp3:okhttp:' + okhttpVersion diff --git a/settings.gradle b/settings.gradle index 4be87c0b5..3ff1f8789 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,7 +24,7 @@ include ':drpy' include ':zlive' include ':tvbus' include ':catvod' -include ':pyramid' +//include ':pyramid' include ':forcetech' include ':ijkplayer' rootProject.name = "TV" \ No newline at end of file