fix #618

kingslay · Nov 7, 2023 · 994b6c0 · 994b6c0
1 parent ea924e7
commit 994b6c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/FFmpegKit b/FFmpegKit
diff --git a/Sources/KSPlayer/AVPlayer/KSOptions.swift b/Sources/KSPlayer/AVPlayer/KSOptions.swift
@@ -490,23 +490,18 @@ public extension KSOptions {
     static func outputNumberOfChannels(channelCount: AVAudioChannelCount) -> AVAudioChannelCount {
         let maximumOutputNumberOfChannels = AVAudioChannelCount(AVAudioSession.sharedInstance().maximumOutputNumberOfChannels)
         let preferredOutputNumberOfChannels = AVAudioChannelCount(AVAudioSession.sharedInstance().preferredOutputNumberOfChannels)
-        KSLog("[audio] maximumOutputNumberOfChannels: \(maximumOutputNumberOfChannels)")
-        KSLog("[audio] preferredOutputNumberOfChannels: \(preferredOutputNumberOfChannels)")
         let isSpatialAudioEnabled = isSpatialAudioEnabled(channelCount: channelCount)
-        KSLog("[audio] isSpatialAudioEnabled: \(isSpatialAudioEnabled)")
         let isUseAudioRenderer = KSOptions.audioPlayerType == AudioRendererPlayer.self
-        KSLog("[audio] isUseAudioRenderer: \(isUseAudioRenderer)")
+        KSLog("[audio] maximumOutputNumberOfChannels: \(maximumOutputNumberOfChannels), preferredOutputNumberOfChannels: \(preferredOutputNumberOfChannels), isSpatialAudioEnabled: \(isSpatialAudioEnabled), isUseAudioRenderer: \(isUseAudioRenderer) ")
         let maxRouteChannelsCount = AVAudioSession.sharedInstance().currentRoute.outputs.compactMap {
             $0.channels?.count
         }.max() ?? 2
         KSLog("[audio] currentRoute max channels: \(maxRouteChannelsCount)")
         var channelCount = channelCount
         if channelCount > 2 {
             let minChannels = min(maximumOutputNumberOfChannels, channelCount)
-            if minChannels > preferredOutputNumberOfChannels {
-                try? AVAudioSession.sharedInstance().setPreferredOutputNumberOfChannels(Int(minChannels))
-                KSLog("[audio] set preferredOutputNumberOfChannels: \(minChannels)")
-            }
+            try? AVAudioSession.sharedInstance().setPreferredOutputNumberOfChannels(Int(minChannels))
+            KSLog("[audio] set preferredOutputNumberOfChannels: \(minChannels)")
             // iOS 有空间音频功能，所以不用处理
             #if os(tvOS) || targetEnvironment(simulator)
             if !(isUseAudioRenderer && isSpatialAudioEnabled) {
@@ -516,6 +511,7 @@ public extension KSOptions {
             }
             #endif
         } else {
+            try? AVAudioSession.sharedInstance().setPreferredOutputNumberOfChannels(2)
             channelCount = 2
         }
         KSLog("[audio] outputNumberOfChannels: \(AVAudioSession.sharedInstance().outputNumberOfChannels)")

diff --git a/Sources/KSPlayer/MEPlayer/KSMEPlayer.swift b/Sources/KSPlayer/MEPlayer/KSMEPlayer.swift
@@ -132,6 +132,9 @@ public class KSMEPlayer: NSObject {
     }
 
     deinit {
+        #if !os(macOS)
+        try? AVAudioSession.sharedInstance().setPreferredOutputNumberOfChannels(2)
+        #endif
         NotificationCenter.default.removeObserver(self)
         videoOutput?.invalidate()
         playerItem.shutdown()