Fix track format labels

moneytoo · Jul 11, 2024 · 1897df9 · 1897df9
1 parent 942bd63
commit 1897df9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         applicationId "com.brouken.player"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 163
+        versionCode 164
         versionName "0.${versionCode}"
         archivesBaseName = "Just.Player.v${versionName}"
     }

diff --git a/app/src/main/java/com/brouken/player/CustomDefaultTrackNameProvider.java b/app/src/main/java/com/brouken/player/CustomDefaultTrackNameProvider.java
@@ -16,10 +16,15 @@ public String getTrackName(Format format) {
         String trackName = super.getTrackName(format);
         if (format.sampleMimeType != null) {
             String sampleFormat = formatNameFromMime(format.sampleMimeType);
-            if (BuildConfig.DEBUG && sampleFormat == null) {
+            if (sampleFormat == null) {
+                sampleFormat = formatNameFromMime(format.codecs);
+            }
+            if (sampleFormat == null) {
                 sampleFormat = format.sampleMimeType;
             }
-            trackName += " (" + sampleFormat + ")";
+            if (sampleFormat != null) {
+                trackName += " (" + sampleFormat + ")";
+            }
         }
         if (format.label != null) {
             if (!trackName.startsWith(format.label)) { // HACK