Fix can't playback audio streo.

shogo4405 · Nov 20, 2023 · 9072439 · 9072439
1 parent ae3edd1
commit 9072439
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 29 deletions.
diff --git a/Examples/visionOS/ContentView.swift b/Examples/visionOS/ContentView.swift
@@ -4,7 +4,7 @@ import SwiftUI
 
 struct ContentView: View {
     @ObservedObject var viewModel = ViewModel()
-    
+
     private var lfView: PiPHKSwiftUiView!
 
     init() {
@@ -16,7 +16,7 @@ struct ContentView: View {
         VStack {
             lfView
                 .ignoresSafeArea()
-                .onTapGesture { location in
+                .onTapGesture { _ in
                     self.viewModel.startPlaying()
                 }
             Text("Hello, world!")
@@ -27,4 +27,3 @@ struct ContentView: View {
 #Preview(windowStyle: .automatic) {
     ContentView()
 }
-
diff --git a/Examples/visionOS/PiPHKSwiftUiView.swift b/Examples/visionOS/PiPHKSwiftUiView.swift
@@ -1,5 +1,5 @@
-import SwiftUI
 import HaishinKit
+import SwiftUI
 
 struct PiPHKSwiftUiView: UIViewRepresentable {
     var piphkView = PiPHKView(frame: .zero)
@@ -15,4 +15,3 @@ struct PiPHKSwiftUiView: UIViewRepresentable {
         piphkView.attachStream(rtmpStream)
     }
 }
-
diff --git a/Sources/Codec/AudioCodecSettings.swift b/Sources/Codec/AudioCodecSettings.swift
@@ -31,7 +31,7 @@ public struct AudioCodecSettings: Codable {
             case .aac:
                 return UInt32(MPEG4ObjectID.AAC_LC.rawValue)
             case .pcm:
-                return kAudioFormatFlagIsNonInterleaved | kAudioFormatFlagIsPacked | kAudioFormatFlagIsFloat
+                return kAudioFormatFlagIsNonInterleaved | kAudioFormatFlagIsPacked | kAudioFormatFlagIsFloat | kAudioFormatFlagIsNonInterleaved
             }
         }
 
@@ -108,28 +108,18 @@ public struct AudioCodecSettings: Codable {
         }
 
         func makeAudioFormat(_ format: AVAudioFormat) -> AVAudioFormat? {
-            switch self {
-            case .aac:
-                var streamDescription = AudioStreamBasicDescription(
-                    mSampleRate: format.sampleRate,
-                    mFormatID: formatID,
-                    mFormatFlags: formatFlags,
-                    mBytesPerPacket: bytesPerPacket,
-                    mFramesPerPacket: framesPerPacket,
-                    mBytesPerFrame: bytesPerFrame,
-                    mChannelsPerFrame: min(format.channelCount, AudioCodecSettings.maximumNumberOfChannels),
-                    mBitsPerChannel: bitsPerChannel,
-                    mReserved: 0
-                )
-                return AVAudioFormat(streamDescription: &streamDescription)
-            case .pcm:
-                return AVAudioFormat(
-                    commonFormat: .pcmFormatFloat32,
-                    sampleRate: format.sampleRate,
-                    channels: min(format.channelCount, AudioCodecSettings.maximumNumberOfChannels),
-                    interleaved: true
-                )
-            }
+            var streamDescription = AudioStreamBasicDescription(
+                mSampleRate: format.sampleRate,
+                mFormatID: formatID,
+                mFormatFlags: formatFlags,
+                mBytesPerPacket: bytesPerPacket,
+                mFramesPerPacket: framesPerPacket,
+                mBytesPerFrame: bytesPerFrame,
+                mChannelsPerFrame: min(format.channelCount, AudioCodecSettings.maximumNumberOfChannels),
+                mBitsPerChannel: bitsPerChannel,
+                mReserved: 0
+            )
+            return AVAudioFormat(streamDescription: &streamDescription)
         }
     }
 

diff --git a/Sources/IO/IOTellyUnit.swift b/Sources/IO/IOTellyUnit.swift
@@ -34,7 +34,7 @@ final class IOTellyUnit {
 
     var delegate: (any IOTellyUnitDelegate)?
 
-    private lazy var mediaLink: MediaLink = {
+    private lazy var mediaLink = {
         var mediaLink = MediaLink<IOTellyUnit>()
         mediaLink.delegate = self
         return mediaLink