Optimize memory usage + Migrate from ExoPlayer to androidx:media3 + Upgrade FFmpeg to 6.0 + Memory optimizations

Author: vkryl

.gitmodules

@@ -16,16 +16,16 @@
 	path = app/jni/third_party/ffmpeg
 	url = https://github.com/FFmpeg/FFmpeg
 	shallow = true
-	branch = release/4.4
+	branch = release/6.0
 [submodule "lz4"]
 	path = app/jni/third_party/lz4
 	url = https://github.com/lz4/lz4
 	shallow = true
-[submodule "ExoPlayer"]
-	path = thirdparty/ExoPlayer
-	url = https://github.com/google/ExoPlayer
+[submodule "androidx-media"]
+	path = thirdparty/androidx-media
+	url = https://github.com/androidx/media
 	shallow = true
-	branch = release-v2
+	branch = release
 [submodule "flac"]
 	path = app/jni/third_party/flac
 	url = https://github.com/xiph/flac

app/build.gradle.kts

@@ -77,8 +77,8 @@ android {
       "./jni/third_party/webrtc/sdk/android/src/java",
       "../thirdparty/WebRTC/src/java"
     )
-    Config.EXOPLAYER_EXTENSIONS.forEach { module ->
-      java.srcDirs("../thirdparty/ExoPlayer/extensions/${module}/src/main/java")
+    Config.ANDROIDX_MEDIA_EXTENSIONS.forEach { extension ->
+      java.srcDirs("../thirdparty/androidx-media/libraries/${extension}/src/main/java")
     }
   }
 
@@ -89,10 +89,12 @@ android {
 
   buildTypes {
     getByName("release") {
-      Config.EXOPLAYER_EXTENSIONS.forEach { module ->
-        val proguardFile = file("../thirdparty/ExoPlayer/extensions/${module}/proguard-rules.txt")
+      Config.ANDROIDX_MEDIA_EXTENSIONS.forEach { extension ->
+        val proguardFile = file(
+          "../thirdparty/androidx-media/libraries/${extension}/proguard-rules.txt"
+        )
         if (proguardFile.exists()) {
-          project.logger.lifecycle("Applying thirdparty/ExoPlayer/extensions/${module}/proguard-rules.pro")
+          project.logger.lifecycle("Applying ${proguardFile.path}")
           proguardFile(proguardFile)
         }
       }
@@ -224,8 +226,8 @@ dependencies {
   implementation("com.google.firebase:firebase-appcheck-safetynet:16.1.2")
   // Play In-App Updates: https://developer.android.com/reference/com/google/android/play/core/release-notes-in_app_updates
   implementation("com.google.android.play:app-update:2.1.0")
-  // ExoPlayer: https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md
-  implementation("com.google.android.exoplayer:exoplayer-core:2.19.1")
+  // AndroidX/media: https://github.com/androidx/media/blob/release/RELEASENOTES.md
+  implementation("androidx.media3:media3-exoplayer:1.2.1")
   // 17.x version requires minSdk 19 or higher
   implementation("com.google.mlkit:language-id:16.1.1")
   // The Checker Framework: https://checkerframework.org/CHANGELOG.md

app/jni/BuildFlac.cmake

@@ -1,9 +1,9 @@
 # flac
 
 set(FLAC_DIR "${THIRDPARTY_DIR}/flac")
-set(EXO_FLAC_DIR "${CMAKE_HOME_DIRECTORY}/../../thirdparty/ExoPlayer/extensions/flac/src/main/jni")
+set(ANDROIDX_MEDIA_FLAC_DIR "${CMAKE_HOME_DIRECTORY}/../../thirdparty/androidx-media/libraries/decoder_flac/src/main/jni")
 
-ReadVariables("${EXO_FLAC_DIR}/flac_sources.mk")
+ReadVariables("${ANDROIDX_MEDIA_FLAC_DIR}/flac_sources.mk")
 list(FILTER FLAC_SOURCES INCLUDE REGEX "^flac/.+$")
 Transform(FLAC_SOURCES "^flac/" "${FLAC_DIR}/")
 

app/jni/CMakeLists.txt

@@ -210,17 +210,17 @@ add_library(${NATIVE_LIB} SHARED
   gif.cpp
   views.c
 
-  "${THIRDPARTY_DIR}/exoplayer/opus_jni.cc"
-  "${THIRDPARTY_DIR}/exoplayer/flac_jni.cc"
-  "${THIRDPARTY_DIR}/exoplayer/flac_parser.cc"
-  "${THIRDPARTY_DIR}/exoplayer/ffmpeg_jni.cc"
-  "${THIRDPARTY_DIR}/exoplayer/vpx_jni.cc"
+  "${THIRDPARTY_DIR}/androidx-media/opus_jni.cc"
+  "${THIRDPARTY_DIR}/androidx-media/flac_jni.cc"
+  "${THIRDPARTY_DIR}/androidx-media/flac_parser.cc"
+  "${THIRDPARTY_DIR}/androidx-media/ffmpeg_jni.cc"
+  "${THIRDPARTY_DIR}/androidx-media/vpx_jni.cc"
 
   bridge.cpp
 )
 target_include_directories(${NATIVE_LIB} PRIVATE
   "${THIRDPARTY_DIR}/telegram_intro"
-  "${THIRDPARTY_DIR}/exoplayer"
+  "${THIRDPARTY_DIR}/androidx-media"
 
   "${THIRDPARTY_DIR}"
   .
@@ -247,7 +247,7 @@ target_compile_options(${NATIVE_LIB} PUBLIC
   -fno-rtti
 )
 # TODO: remove -Wno-macro-redefined -Wno-unused-variable
-# only "${THIRDPARTY_DIR}/exoplayer/ffmpeg_jni.cc" needs them.
+# only "${THIRDPARTY_DIR}/androidx-media/ffmpeg_jni.cc" needs them.
 
 # == Linking dependencies ==
 

app/jni/cmake/ReadVariables.cmake

@@ -8,6 +8,9 @@ if(POLICY CMP0007)
 endif()
 
 function(ReadVariables MKFile)
+  if(NOT EXISTS "${MKFile}")
+    message(FATAL_ERROR "File does not exist: ${MKFile}")
+  endif()
   file(READ "${MKFile}" FileContents)
   string(REGEX REPLACE "\\\\\n *" " " FileContents ${FileContents})
   string(REGEX REPLACE "#[^\n]*" "" FileContents ${FileContents})