Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-09-19 17:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaked A/V-sync for MPV

Browse Source 
Signed-off-by: Toni Förster <toni.foerster@gmail.com>
This commit is contained in:
Toni Förster 2024-09-16 10:02:34 +02:00
parent 8596ee8811
commit 2bf9b78bff
No known key found for this signature in database
GPG Key ID: 292F3E5086C83FC7
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Model/Player/Backends/MPVClient.swift
View File

@ -79,6 +79,8 @@ final class MPVClient: ObservableObject {
checkError(mpv_set_option_string(mpv, "user-agent", UserAgentManager.shared.userAgent)) checkError(mpv_set_option_string(mpv, "user-agent", UserAgentManager.shared.userAgent))
checkError(mpv_set_option_string(mpv, "initial-audio-sync", Defaults[.mpvInitialAudioSync] ? "yes" : "no")) checkError(mpv_set_option_string(mpv, "initial-audio-sync", Defaults[.mpvInitialAudioSync] ? "yes" : "no"))
// A/V-SYNC //
// Enable VSYNC – needed for `video-sync` // Enable VSYNC – needed for `video-sync`
checkError(mpv_set_option_string(mpv, "opengl-swapinterval", "1")) checkError(mpv_set_option_string(mpv, "opengl-swapinterval", "1"))
checkError(mpv_set_option_string(mpv, "video-sync", "display-resample")) checkError(mpv_set_option_string(mpv, "video-sync", "display-resample"))
@ -87,6 +89,11 @@ final class MPVClient: ObservableObject {
checkError(mpv_set_option_string(mpv, "tscale-window", "blackman")) checkError(mpv_set_option_string(mpv, "tscale-window", "blackman"))
checkError(mpv_set_option_string(mpv, "vd-lavc-framedrop", "nonref")) checkError(mpv_set_option_string(mpv, "vd-lavc-framedrop", "nonref"))
checkError(mpv_set_option_string(mpv, "display-fps-override", "\(String(getScreenRefreshRate()))")) checkError(mpv_set_option_string(mpv, "display-fps-override", "\(String(getScreenRefreshRate()))"))
checkError(mpv_set_option_string(mpv, "video-sync-max-factor", "1.1"))
checkError(mpv_set_option_string(mpv, "video-sync-max-video-change", "10"))
checkError(mpv_set_option_string(mpv, "audio-buffer", "0.2"))
checkError(mpv_set_option_string(mpv, "audio-wait-open", "no"))
checkError(mpv_set_option_string(mpv, "force-window", "yes"))
// CPU // // CPU //

19
Model/Player/PlayerModel.swift
View File

@ -269,6 +269,15 @@ final class PlayerModel: ObservableObject {
} }
#endif #endif
DispatchQueue.global(qos: .userInteractive).async { [weak self] in
guard let self else { return }
if !self.musicMode, self.activeBackend == .mpv {
self.mpvBackend.setVideoToAuto()
self.mpvBackend.controls.resetTimer()
}
}
presentingPlayer = true presentingPlayer = true
#if os(macOS) #if os(macOS)
@ -290,6 +299,9 @@ final class PlayerModel: ObservableObject {
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in
Delay.by(0.3) { Delay.by(0.3) {
self?.exitFullScreen(showControls: false) self?.exitFullScreen(showControls: false)
if self?.activeBackend == .mpv, !(self?.musicMode ?? false) {
self?.mpvBackend.setVideoToNo()
}
} }
} }
@ -1013,10 +1025,9 @@ final class PlayerModel: ObservableObject {
#else #else
func handleEnterForeground() { func handleEnterForeground() {
DispatchQueue.global(qos: .userInteractive).async { [weak self] in DispatchQueue.global(qos: .userInteractive).async { [weak self] in
guard let self = self else { return } guard let self else { return }
if !self.musicMode, self.activeBackend == .mpv { if !self.musicMode, self.activeBackend == .mpv, presentingPlayer {
self.mpvBackend.addVideoTrackFromStream()
self.mpvBackend.setVideoToAuto() self.mpvBackend.setVideoToAuto()
self.mpvBackend.controls.resetTimer() self.mpvBackend.controls.resetTimer()
} else if !self.musicMode, self.activeBackend == .appleAVPlayer { } else if !self.musicMode, self.activeBackend == .appleAVPlayer {
@ -1047,7 +1058,7 @@ final class PlayerModel: ObservableObject {
pause() pause()
} else if !playingInPictureInPicture, activeBackend == .appleAVPlayer { } else if !playingInPictureInPicture, activeBackend == .appleAVPlayer {
avPlayerBackend.removePlayerFromLayer() avPlayerBackend.removePlayerFromLayer()
} else if activeBackend == .mpv, !musicMode { } else if activeBackend == .mpv, !musicMode, presentingPlayer {
mpvBackend.setVideoToNo() mpvBackend.setVideoToNo()
} }
} }