优化rtsp

kingslay · Oct 16, 2023 · d9d1462 · d9d1462
1 parent d7fe33c
commit d9d1462
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/Demo/SwiftUI/Shared/MovieModel.swift b/Demo/SwiftUI/Shared/MovieModel.swift
@@ -23,8 +23,8 @@ class MEOptions: KSOptions {
     override func process(assetTrack: some MediaPlayerTrack) {
         if assetTrack.mediaType == .video {
             if [FFmpegFieldOrder.bb, .bt, .tt, .tb].contains(assetTrack.fieldOrder) {
-                videoFilters.append("yadif=mode=0:parity=-1:deint=1")
-                hardwareDecode = false
+                videoFilters.append("yadif_videotoolbox=mode=0:parity=-1:deint=1")
+                asynchronousDecompression = false
             }
             #if os(tvOS) || os(xrOS)
             runInMainqueue { [weak self] in
@@ -345,9 +345,11 @@ extension KSVideoPlayerView {
         }
         // There is total different meaning for 'listen_timeout' option in rtmp
         // set 'listen_timeout' = -1 for rtmp、rtsp
-        if url.absoluteString.starts(with: "rtmp") || url.absoluteString.starts(with: "rtsp") {
+        if url.scheme == "rtmp" || url.scheme == "rtsp" {
             options.formatContextOptions["listen_timeout"] = -1
-            options.formatContextOptions["fflags"] = ["nobuffer", "autobsf"]
+            options.formatContextOptions["fflags"] = ["nobuffer"]
+            options.preferredForwardBufferDuration = 2
+            options.hardwareDecode = false
         } else {
             options.formatContextOptions["listen_timeout"] = 3
         }

diff --git a/Demo/demo-iOS/demo-iOS/AppDelegate.swift b/Demo/demo-iOS/demo-iOS/AppDelegate.swift
@@ -98,8 +98,8 @@ class MEOptions: KSOptions {
     override func process(assetTrack: some MediaPlayerTrack) {
         if assetTrack.mediaType == .video {
             if [FFmpegFieldOrder.bb, .bt, .tt, .tb].contains(assetTrack.fieldOrder) {
-                videoFilters.append("yadif=mode=0:parity=-1:deint=1")
-                hardwareDecode = false
+                videoFilters.append("yadif_videotoolbox=mode=0:parity=-1:deint=1")
+                asynchronousDecompression = false
             }
             #if os(tvOS) || os(xrOS)
             runInMainqueue { [weak self] in

diff --git a/Sources/KSPlayer/AVPlayer/KSOptions.swift b/Sources/KSPlayer/AVPlayer/KSOptions.swift
@@ -167,7 +167,7 @@ open class KSOptions {
                 return true
             }
             // 处理视频轨道一致没有值的问题(纯音频)
-            if capacity.mediaType == .video && capacity.frameCount == 0 && capacity.packetCount == 0 {
+            if capacitys.count > 1, capacity.mediaType == .video && capacity.frameCount == 0 && capacity.packetCount == 0 {
                 return true
             }
             guard capacity.frameCount >= capacity.frameMaxCount >> 2 else {

diff --git a/Sources/KSPlayer/MEPlayer/MEPlayerItem.swift b/Sources/KSPlayer/MEPlayer/MEPlayerItem.swift
@@ -83,7 +83,7 @@ final class MEPlayerItem {
         }
     }
 
-    private lazy var timer: Timer = .scheduledTimer(withTimeInterval: 0.02, repeats: true) { [weak self] _ in
+    private lazy var timer: Timer = .scheduledTimer(withTimeInterval: 0.05, repeats: true) { [weak self] _ in
         self?.codecDidChangeCapacity()
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,7 @@ final class MEPlayerItem { @@
             }
         }
-        private lazy var timer: Timer = .scheduledTimer(withTimeInterval: 0.02, repeats: true) { [weak self] _ in
+        private lazy var timer: Timer = .scheduledTimer(withTimeInterval: 0.05, repeats: true) { [weak self] _ in
             self?.codecDidChangeCapacity()
         }
@@ Expand Down @@