优化代码

kingslay · Jan 6, 2024 · be2e1a7 · be2e1a7
1 parent c02dca4
commit be2e1a7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/Sources/KSPlayer/AVPlayer/KSOptions.swift b/Sources/KSPlayer/AVPlayer/KSOptions.swift
@@ -321,7 +321,11 @@ open class KSOptions {
                 var yadifMode = KSOptions.yadifMode
                 if let assetTrack = assetTrack as? FFmpegAssetTrack {
                     if assetTrack.realFrameRate.num == 2 * assetTrack.avgFrameRate.num, assetTrack.realFrameRate.den == assetTrack.avgFrameRate.den {
-                        yadifMode = 0
+                        if yadifMode == 1 {
+                            yadifMode = 0
+                        } else if yadifMode == 3 {
+                            yadifMode = 2
+                        }
                     }
                 }
                 videoFilters.append("\(yadif)=mode=\(yadifMode):parity=-1:deint=1")

diff --git a/Sources/KSPlayer/MEPlayer/MetalPlayView.swift b/Sources/KSPlayer/MEPlayer/MetalPlayView.swift
@@ -41,13 +41,12 @@ public final class MetalPlayView: UIView, VideoOutput {
     private var fps = Float(60) {
         didSet {
             if fps != oldValue {
-                let preferredFramesPerSecond = Int(ceil(fps))
-                displayLink.preferredFramesPerSecond = preferredFramesPerSecond << 1
-                #if os(iOS)
-                if #available(iOS 15.0, tvOS 15.0, *) {
-                    displayLink.preferredFrameRateRange = CAFrameRateRange(minimum: Float(preferredFramesPerSecond), maximum: Float(preferredFramesPerSecond << 1))
+                let preferredFramesPerSecond = ceil(fps)
+                if #available(iOS 15.0, tvOS 15.0, macOS 14.0, *) {
+                    displayLink.preferredFrameRateRange = CAFrameRateRange(minimum: preferredFramesPerSecond, maximum: 2 * preferredFramesPerSecond, __preferred: preferredFramesPerSecond)
+                } else {
+                    displayLink.preferredFramesPerSecond = Int(preferredFramesPerSecond) << 1
                 }
-                #endif
                 options.updateVideo(refreshRate: fps, isDovi: isDovi, formatDescription: formatDescription)
             }
         }
@@ -363,6 +362,14 @@ class CADisplayLink {
     private var runloop: RunLoop?
     private var mode = RunLoop.Mode.default
     public var preferredFramesPerSecond = 60
+    @available(macOS 12.0, *)
+    public var preferredFrameRateRange: CAFrameRateRange {
+        get {
+            CAFrameRateRange()
+        }
+        set {}
+    }
+
     public var timestamp: TimeInterval {
         var timeStamp = CVTimeStamp()
         if CVDisplayLinkGetCurrentTime(displayLink, &timeStamp) == kCVReturnSuccess, (timeStamp.flags & CVTimeStampFlags.hostTimeValid.rawValue) != 0 {