mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-26 06:43:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

bump ffmpeg-kit and aniyomi-mpv-lib

Browse source
This commit is contained in:
jmir1 2022-12-19 02:05:17 +01:00
parent 5dffac458d
commit 32d87ece5d
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/animedownload/AnimeDownloader.kt
View file

@ -533,7 +533,7 @@ class AnimeDownloader(
video.progress = (100 * it.time.toLong() / duration).toInt() 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 val inputDuration = getDuration(ffprobeCommand(video.videoUrl!!, headerOptions)) ?: 0F
FFmpegKitConfig.ffmpegExecute(session) FFmpegKitConfig.ffmpegExecute(session)
@ -553,7 +553,7 @@ class AnimeDownloader(
} }
private fun getDuration(ffprobeCommand: Array<String>): Float? { private fun getDuration(ffprobeCommand: Array<String>): Float? {
val session = FFprobeSession(ffprobeCommand) val session = FFprobeSession.create(ffprobeCommand)
FFmpegKitConfig.ffprobeExecute(session) FFmpegKitConfig.ffprobeExecute(session)
return session.allLogsAsString.trim().toFloatOrNull() return session.allLogsAsString.trim().toFloatOrNull()
} }

6
app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt
View file

@ -272,7 +272,11 @@ class PlayerControlsView @JvmOverloads constructor(context: Context, attrs: Attr
if (binding.cycleDecoderBtn.visibility != View.VISIBLE && binding.cycleDecoderBtn.visibility != View.VISIBLE) { if (binding.cycleDecoderBtn.visibility != View.VISIBLE && binding.cycleDecoderBtn.visibility != View.VISIBLE) {
return 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() { internal fun updateSpeedButton() {

4
gradle/libs.versions.toml
View file

@ -99,9 +99,9 @@ voyager-transitions = { module = "ca.gosyer:voyager-transitions", version.ref =
numberpicker= "com.chargemap.compose:numberpicker:1.0.3" 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" 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] [bundles]
reactivex = ["rxandroid", "rxjava", "rxrelay"] reactivex = ["rxandroid", "rxjava", "rxrelay"]