fix #627

kingslay · Nov 11, 2023 · f469d15 · f469d15
1 parent f73969d
commit f469d15
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/FFmpegKit b/FFmpegKit
diff --git a/Sources/KSPlayer/AVPlayer/KSOptions.swift b/Sources/KSPlayer/AVPlayer/KSOptions.swift
@@ -501,16 +501,16 @@ public extension KSOptions {
             // iOS 有空间音频功能，所以不用处理
             #if os(tvOS) || targetEnvironment(simulator)
             if !(isUseAudioRenderer && isSpatialAudioEnabled) {
-                // 不要用maxRouteChannelsCount来panduan，有可能会不准。导致多音道设备也返回2（一开始播放一个2声道，就容易出现）
+                // 不要用maxRouteChannelsCount来判断，有可能会不准。导致多音道设备也返回2（一开始播放一个2声道，就容易出现），也不能用outputNumberOfChannels来判断，有可能会返回2
 //                channelCount = AVAudioChannelCount(min(AVAudioSession.sharedInstance().outputNumberOfChannels, maxRouteChannelsCount))
-                channelCount = AVAudioChannelCount(AVAudioSession.sharedInstance().outputNumberOfChannels)
+                channelCount = minChannels
             }
             #endif
         } else {
             try? AVAudioSession.sharedInstance().setPreferredOutputNumberOfChannels(2)
             channelCount = 2
         }
-        KSLog("[audio] outputNumberOfChannels: \(AVAudioSession.sharedInstance().outputNumberOfChannels)")
+        KSLog("[audio] outputNumberOfChannels: \(AVAudioSession.sharedInstance().outputNumberOfChannels) output channelCount: \(channelCount)")
         return channelCount
     }
     #endif

diff --git a/Sources/KSPlayer/MEPlayer/AudioGraphPlayer.swift b/Sources/KSPlayer/MEPlayer/AudioGraphPlayer.swift
@@ -175,6 +175,11 @@ public final class AudioGraphPlayer: AudioOutput, AudioDynamicsProcessor {
                                      kAudioUnitScope_Output, 0,
                                      &audioStreamBasicDescription,
                                      audioStreamBasicDescriptionSize)
+                AudioUnitSetProperty(unit,
+                                     kAudioUnitProperty_AudioChannelLayout,
+                                     kAudioUnitScope_Output, 0,
+                                     channelLayout,
+                                     UInt32(MemoryLayout<AudioChannelLayout>.size))
             }
             if unit == audioUnitForTimePitch {
                 var inputCallbackStruct = renderCallbackStruct()

diff --git a/Sources/KSPlayer/MEPlayer/AudioUnitPlayer.swift b/Sources/KSPlayer/MEPlayer/AudioUnitPlayer.swift
@@ -101,25 +101,24 @@ public final class AudioUnitPlayer: AudioOutput {
         sourceNodeAudioFormat = audioFormat
         sampleSize = audioFormat.sampleSize
         var audioStreamBasicDescription = audioFormat.formatDescription.audioStreamBasicDescription
-        let audioStreamBasicDescriptionSize = UInt32(MemoryLayout<AudioStreamBasicDescription>.size)
         AudioUnitSetProperty(audioUnitForOutput,
                              kAudioUnitProperty_StreamFormat,
                              kAudioUnitScope_Input, 0,
                              &audioStreamBasicDescription,
-                             audioStreamBasicDescriptionSize)
+                             UInt32(MemoryLayout<AudioStreamBasicDescription>.size))
+        let channelLayout = audioFormat.channelLayout?.layout
+        AudioUnitSetProperty(audioUnitForOutput,
+                             kAudioUnitProperty_AudioChannelLayout,
+                             kAudioUnitScope_Input, 0,
+                             channelLayout,
+                             UInt32(MemoryLayout<AudioChannelLayout>.size))
         var inputCallbackStruct = renderCallbackStruct()
         AudioUnitSetProperty(audioUnitForOutput,
                              kAudioUnitProperty_SetRenderCallback,
                              kAudioUnitScope_Input, 0,
                              &inputCallbackStruct,
                              UInt32(MemoryLayout<AURenderCallbackStruct>.size))
         addRenderNotify(audioUnit: audioUnitForOutput)
-        let channelLayout = audioFormat.channelLayout?.layout
-        AudioUnitSetProperty(audioUnitForOutput,
-                             kAudioUnitProperty_AudioChannelLayout,
-                             kAudioUnitScope_Input, 0,
-                             channelLayout,
-                             UInt32(MemoryLayout<AudioChannelLayout>.size))
         AudioUnitInitialize(audioUnitForOutput)
         var size = UInt32(MemoryLayout<Float64>.size)
         AudioUnitGetProperty(audioUnitForOutput,