diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0e5fdd9c..cedda08f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -95,12 +95,10 @@ dependencies { implementation(libs.hilt.android) kapt(libs.hilt.compiler) implementation(libs.jellyfin.core) + implementation(libs.libmpv) implementation(libs.material) implementation(libs.timber) - // MPV - implementation(files("libs/libmpv.aar")) - // Media3 FFmpeg decoder implementation(files("libs/lib-decoder-ffmpeg-release.aar")) } diff --git a/app/libs/libmpv.aar b/app/libs/libmpv.aar deleted file mode 100644 index d4b419e7..00000000 Binary files a/app/libs/libmpv.aar and /dev/null differ diff --git a/app/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt b/app/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt index a34e1b38..11eaefe5 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/mpv/MPVPlayer.kt @@ -36,7 +36,7 @@ import androidx.media3.common.util.Size import androidx.media3.common.util.Util import androidx.media3.exoplayer.ExoPlaybackException import dev.jdtech.jellyfin.utils.AppPreferences -import `is`.xyz.mpv.MPVLib +import dev.jdtech.mpv.MPVLib import java.io.File import java.io.FileOutputStream import java.util.concurrent.CopyOnWriteArraySet diff --git a/app/src/main/res/values/string_arrays.xml b/app/src/main/res/values/string_arrays.xml index c18f862e..bc768c8a 100644 --- a/app/src/main/res/values/string_arrays.xml +++ b/app/src/main/res/values/string_arrays.xml @@ -24,9 +24,11 @@ mpeg2video vp8 vp9 + av1 gpu + gpu-next audiotrack diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 18db51b3..e59cb0e9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,6 +20,7 @@ hilt = "2.44.2" jellyfin = "1.4.0" kotlin = "1.8.0" ktlint = "11.0.0" +libmpv = "0.1.0" material = "1.7.0" timber = "5.0.1" @@ -51,6 +52,7 @@ glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } jellyfin-core = { module = "org.jellyfin.sdk:jellyfin-core", version.ref = "jellyfin" } +libmpv = { module = "dev.jdtech.mpv:libmpv", version.ref = "libmpv" } material = { module = "com.google.android.material:material", version.ref = "material" } timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }