修改wantedAudio

kingslay · Nov 29, 2023 · f895ff0 · f895ff0
1 parent 17f87e4
commit f895ff0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 24 deletions.
diff --git a/Package.resolved b/Package.resolved
diff --git a/Sources/KSPlayer/AVPlayer/KSOptions.swift b/Sources/KSPlayer/AVPlayer/KSOptions.swift
@@ -213,15 +213,16 @@ open class KSOptions {
     }
 
     ///  wanted video stream index, or nil for automatic selection
-    /// - Parameter : video bitRate
-    /// - Returns: The index of the bitRates
-    open func wantedVideo(tracks _: [MediaPlayerTrack]) -> Int?{
+    /// - Parameter : video track
+    /// - Returns: The index of the track
+    open func wantedVideo(tracks _: [MediaPlayerTrack]) -> Int? {
         nil
     }
+
     /// wanted audio stream index, or nil for automatic selection
-    /// - Parameter :  audio bitRate and language
-    /// - Returns: The index of the infos
-    open func wantedAudio(infos _: [(bitRate: Int64, language: String?)]) -> Int? {
+    /// - Parameter :  audio track
+    /// - Returns: The index of the track
+    open func wantedAudio(tracks _: [MediaPlayerTrack]) -> Int? {
         nil
     }
 

diff --git a/Sources/KSPlayer/MEPlayer/MEPlayerItem.swift b/Sources/KSPlayer/MEPlayer/MEPlayerItem.swift
@@ -349,9 +349,6 @@ extension MEPlayerItem {
         var videoIndex: Int32 = -1
         if !options.videoDisable {
             let videos = assetTracks.filter { $0.mediaType == .video }
-            let bitRates = videos.map(\.bitRate).filter {
-                $0 > 0
-            }
             let wantedStreamNb: Int32
             if !videos.isEmpty, let index = options.wantedVideo(tracks: videos) {
                 wantedStreamNb = videos[index].trackID
@@ -385,6 +382,9 @@ extension MEPlayerItem {
                 if first.codecpar.codec_id != AV_CODEC_ID_MJPEG {
                     videoAudioTracks.append(track)
                 }
+                let bitRates = videos.map(\.bitRate).filter {
+                    $0 > 0
+                }
                 if bitRates.count > 1, options.videoAdaptable {
                     let bitRateState = VideoAdaptationState.BitRateState(bitRate: first.bitRate, time: CACurrentMediaTime())
                     videoAdaptation = VideoAdaptationState(bitRates: bitRates.sorted(by: <), duration: duration, fps: first.nominalFrameRate, bitRateStates: [bitRateState])
@@ -394,7 +394,7 @@ extension MEPlayerItem {
 
         let audios = assetTracks.filter { $0.mediaType == .audio }
         let wantedStreamNb: Int32
-        if !audios.isEmpty, let index = options.wantedAudio(infos: audios.map { ($0.bitRate, $0.language) }) {
+        if !audios.isEmpty, let index = options.wantedAudio(tracks: audios) {
             wantedStreamNb = audios[index].trackID
         } else {
             wantedStreamNb = -1