Use renderContext of updated API.

realitylabs · Aug 24, 2022 · 53b2e3f · 53b2e3f
1 parent ca95fc7
commit 53b2e3f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/CustomRTCAudioDevice/AUAudioUnitRTCAudioDevice.swift b/CustomRTCAudioDevice/AUAudioUnitRTCAudioDevice.swift
@@ -154,11 +154,11 @@ final class AUAudioUnitRTCAudioDevice: NSObject {
       measureTime(label: "AVAudioUnit define inputHandler") {
         let deliverRecordedData = delegate.deliverRecordedData
         let renderBlock = audioUnit.renderBlock
-        let customRenderBlock = { actionFlags, timestamp, inputBusNumber, frameCount, abl in
+        let customRenderBlock: RTCAudioDeviceRenderRecordedDataBlock = { actionFlags, timestamp, inputBusNumber, frameCount, abl, renderContext in
           return renderBlock(actionFlags, timestamp, frameCount, inputBusNumber, abl, nil)
         }
         audioUnit.inputHandler = { actionFlags, timestamp, frameCount, inputBusNumber in
-          let status = deliverRecordedData(actionFlags, timestamp, inputBusNumber, frameCount, nil, customRenderBlock)
+          let status = deliverRecordedData(actionFlags, timestamp, inputBusNumber, frameCount, nil, nil, customRenderBlock)
           if status != noErr {
             print("Failed to deliver audio data: \(status)")
           }

diff --git a/CustomRTCAudioDevice/AVAudioEngineRTCAudioDevice.swift b/CustomRTCAudioDevice/AVAudioEngineRTCAudioDevice.swift
@@ -216,11 +216,16 @@ final class AVAudioEngineRTCAudioDevice: NSObject {
           // NOTE: AVAudioSinkNode provides audio data with HW sample rate in 32-bit float format,
           // WebRTC requires 16-bit int format, so do the conversion
           let converter = SimpleAudioConverter(from: inputFormat, to: rtcRecordFormat)!
+
+          let customRenderBlock: RTCAudioDeviceRenderRecordedDataBlock = { actionFlags, timestamp, inputBusNumber, frameCount, abl, renderContext in
+            let (converter, inputData) = renderContext!.assumingMemoryBound(to: (Unmanaged<SimpleAudioConverter>, UnsafeMutablePointer<AudioBufferList>).self).pointee
+            return converter.takeUnretainedValue().convert(framesCount: frameCount, from: inputData, to: abl)
+          }
+
           let audioSink = AVAudioSinkNode(receiverBlock: { (timestamp, framesCount, inputData) -> OSStatus in
             var flags: AudioUnitRenderActionFlags = []
-            return deliverRecordedData(&flags, timestamp, 1, framesCount, nil, { actionFlags, timestamp, inputBusNumber, frameCount, abl in
-              return converter.convert(framesCount: framesCount, from: inputData, to: abl)
-            })
+            var renderContext = (Unmanaged.passUnretained(converter), inputData)
+            return deliverRecordedData(&flags, timestamp, 1, framesCount, nil, &renderContext, customRenderBlock)
           })
 
           measureTime(label: "Attach AVAudioSinkNode") {