Update AndroidX Media to 1.6.0-alpha01, add MPEG-H audio decoder (lib…

…mpegh r2.0.0)
moneytoo · Dec 21, 2024 · 6166216 · 6166216
1 parent c5f80c8
commit 6166216
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![GitHub all releases](https://img.shields.io/github/downloads/moneytoo/Player/total?logo=github&cacheSeconds=3600)](https://github.com/moneytoo/Player/releases/latest)
 [![Google Play](https://img.shields.io/endpoint?color=green&logo=google-play&url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Dcom.brouken.player%26l%3Ddownloads%26m%3D%24totalinstalls)](https://play.google.com/store/apps/details?id=com.brouken.player)
 [![Google Play](https://img.shields.io/endpoint?color=green&logo=google-play&url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Dcom.brouken.player%26l%3Drating%26m%3D%25E2%2598%2585%2520%24rating)](https://play.google.com/store/apps/details?id=com.brouken.player)
-[![Media3](https://img.shields.io/badge/Media3-1.5.1-007ec6?cacheSeconds=3600)](https://github.com/androidx/media/releases/tag/1.5.1)
+[![Media3](https://img.shields.io/badge/Media3-1.6.0--alpha01-007ec6?cacheSeconds=3600)](https://github.com/androidx/media/releases/tag/1.6.0-alpha01)
 [![Weblate project translated](https://img.shields.io/weblate/progress/just-player?logo=weblate&logoColor=white&cacheSeconds=36000)](https://hosted.weblate.org/engage/just-player/)
 [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/JustPlayer?label=r%2FJustPlayer&logo=reddit&logoColor=white&cacheSeconds=3600)](https://www.reddit.com/r/JustPlayer/)
 
@@ -18,7 +18,7 @@ It properly syncs audio with video track when using Bluetooth earphones/speaker.
 
 ## Supported formats
 
- * **Audio**: Vorbis, Opus, FLAC, ALAC, PCM/WAVE (μ-law, A-law), MP1, MP2, MP3, AMR (NB, WB), AAC (LC, ELD, HE; xHE on Android 9+), AC-3, E-AC-3, DTS, DTS-HD, TrueHD, IAMF
+ * **Audio**: Vorbis, Opus, FLAC, ALAC, PCM/WAVE (μ-law, A-law), MP1, MP2, MP3, AMR (NB, WB), AAC (LC, ELD, HE; xHE on Android 9+), AC-3, E-AC-3, DTS, DTS-HD, TrueHD, IAMF, MPEG-H
  * **Video**: H.263, H.264 AVC (Baseline Profile; Main Profile on Android 6+), H.265 HEVC, MPEG-4 SP, VP8, VP9, AV1
  * **Containers**: MP4, MOV, WebM, MKV, Ogg, MPEG-TS, MPEG-PS, FLV, AVI (🚧)
  * **Streaming**: DASH, HLS, SmoothStreaming, RTSP

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         applicationId "com.brouken.player"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 182
+        versionCode 183
         versionName "0.${versionCode}"
         archivesBaseName = "Just.Player.v${versionName}"
         if (abiFilter) {
@@ -80,7 +80,7 @@ android {
 }
 
 dependencies {
-    def media3_version = '1.5.1'
+    def media3_version = '1.6.0-alpha01'
     def androidxCoreVersion = '1.8.0'
     implementation "androidx.media3:media3-session:$media3_version"
     implementation "androidx.media3:media3-datasource:$media3_version"

diff --git a/app/libs/lib-decoder-mpegh-release.aar b/app/libs/lib-decoder-mpegh-release.aar
diff --git a/app/libs/lib-exoplayer-release.aar b/app/libs/lib-exoplayer-release.aar
diff --git a/app/libs/lib-extractor-release.aar b/app/libs/lib-extractor-release.aar
diff --git a/app/libs/lib-ui-release.aar b/app/libs/lib-ui-release.aar
diff --git a/app/src/main/java/com/brouken/player/CustomDefaultTrackNameProvider.java b/app/src/main/java/com/brouken/player/CustomDefaultTrackNameProvider.java
@@ -79,6 +79,9 @@ private String formatNameFromMime(final String mimeType) {
                 return "AMR-WB";
             case MimeTypes.AUDIO_IAMF:
                 return "IAMF";
+            case MimeTypes.AUDIO_MPEGH_MHA1:
+            case MimeTypes.AUDIO_MPEGH_MHM1:
+                return "MPEG-H";
 
             case MimeTypes.APPLICATION_PGS:
                 return "PGS";