justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-09 16:11:20 +02:00
Code Issues Projects Packages Wiki Activity Actions

Buffer position, better resume, & non-external title

Browse source
This commit is contained in:
Damontecres 2025-11-07 17:15:45 -05:00
parent 2642c60c80
commit 123d348819
No known key found for this signature in database
1 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

43
app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt
View file

@ -274,7 +274,6 @@ class MpvPlayer(
} }
override fun stop() { override fun stop() {
// TODO
throwIfReleased() throwIfReleased()
if (DEBUG) Timber.v("stop") if (DEBUG) Timber.v("stop")
pause() pause()
@ -390,13 +389,12 @@ class MpvPlayer(
override fun getBufferedPosition(): Long { override fun getBufferedPosition(): Long {
if (DEBUG) Timber.v("getBufferedPosition") if (DEBUG) Timber.v("getBufferedPosition")
// TODO return currentPosition + totalBufferedDuration
return currentPosition
} }
override fun getTotalBufferedDuration(): Long { override fun getTotalBufferedDuration(): Long {
if (DEBUG) Timber.v("getTotalBufferedDuration") if (DEBUG) Timber.v("getTotalBufferedDuration")
return bufferedPosition return MPVLib.getPropertyDouble("demuxer-cache-duration")?.seconds?.inWholeMilliseconds ?: 0
} }
override fun isPlayingAd(): Boolean { override fun isPlayingAd(): Boolean {
@ -412,9 +410,7 @@ class MpvPlayer(
override fun getContentBufferedPosition(): Long = bufferedPosition override fun getContentBufferedPosition(): Long = bufferedPosition
override fun getAudioAttributes(): AudioAttributes { override fun getAudioAttributes(): AudioAttributes = throw UnsupportedOperationException()
TODO("Not yet implemented")
}
override fun setVolume(volume: Float) { override fun setVolume(volume: Float) {
} }
@ -477,7 +473,6 @@ class MpvPlayer(
override fun getDeviceInfo(): DeviceInfo { override fun getDeviceInfo(): DeviceInfo {
if (DEBUG) Timber.v("getDeviceInfo") if (DEBUG) Timber.v("getDeviceInfo")
// TODO
return DeviceInfo.Builder(DeviceInfo.PLAYBACK_TYPE_REMOTE).build() return DeviceInfo.Builder(DeviceInfo.PLAYBACK_TYPE_REMOTE).build()
} }
@ -578,10 +573,6 @@ class MpvPlayer(
when (eventId) { when (eventId) {
MPV_EVENT_FILE_LOADED -> { MPV_EVENT_FILE_LOADED -> {
Timber.d("event: MPV_EVENT_FILE_LOADED") Timber.d("event: MPV_EVENT_FILE_LOADED")
if (startPositionMs > 0) {
Timber.d("Seeking to $startPositionMs")
seekTo(startPositionMs)
}
mediaItem!!.localConfiguration?.subtitleConfigurations?.forEach { mediaItem!!.localConfiguration?.subtitleConfigurations?.forEach {
val url = it.uri.toString() val url = it.uri.toString()
Timber.v("Adding external subtitle track $url") Timber.v("Adding external subtitle track $url")
@ -633,7 +624,20 @@ class MpvPlayer(
private fun loadFile() { private fun loadFile() {
val url = mediaItem!!.localConfiguration?.uri.toString() val url = mediaItem!!.localConfiguration?.uri.toString()
MPVLib.command(arrayOf("loadfile", url)) if (startPositionMs > 0) {
MPVLib.command(
arrayOf(
"loadfile",
url,
"replace",
"-1",
"start=${startPositionMs / 1000.0}",
),
)
} else {
MPVLib.command(arrayOf("loadfile", url, "replace", "-1"))
}
MPVLib.setPropertyString("vo", "gpu") MPVLib.setPropertyString("vo", "gpu")
Timber.d("Called loadfile") Timber.d("Called loadfile")
} }
@ -665,12 +669,13 @@ class MpvPlayer(
val lang = MPVLib.getPropertyString("track-list/$idx/lang") val lang = MPVLib.getPropertyString("track-list/$idx/lang")
val codec = MPVLib.getPropertyString("track-list/$idx/codec") val codec = MPVLib.getPropertyString("track-list/$idx/codec")
val codecDescription = MPVLib.getPropertyString("track-list/$idx/codec-desc") val codecDescription = MPVLib.getPropertyString("track-list/$idx/codec-desc")
val title = MPVLib.getPropertyString("track-list/$idx/title")
val isDefault = MPVLib.getPropertyBoolean("track-list/$idx/default") ?: false val isDefault = MPVLib.getPropertyBoolean("track-list/$idx/default") ?: false
val isForced = MPVLib.getPropertyBoolean("track-list/$idx/forced") ?: false val isForced = MPVLib.getPropertyBoolean("track-list/$idx/forced") ?: false
val isExternal = MPVLib.getPropertyBoolean("track-list/$idx/external") ?: false val isExternal = MPVLib.getPropertyBoolean("track-list/$idx/external") ?: false
val isSelected = MPVLib.getPropertyBoolean("track-list/$idx/selected") ?: false val isSelected = MPVLib.getPropertyBoolean("track-list/$idx/selected") ?: false
val channelCount = MPVLib.getPropertyInt("track-list/$idx/demux-channel-count") val channelCount = MPVLib.getPropertyInt("track-list/$idx/demux-channel-count")
val title =
if (type != "sub" || !isExternal) MPVLib.getPropertyString("track-list/$idx/title") else null
if (type != null && id != null) { if (type != null && id != null) {
// TODO do we need the real mimetypes? // TODO do we need the real mimetypes?
@ -691,10 +696,12 @@ class MpvPlayer(
.setCodecs(codec) .setCodecs(codec)
.setSampleMimeType(mimeType) .setSampleMimeType(mimeType)
.setLanguage(lang) .setLanguage(lang)
// TODO title contains apikey for external subtitles .setLabel(listOfNotNull(title, codecDescription).joinToString(","))
// .setLabel(listOfNotNull(title, codecDescription).joinToString(","))
.setLabel(codecDescription)
.setSelectionFlags(flags) .setSelectionFlags(flags)
if (type == "video" && isSelected) {
builder.setWidth(MPVLib.getPropertyInt("width") ?: -1)
builder.setHeight(MPVLib.getPropertyInt("height") ?: -1)
}
channelCount?.let(builder::setChannelCount) channelCount?.let(builder::setChannelCount)
val format = builder.build() val format = builder.build()
@ -715,6 +722,6 @@ class MpvPlayer(
} }
override fun onTrackSelectionsInvalidated() { override fun onTrackSelectionsInvalidated() {
TODO("Not yet implemented") // no-op
} }
} }