Apply track selection fixes

moneytoo · Nov 11, 2021 · 126ce0e · 126ce0e
1 parent 7f488ad
commit 126ce0e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,13 +44,21 @@ android {
 
 dependencies {
     def exoplayerVersion = '2.16.0'
-    implementation("com.google.android.exoplayer:exoplayer-common:$exoplayerVersion") {
-        exclude group: "com.google.android.exoplayer", module: "exoplayer-extractor"
+//    implementation("com.google.android.exoplayer:exoplayer-common:$exoplayerVersion") {
+//        exclude group: "com.google.android.exoplayer", module: "exoplayer-extractor"
+//    }
+    implementation("com.google.android.exoplayer:exoplayer-datasource:$exoplayerVersion") {
+        exclude group: "com.google.android.exoplayer", module: "exoplayer-common"
+    }
+    implementation("com.google.android.exoplayer:exoplayer-decoder:$exoplayerVersion") {
+        exclude group: "com.google.android.exoplayer", module: "exoplayer-common"
+    }
+    implementation("com.google.android.exoplayer:exoplayer-database:$exoplayerVersion") {
+        exclude group: "com.google.android.exoplayer", module: "exoplayer-common"
+    }
+    implementation("com.google.android.exoplayer:extension-mediasession:$exoplayerVersion") {
+        exclude group: "com.google.android.exoplayer", module: "exoplayer-common"
     }
-    implementation "com.google.android.exoplayer:exoplayer-datasource:$exoplayerVersion"
-    implementation "com.google.android.exoplayer:exoplayer-decoder:$exoplayerVersion"
-    implementation "com.google.android.exoplayer:exoplayer-database:$exoplayerVersion"
-    implementation "com.google.android.exoplayer:extension-mediasession:$exoplayerVersion"
     implementation("com.google.android.exoplayer:exoplayer-dash:$exoplayerVersion") {
         exclude group: "com.google.android.exoplayer", module: "exoplayer-core"
     }
@@ -63,6 +71,13 @@ dependencies {
     implementation("com.google.android.exoplayer:exoplayer-rtsp:$exoplayerVersion") {
         exclude group: "com.google.android.exoplayer", module: "exoplayer-core"
     }
+    api ('com.google.guava:guava:27.1-android') {
+        exclude group: 'com.google.code.findbugs', module: 'jsr305'
+        exclude group: 'org.checkerframework', module: 'checker-compat-qual'
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
+        exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
+        exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations'
+    }
     implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'

diff --git a/app/libs/library-common-release.aar b/app/libs/library-common-release.aar
diff --git a/app/libs/library-core-release.aar b/app/libs/library-core-release.aar
diff --git a/app/libs/library-extractor-release.aar b/app/libs/library-extractor-release.aar
diff --git a/app/libs/library-ui-release.aar b/app/libs/library-ui-release.aar
diff --git a/app/src/main/java/com/brouken/player/PlayerActivity.java b/app/src/main/java/com/brouken/player/PlayerActivity.java
@@ -1338,15 +1338,11 @@ public void setSelectedTracks(final String subtitleId, final String audioId) {
         }
     }
 
-    private boolean hasOverrideAudio() {
+    private boolean hasOverrideType(final int trackType) {
         TrackSelectionParameters trackSelectionParameters = player.getTrackSelectionParameters();
         for (TrackSelectionOverrides.TrackSelectionOverride override : trackSelectionParameters.trackSelectionOverrides.asList()) {
-            Format format = override.trackGroup.getFormat(0);
-            String mimeType = format.sampleMimeType;
-            if ((mimeType != null && mimeType.startsWith(MimeTypes.BASE_TYPE_AUDIO + "/"))
-                    || format.channelCount >= 1) {
+            if (override.getTrackType() == trackType)
                 return true;
-            }
         }
         return false;
     }
@@ -1364,7 +1360,7 @@ public String getSelectedTrack(final int trackType) {
 
         // Audio track set to "Auto"
         if (trackType == C.TRACK_TYPE_AUDIO) {
-            if (!hasOverrideAudio()) {
+            if (!hasOverrideType(C.TRACK_TYPE_AUDIO)) {
                 return null;
             }
         }