Skip to content

fix: resolve system default input device explicitly for Bluetooth HFP #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dmetzler wants to merge 1 commit into from
Closed

fix: resolve system default input device explicitly for Bluetooth HFP #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions wispr/Services/AudioEngine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,14 @@
self.engine = audioEngine
let inputNode = audioEngine.inputNode

// Assign the selected device to this engine's input AudioUnit
// BEFORE reading any format or installing taps (Req 2.1, 2.3).
// For selected devices, build an explicit tap format from CoreAudio
// since inputNode's cached format may be stale after device switches.
// For system-default devices, nil lets AVAudioEngine use its cache.
// Assign the input device to this engine's AudioUnit BEFORE reading
// any format or installing taps (Req 2.1, 2.3).
// Always resolve the actual device — even for "System Default" — so
// Bluetooth devices get the HFP/SCO settling wait and the tap format
// is built from real hardware properties rather than a stale cache.
var tapFormat: AVAudioFormat? = nil
if let deviceID = selectedDeviceID {
let resolvedDeviceID = selectedDeviceID ?? getDefaultInputDeviceID()
if let deviceID = resolvedDeviceID {
var devID = deviceID
let status = AudioUnitSetProperty(
inputNode.audioUnit!,
Expand All @@ -114,13 +115,13 @@
UInt32(MemoryLayout<AudioDeviceID>.size)
)
if status == noErr {
Log.audioEngine.debug("Per-engine input device set to \(deviceID)")
let source = selectedDeviceID != nil ? "explicit" : "system default"
Log.audioEngine.debug("Per-engine input device set to \(deviceID) (\(source))")
} else {
Log.audioEngine.warning("AudioUnitSetProperty failed (OSStatus: \(status)) for device \(deviceID), falling back to system default")
selectedDeviceID = nil
Log.audioEngine.warning("AudioUnitSetProperty failed (OSStatus: \(status)) for device \(deviceID), falling back to AVAudioEngine default")
}

if selectedDeviceID != nil {
if status == noErr {
let device = CoreAudioDevice(id: deviceID)

// Bluetooth devices switch from A2DP (48kHz) to HFP/SCO
Expand Down Expand Up @@ -151,8 +152,8 @@
}
}

let deviceDescription = selectedDeviceID.map { String($0) } ?? "system default"
Log.audioEngine.debug("startCapture — device: \(deviceDescription), tapFormat: \(tapFormat?.description ?? "nil (system default)")")
let deviceDescription = resolvedDeviceID.map { "\($0)\(selectedDeviceID == nil ? " (system default)" : "")" } ?? "none"
Log.audioEngine.debug("startCapture — device: \(deviceDescription), tapFormat: \(tapFormat?.description ?? "nil")")

// The converter is created lazily from the first buffer's actual format.
nonisolated(unsafe) var converter: AVAudioConverter?
Expand Down Expand Up @@ -439,7 +440,7 @@
var size: UInt32 = 0
guard AudioObjectGetPropertyDataSize(id, &address, 0, nil, &size) == noErr, size > 0 else { return false }
var dict: CFDictionary?
guard AudioObjectGetPropertyData(id, &address, 0, nil, &size, &dict) == noErr,

Check warning on line 443 in wispr/Services/AudioEngine.swift

View workflow job for this annotation

GitHub Actions / build-and-test 

forming 'UnsafeMutableRawPointer' to a variable of type 'Optional<CFDictionary>'; this is likely incorrect because 'Optional<CFDictionary>' may contain an object reference.
let composition = dict as? [String: Any] else { return false }
// kAudioAggregateDeviceIsPrivateKey == "priv"
if let isPrivate = composition["priv"] as? Int, isPrivate == 1 {
Expand Down
Loading