Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

chore: checkpoint ffmpeg signature support

David Nashashbfbc338372cd
diff --git a/player/src/main/java/com/streamvault/player/playback/FfmpegExtensionSupport.kt b/player/src/main/java/com/streamvault/player/playback/FfmpegExtensionSupport.kt
index fc9a0132..deebb5d6 100644
--- a/player/src/main/java/com/streamvault/player/playback/FfmpegExtensionSupport.kt
+++ b/player/src/main/java/com/streamvault/player/playback/FfmpegExtensionSupport.kt
@@ -56,7 +56,13 @@ internal class ReflectiveFfmpegLibrary(
fun supportsFormat(mimeType: String?): Boolean {
if (mimeType.isNullOrBlank()) return false
val libraryClass = libraryClassProvider() ?: return false
- return invokeBooleanStatic(libraryClass, "supportsFormat", mimeType.trim()) ?: false
+ val normalizedMimeType = mimeType.trim()
+ return invokeBooleanStatic(
+ clazz = libraryClass,
+ methodName = "supportsFormat",
+ parameterTypes = arrayOf(String::class.java, String::class.java),
+ args = arrayOf(normalizedMimeType, null)
+ ) ?: invokeBooleanStatic(libraryClass, "supportsFormat", normalizedMimeType) ?: false
}
private fun invokeBooleanStatic(clazz: Class<*>, methodName: String, vararg args: Any): Boolean? =
@@ -65,6 +71,16 @@ internal class ReflectiveFfmpegLibrary(
clazz.getMethod(methodName, *parameterTypes).invoke(null, *args) as? Boolean
}.getOrNull()
+ private fun invokeBooleanStatic(
+ clazz: Class<*>,
+ methodName: String,
+ parameterTypes: Array<Class<*>>,
+ args: Array<Any?>
+ ): Boolean? =
+ runCatching {
+ clazz.getMethod(methodName, *parameterTypes).invoke(null, *args) as? Boolean
+ }.getOrNull()
+
private fun invokeStringStatic(clazz: Class<*>, methodName: String): String? =
runCatching {
clazz.getMethod(methodName).invoke(null) as? String
diff --git a/player/src/test/java/com/streamvault/player/playback/FfmpegExtensionSupportTest.kt b/player/src/test/java/com/streamvault/player/playback/FfmpegExtensionSupportTest.kt
index e0637747..f21c9691 100644
--- a/player/src/test/java/com/streamvault/player/playback/FfmpegExtensionSupportTest.kt
+++ b/player/src/test/java/com/streamvault/player/playback/FfmpegExtensionSupportTest.kt
@@ -36,6 +36,28 @@ class FfmpegExtensionSupportTest {
.containsExactly("audio/eac3")
}
+ @Test
+ fun `supports format delegates to current media3 signature`() {
+ FakeCurrentMedia3FfmpegLibrary.available = true
+ val ffmpegBackedMimeTypes = listOf(
+ "audio/ac3",
+ "audio/eac3",
+ "audio/vnd.dts",
+ "audio/true-hd",
+ "audio/mpeg-L2"
+ )
+ FakeCurrentMedia3FfmpegLibrary.supportedMimeTypes = ffmpegBackedMimeTypes.toMutableSet()
+ val support = FfmpegExtensionSupport(
+ ReflectiveFfmpegLibrary(libraryClassProvider = { FakeCurrentMedia3FfmpegLibrary::class.java })
+ )
+
+ ffmpegBackedMimeTypes.forEach { mimeType ->
+ assertThat(support.supportsFormat(mimeType)).isTrue()
+ }
+ assertThat(support.supportedAudioMimeTypes(ffmpegBackedMimeTypes + "audio/mp4a-latm"))
+ .containsExactlyElementsIn(ffmpegBackedMimeTypes)
+ }
+
object FakeFfmpegLibrary {
@JvmStatic var available: Boolean = false
@JvmStatic var reportedVersion: String? = null
@@ -50,4 +72,19 @@ class FfmpegExtensionSupportTest {
@JvmStatic
fun supportsFormat(mimeType: String): Boolean = available && mimeType in supportedMimeTypes
}
+
+ object FakeCurrentMedia3FfmpegLibrary {
+ @JvmStatic var available: Boolean = false
+ @JvmStatic var supportedMimeTypes: MutableSet<String> = mutableSetOf()
+
+ @JvmStatic
+ fun isAvailable(): Boolean = available
+
+ @JvmStatic
+ fun getVersion(): String? = "6.0-test"
+
+ @JvmStatic
+ fun supportsFormat(mimeType: String, codecs: String?): Boolean =
+ available && codecs == null && mimeType in supportedMimeTypes
+ }
}