-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix(mac): preserve microphone audio in recordings and captions #825
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.
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
Open
PrashikshitSaini
wants to merge
1
commit into
webadderallorg:main
Choose a base branch
from
PrashikshitSaini:fix/macos-microphone-captions
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| import { beforeEach, describe, expect, it, vi } from "vitest"; | ||
|
|
||
| const { getCompanionAudioFallbackInfoMock, resolveRecordingSessionMock } = vi.hoisted(() => ({ | ||
| getCompanionAudioFallbackInfoMock: vi.fn(), | ||
| resolveRecordingSessionMock: vi.fn(), | ||
| })); | ||
|
|
||
| vi.mock("electron", () => ({ app: { getPath: () => "/tmp" } })); | ||
| vi.mock("../recording/diagnostics", () => ({ | ||
| getCompanionAudioFallbackInfo: getCompanionAudioFallbackInfoMock, | ||
| })); | ||
| vi.mock("../project/session", () => ({ | ||
| resolveRecordingSession: resolveRecordingSessionMock, | ||
| })); | ||
|
|
||
| import { parseMaxVolumeDb, resolveCaptionAudioCandidates } from "./generate"; | ||
|
|
||
| describe("resolveCaptionAudioCandidates", () => { | ||
| beforeEach(() => { | ||
| getCompanionAudioFallbackInfoMock.mockReset(); | ||
| resolveRecordingSessionMock.mockReset(); | ||
| resolveRecordingSessionMock.mockResolvedValue(null); | ||
| }); | ||
|
|
||
| it("falls back from the recording to system and microphone sidecars", async () => { | ||
| const videoPath = "/recordings/recording.mp4"; | ||
| getCompanionAudioFallbackInfoMock.mockResolvedValue({ | ||
| paths: [videoPath, "/recordings/recording.system.m4a", "/recordings/recording.mic.wav"], | ||
| candidatePaths: ["/recordings/recording.system.m4a", "/recordings/recording.mic.wav"], | ||
| startDelayMsByPath: { "/recordings/recording.mic.wav": 125 }, | ||
| }); | ||
|
|
||
| await expect(resolveCaptionAudioCandidates(videoPath)).resolves.toEqual([ | ||
| { | ||
| path: "/recordings/recording.system.m4a", | ||
| label: "system and microphone recording", | ||
| secondaryPath: "/recordings/recording.mic.wav", | ||
| secondaryStartDelayMs: 125, | ||
| }, | ||
| { path: videoPath, label: "recording" }, | ||
| { path: "/recordings/recording.system.m4a", label: "system audio recording" }, | ||
| { | ||
| path: "/recordings/recording.mic.wav", | ||
| label: "microphone recording", | ||
| startDelayMs: 125, | ||
| }, | ||
| ]); | ||
| }); | ||
|
|
||
| it("falls back to the recording and linked webcam without sidecars", async () => { | ||
| getCompanionAudioFallbackInfoMock.mockResolvedValue({ | ||
| paths: [], | ||
| startDelayMsByPath: {}, | ||
| }); | ||
| resolveRecordingSessionMock.mockResolvedValue({ webcamPath: "/recordings/webcam.mp4" }); | ||
|
|
||
| await expect(resolveCaptionAudioCandidates("/recordings/recording.mp4")).resolves.toEqual([ | ||
| { path: "/recordings/recording.mp4", label: "recording" }, | ||
| { path: "/recordings/webcam.mp4", label: "linked webcam recording" }, | ||
| ]); | ||
| }); | ||
|
|
||
| it("parses finite and silent FFmpeg volume measurements", () => { | ||
| expect(parseMaxVolumeDb("[Parsed_volumedetect] max_volume: -18.4 dB")).toBe(-18.4); | ||
| expect(parseMaxVolumeDb("[Parsed_volumedetect] max_volume: -inf dB")).toBe( | ||
| Number.NEGATIVE_INFINITY, | ||
| ); | ||
| expect(parseMaxVolumeDb("no volume measurement")).toBeNull(); | ||
| }); | ||
| }); |
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
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Pair embedded recording audio with the microphone sidecar.
If fallback info contains
videoPathand a.mic.wavpath but no.system.path, this code adds microphone-only and recording-only candidates.extractCaptionAudioSourceaccepts the first audible candidate. Captions can then omit either embedded system audio or microphone audio.Add a combined
videoPathand microphone candidate before the individual fallbacks when fallbackpathsincludes the recording video. Apply the microphone start delay to the secondary input. Add coverage for this fallback layout.🧰 Tools
🪛 ast-grep (0.45.1)
[warning] Importing child_process exposes a command-execution surface; ensure any command/argument built from input is validated, and prefer execFile/spawn with an argument array over exec.
Context: import { execFile, spawnSync } from "node:child_process";
Note: [CWE-78] Improper Neutralization of Special Elements used in an OS Command ('OS Command Injection').
(detect-child-process-typescript)
🤖 Prompt for AI Agents