Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-06 10:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aspect ratio improvements

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-07-10 03:15:15 +02:00
parent 5f858bc6d4
commit 1e21c50b5d
7 changed files with 56 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Model/Player/Backends/AVPlayerBackend.swift
View File

@@ -34,10 +34,13 @@ final class AVPlayerBackend: PlayerBackend {
}
var aspectRatio: Double {
#if os(tvOS)
VideoPlayerView.defaultAspectRatio
#if os(iOS)
guard let view = model?.playerLayerView else { return VideoPlayerView.defaultAspectRatio }
let videoRect = view.playerLayer.videoRect
return videoRect.width / videoRect.height
#else
controller?.aspectRatio ?? VideoPlayerView.defaultAspectRatio
VideoPlayerView.defaultAspectRatio
#endif
}
@@ -306,36 +309,38 @@ final class AVPlayerBackend: PlayerBackend {
try? AVAudioSession.sharedInstance().setActive(true)
#endif
if self.isAutoplaying(self.model.playerItem!) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
guard let self = self else {
return
}
self.setRate(self.model.currentRate)
if !preservingTime,
let segment = self.model.sponsorBlock.segments.first,
segment.start < 3,
self.model.lastSkipped.isNil
{
self.avPlayer.seek(
to: segment.endTime,
toleranceBefore: .secondsInDefaultTimescale(1),
toleranceAfter: .zero
) { finished in
guard finished else {
return
}
guard let item = self.model.playerItem, self.isAutoplaying(item) else { return }
self.model.lastSkipped = segment
self.model.play()
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
guard let self = self else {
return
}
self.model.aspectRatio = self.aspectRatio
if !preservingTime,
let segment = self.model.sponsorBlock.segments.first,
segment.start < 3,
self.model.lastSkipped.isNil
{
self.avPlayer.seek(
to: segment.endTime,
toleranceBefore: .secondsInDefaultTimescale(1),
toleranceAfter: .zero
) { finished in
guard finished else {
return
}
} else {
self.model.lastSkipped = segment
self.model.play()
}
} else {
self.model.play()
}
}
self.setRate(self.model.currentRate)
}
let replaceItemAndSeek = {

2
Model/Player/Backends/MPVBackend.swift
View File

@@ -204,9 +204,11 @@ final class MPVBackend: PlayerBackend {
self.model.lastSkipped = segment
self.play()
self.model.aspectRatio = self.aspectRatio
}
} else {
self.play()
self.model.aspectRatio = self.aspectRatio
}
}
}