diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/animedownload/AnimeDownloader.kt b/app/src/main/java/eu/kanade/tachiyomi/data/animedownload/AnimeDownloader.kt index 12d9b75ec..207244d73 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/animedownload/AnimeDownloader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/animedownload/AnimeDownloader.kt @@ -533,7 +533,7 @@ class AnimeDownloader( video.progress = (100 * it.time.toLong() / duration).toInt() } } - val session = FFmpegSession(ffmpegOptions, {}, logCallback, statisticsCallback) + val session = FFmpegSession.create(ffmpegOptions, {}, logCallback, statisticsCallback) val inputDuration = getDuration(ffprobeCommand(video.videoUrl!!, headerOptions)) ?: 0F FFmpegKitConfig.ffmpegExecute(session) @@ -553,7 +553,7 @@ class AnimeDownloader( } private fun getDuration(ffprobeCommand: Array): Float? { - val session = FFprobeSession(ffprobeCommand) + val session = FFprobeSession.create(ffprobeCommand) FFmpegKitConfig.ffprobeExecute(session) return session.allLogsAsString.trim().toFloatOrNull() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt index ac509c704..6a21681f3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt @@ -272,7 +272,11 @@ class PlayerControlsView @JvmOverloads constructor(context: Context, attrs: Attr if (binding.cycleDecoderBtn.visibility != View.VISIBLE && binding.cycleDecoderBtn.visibility != View.VISIBLE) { return } - binding.cycleDecoderBtn.text = if (activity.player.hwdecActive) "HW" else "SW" + binding.cycleDecoderBtn.text = when (activity.player.hwdecActive) { + "mediacodec" -> "HW+" + "no" -> "SW" + else -> "HW" + } } internal fun updateSpeedButton() { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7fa1c7c76..e54cfd2df 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -99,9 +99,9 @@ voyager-transitions = { module = "ca.gosyer:voyager-transitions", version.ref = numberpicker= "com.chargemap.compose:numberpicker:1.0.3" -ffmpeg-kit = "com.github.jmir1:ffmpeg-kit:4.5.1-1.3.LTS" +ffmpeg-kit = "com.github.jmir1:ffmpeg-kit:5.1.LTS" arthenica-smartexceptions = "com.arthenica:smart-exception-java:0.1.1" -aniyomi-mpv = "com.github.jmir1:aniyomi-mpv-lib:1.4" +aniyomi-mpv = "com.github.jmir1:aniyomi-mpv-lib:1.6" [bundles] reactivex = ["rxandroid", "rxjava", "rxrelay"]