From f03a1d511e92d979bdbc6e63266dd2b74052e807 Mon Sep 17 00:00:00 2001 From: James Pellow Date: Tue, 27 Aug 2024 09:43:59 -0700 Subject: [PATCH 1/2] fix: Exception where format.sampleRate != hwFormat.sampleRate --- record_darwin/CHANGELOG.md | 3 +++ .../darwin/Classes/delegate/RecorderStreamDelegate.swift | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/record_darwin/CHANGELOG.md b/record_darwin/CHANGELOG.md index 238ac10..f22015c 100644 --- a/record_darwin/CHANGELOG.md +++ b/record_darwin/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.1.3 +* fix: Exception where format.sampleRate != hwFormat.sampleRate + ## 1.1.2 * fix: Remove print on conversion error. diff --git a/record_darwin/darwin/Classes/delegate/RecorderStreamDelegate.swift b/record_darwin/darwin/Classes/delegate/RecorderStreamDelegate.swift index 968e351..4012588 100644 --- a/record_darwin/darwin/Classes/delegate/RecorderStreamDelegate.swift +++ b/record_darwin/darwin/Classes/delegate/RecorderStreamDelegate.swift @@ -27,7 +27,7 @@ class RecorderStreamDelegate: NSObject, AudioRecordingStreamDelegate { } #endif - let srcFormat = audioEngine.inputNode.outputFormat(forBus: 0) + let srcFormat = audioEngine.inputNode.inputFormat(forBus: 0) let dstFormat = AVAudioFormat( commonFormat: .pcmFormatInt16, From 04b478b55f5ccaad7405bb6878ad82cc976ddbb9 Mon Sep 17 00:00:00 2001 From: James Pellow Date: Tue, 27 Aug 2024 09:45:25 -0700 Subject: [PATCH 2/2] feat(macOS): Support device by deviceID as well as deviceUID --- record_darwin/CHANGELOG.md | 1 + record_darwin/macos/Classes/RecorderMacOS.swift | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/record_darwin/CHANGELOG.md b/record_darwin/CHANGELOG.md index f22015c..94e641f 100644 --- a/record_darwin/CHANGELOG.md +++ b/record_darwin/CHANGELOG.md @@ -1,5 +1,6 @@ ## 1.1.3 * fix: Exception where format.sampleRate != hwFormat.sampleRate +* feat(macOS): Support device by deviceID as well as deviceUID ## 1.1.2 * fix: Remove print on conversion error. diff --git a/record_darwin/macos/Classes/RecorderMacOS.swift b/record_darwin/macos/Classes/RecorderMacOS.swift index 5bf34c7..bf50c1d 100644 --- a/record_darwin/macos/Classes/RecorderMacOS.swift +++ b/record_darwin/macos/Classes/RecorderMacOS.swift @@ -81,6 +81,11 @@ func getAudioDeviceIDFromUID(uid: String) -> AudioDeviceID? { // Get device UID for deviceID in deviceIDs { + // Support lookup by devicezID rather than uid + if String(deviceID) == uid { + return deviceID + } + propertyAddress.mSelector = kAudioDevicePropertyDeviceUID propertySize = UInt32(MemoryLayout.size) var deviceUID: Unmanaged?