Repository navigation
fix(macos): resolve microphones Chromium labels with a transport suffix - #1147
Merged
Merged
Conversation
Chromium appends (Built-in), (Virtual), (Aggregate) or (Bluetooth) to a macOS input's name, besides the USB vendor:product pair already handled. The ScreenCaptureKit helper only stripped the USB pair, so a chosen BlackHole 2ch (Virtual) fell back to the default input. Strip one known suffix after the exact match fails, keeping ambiguous names unresolved. Fixes #1143
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info
📝 Walkthrough
Merge Risk: ⚪ Minimal · up to No actionable issue is established; the change is mergeable after normal checks. Pre-merge checks |
  |
| Check name | Status | Explanation | Resolution |
|---|---|---|---|
| Docstring Coverage |  |
Docstring coverage is 18.18% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 11 functions across 2 files. | Write docstrings for the functions missing them to satisfy the coverage threshold. |
✅ Passed checks (4 passed)
-
Check name Status Explanation Title check The title clearly and concisely describes the macOS fix for resolving Chromium microphone labels with transport suffixes. Description check The description is complete and follows the required template. It explains the change, issue, scope, release impact, platform impact, testing, and the remaining manual verification. Linked Issues check Issue #1143requires macOS microphone labels with Chromium transport suffixes to resolve to the selected AVFoundation input. The resolver now removes one recognizedBuilt-in,Virtual,Aggregate,…Out of Scope Changes check The diff changes only the macOS microphone resolver and its focused XCTest suite. The added tests verify the linked issue behavior and preserve existing ID-first, exact-name, USB-suffix, and ambiguity…
- Fix all pre-merge checks with AI
✨ Finishing Touches 💡 1
-
📝 Generate docstrings 💡
-
- Commit to this branch
- Create a new PR
🧪 Generate unit tests (beta)
-
- Commit to this branch
- Create a new PR
-
- Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
Comment @coderabbitai help to get the list of available commands.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The macOS ScreenCaptureKit helper maps the renderer's microphone choice (a hashed Chromium id plus its label) to an AVFoundation input by name. Chromium builds that label from the CoreAudio name plus one suffix per transport type:
(Built-in),(Virtual),(Aggregate),(Bluetooth), or the USB(vvvv:pppp)pair. #648 taught the resolver the USB pair only, so a chosenBlackHole 2ch (Virtual)(AVFoundation:BlackHole 2ch,BlackHole2ch_UID) fell back to the default input with the "could not be identified" toast.resolveMicrophoneDeviceIDnow:AirPods Pro (Bluetooth)still wins),Unknown or lowercase suffixes, doubled suffixes and Chromium's
Default - ...entry still resolve to nothing, and a name two inputs share stays ambiguous, so the helper keeps falling back to the default and saying so.Related issue
Fixes #1143
Candidate for cherry-pick to release/v2.1.0 (the candidate at 9c55596 has the same resolver).
Type of change
Release impact
Desktop impact
Screenshots / video
None, no UI change.
Testing
swift test --package-path electron/native/screencapturekit: 65 tests, 0 failures. New cases use real macOS labels beside the AVFoundation uniqueID/localizedName pairs for the same inputs (BlackHole, built-in mic, AirPods, Shure MV7 over USB, an aggregate device), plus ambiguity, theDefault - ...entry and unknown suffixes.device(nil)), pass with the fix.BlackHole2ch_UID | BlackHole 2ch, the name the stripped label now matches.Manual check remaining: a real HUD take on macOS with two inputs, choosing the non-default one (e.g.
BlackHole 2ch (Virtual)while the built-in mic is the default), to confirm no fallback toast and the right input in the audio.Summary by CodeRabbit