Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-07-26 22:42:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Enhance audio and subtitle track selection logic for improved reliability

Browse source
This commit is contained in:
tapframe 2026-03-29 15:19:52 +05:30
parent 0c4b81599d
commit b669c3ddfd
2 changed files with 77 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt
View file

@ -312,6 +312,28 @@ fun PlayerScreen(
}
}
LaunchedEffect(
playerController,
playbackSnapshot.isLoading,
preferredAudioSelectionApplied,
preferredSubtitleSelectionApplied,
) {
if (playerController == null || playbackSnapshot.isLoading) {
return@LaunchedEffect
}
if (preferredAudioSelectionApplied && preferredSubtitleSelectionApplied) {
return@LaunchedEffect
}
repeat(10) {
refreshTracks()
if (preferredAudioSelectionApplied && preferredSubtitleSelectionApplied) {
return@LaunchedEffect
}
delay(300)
}
}
LaunchedEffect(playerController, playbackSnapshot.isLoading, initialPositionMs, initialSeekApplied) {
val controller = playerController ?: return@LaunchedEffect
if (initialSeekApplied || playbackSnapshot.isLoading || initialPositionMs <= 0L) {

64
composeApp/src/iosMain/kotlin/com/nuvio/app/features/player/PlayerEngine.ios.kt
View file

@ -104,10 +104,25 @@ actual fun PlatformPlayerSurface(
}
override fun selectAudioTrack(index: Int) {
// Convert from list index to mpv track id
// Convert from logical track index to mpv track id
val count = bridge.getAudioTrackCount()
if (index in 0 until count) {
val trackId = bridge.getAudioTrackId(index).toIntOrNull() ?: (index + 1)
if (count <= 0) return
val trackId = (0 until count)
.firstNotNullOfOrNull { at ->
if (bridge.getAudioTrackIndex(at) == index) {
bridge.getAudioTrackId(at).toIntOrNull()
} else {
null
}
}
?: if (index in 0 until count) {
bridge.getAudioTrackId(index).toIntOrNull() ?: (index + 1)
} else {
null
}
if (trackId != null) {
bridge.selectAudioTrack(trackId)
}
}
@ -117,8 +132,23 @@ actual fun PlatformPlayerSurface(
bridge.selectSubtitleTrack(-1) // disable
} else {
val count = bridge.getSubtitleTrackCount()
if (index in 0 until count) {
val trackId = bridge.getSubtitleTrackId(index).toIntOrNull() ?: (index + 1)
if (count <= 0) return
val trackId = (0 until count)
.firstNotNullOfOrNull { at ->
if (bridge.getSubtitleTrackIndex(at) == index) {
bridge.getSubtitleTrackId(at).toIntOrNull()
} else {
null
}
}
?: if (index in 0 until count) {
bridge.getSubtitleTrackId(index).toIntOrNull() ?: (index + 1)
} else {
null
}
if (trackId != null) {
bridge.selectSubtitleTrack(trackId)
}
}
@ -134,11 +164,27 @@ actual fun PlatformPlayerSurface(
}
override fun clearExternalSubtitleAndSelect(trackIndex: Int) {
val trackId = if (trackIndex < 0) -1 else {
val trackId = if (trackIndex < 0) {
-1
} else {
val count = bridge.getSubtitleTrackCount()
if (trackIndex in 0 until count) {
bridge.getSubtitleTrackId(trackIndex).toIntOrNull() ?: (trackIndex + 1)
} else trackIndex + 1
if (count <= 0) {
trackIndex + 1
} else {
(0 until count)
.firstNotNullOfOrNull { at ->
if (bridge.getSubtitleTrackIndex(at) == trackIndex) {
bridge.getSubtitleTrackId(at).toIntOrNull()
} else {
null
}
}
?: if (trackIndex in 0 until count) {
bridge.getSubtitleTrackId(trackIndex).toIntOrNull() ?: (trackIndex + 1)
} else {
trackIndex + 1
}
}
}
bridge.clearExternalSubtitleAndSelect(trackId)
}