obsidian-plugin/blackajiro_Resonance
1
0
Fork 0
mirror of https://github.com/blackajiro/Resonance.git synced 2026-07-22 06:51:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix input

Browse source
This commit is contained in:
Michael Gorini 2025-09-01 10:47:00 +02:00
parent 0df836c29f
commit 9b6cd73872
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
RecorderService.ts
View file

@ -270,8 +270,15 @@ export class RecorderService {
const { format, micSpec, systemSpec } = await this.resolveFfmpegInput();
const inputs: string[] = [];
if (micSpec) inputs.push("-f", format, "-i", micSpec);
if (systemSpec) inputs.push("-f", format, "-i", systemSpec);
const sr = Math.max(8000, Number(this.settings.recordSampleRateHz || 48000));
const ch = Math.max(1, Math.min(2, Number(this.settings.recordChannels || 1)));
const buildInputArgs = (spec: string): string[] => {
// Per avfoundation (macOS) -ar/-ac per-input generano errore (Option sample_rate not found).
// Manteniamo solo -thread_queue_size a livello di input e forziamo formato in uscita.
return ["-f", format, "-thread_queue_size", "1024", "-i", spec];
};
if (micSpec) inputs.push(...buildInputArgs(micSpec));
if (systemSpec) inputs.push(...buildInputArgs(systemSpec));
if (inputs.length === 0) throw new Error("No FFmpeg input device configured. Set at least the microphone.");
const shouldMix = Boolean(micSpec && systemSpec);
@ -279,11 +286,8 @@ export class RecorderService {
const mixArgs = shouldMix ? [
"-filter_complex", "[0:a][1:a]amix=inputs=2:duration=longest"
] : [];
// Parametri conservativi per Mac
const sr = Math.max(8000, Number(this.settings.recordSampleRateHz || 48000));
const ch = Math.max(1, Math.min(2, Number(this.settings.recordChannels || 1)));
const br = Math.max(64, Number(this.settings.recordBitrateKbps || 192));
const audioFmtArgs = ["-ar", String(sr), "-ac", String(ch)];
const audioFmtArgs = ["-vn", "-ar", String(sr), "-ac", String(ch)];
const outputArgs = [...audioFmtArgs, "-acodec", "libmp3lame", "-ab", `${br}k`, this.audioPath];
this.setPhase("recording");

4
settings.ts
View file

@ -529,7 +529,9 @@ export class ResonanceSettingTab extends PluginSettingTab {
const sr = Math.max(8000, Number(this.settings.recordSampleRateHz || 48000));
const ch = Math.max(1, Math.min(2, Number(this.settings.recordChannels || 1)));
const br = Math.max(64, Number(this.settings.recordBitrateKbps || 160));
const args: string[] = ['-y', '-f', backend, '-i', micArg, '-t', '1', '-ar', String(sr), '-ac', String(ch), '-acodec', 'libmp3lame', '-ab', `${br}k`, out];
const args: string[] = backend === 'avfoundation'
? ['-y', '-f', backend, '-thread_queue_size', '1024', '-i', micArg, '-t', '1', '-vn', '-ar', String(sr), '-ac', String(ch), '-acodec', 'libmp3lame', '-ab', `${br}k`, out]
: ['-y', '-f', backend, '-thread_queue_size', '1024', '-ar', String(sr), '-ac', String(ch), '-i', micArg, '-t', '1', '-vn', '-ar', String(sr), '-ac', String(ch), '-acodec', 'libmp3lame', '-ab', `${br}k`, out];
const child = spawn(ffmpeg, args);
let stderr = '';