Skip to content

Commit c9f2083

Browse files
committed
fix(render): harden H.264 capability fallback
1 parent cd308e5 commit c9f2083

4 files changed

Lines changed: 46 additions & 8 deletions

File tree

‎packages/cli/src/browser/ffmpeg.test.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@ describe("resolveH264EncoderMode", () => {
6565
expect(resolveH264EncoderMode(encoders, false)).toBe("gpu");
6666
});
6767

68+
it("does not treat a compiled Linux hardware encoder as usable", async () => {
69+
const { resolveH264EncoderMode } = await import("./ffmpeg.js");
70+
const encoders = `
71+
V....D h264_vaapi H.264/AVC (VAAPI)
72+
`;
73+
74+
expect(() => resolveH264EncoderMode(encoders, false)).toThrow(
75+
"neither libx264 nor VideoToolbox",
76+
);
77+
});
78+
6879
it("inspects the configured FFmpeg binary", async () => {
6980
mockExecFile.mockReturnValue(
7081
" V....D h264_videotoolbox VideoToolbox H.264 Encoder\n" as never,

‎packages/cli/src/browser/ffmpeg.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ export function resolveH264EncoderMode(
2222
): H264EncoderMode {
2323
if (gpuRequested) return "gpu";
2424
if (/\blibx264\b/.test(ffmpegEncodersOutput)) return "software";
25-
if (/\bh264_(?:videotoolbox|nvenc|vaapi|qsv|amf)\b/.test(ffmpegEncodersOutput)) return "gpu";
26-
throw new Error("This FFmpeg build has neither libx264 nor a supported H.264 hardware encoder.");
25+
if (/\bh264_videotoolbox\b/.test(ffmpegEncodersOutput)) return "gpu";
26+
throw new Error("This FFmpeg build has neither libx264 nor VideoToolbox H.264 encoding.");
2727
}
2828

2929
export function detectH264EncoderMode(ffmpegPath: string, gpuRequested: boolean): H264EncoderMode {

‎packages/cli/src/commands/render.test.ts‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ const preflightState = vi.hoisted(() => ({
7272
},
7373
}));
7474

75-
const ffmpegEncoderState = vi.hoisted(() => ({ mode: "software" as "software" | "gpu" }));
75+
const ffmpegEncoderState = vi.hoisted(() => ({
76+
mode: "software" as "software" | "gpu",
77+
error: null as Error | null,
78+
}));
7679
const orphanCleanupState = vi.hoisted(() => ({
7780
calls: 0,
7881
killed: 0,
@@ -126,7 +129,10 @@ vi.mock("../telemetry/events.js", () => ({
126129
}));
127130

128131
vi.mock("../browser/ffmpeg.js", () => ({
129-
detectH264EncoderMode: vi.fn(() => ffmpegEncoderState.mode),
132+
detectH264EncoderMode: vi.fn(() => {
133+
if (ffmpegEncoderState.error) throw ffmpegEncoderState.error;
134+
return ffmpegEncoderState.mode;
135+
}),
130136
findFFmpeg: vi.fn(() => "/usr/bin/ffmpeg"),
131137
getFFmpegInstallHint: vi.fn(() => "brew install ffmpeg"),
132138
}));
@@ -188,6 +194,7 @@ describe("renderLocal browser GPU config", () => {
188194
trackingState.shouldTrack = true;
189195
trackingState.renderObservations = [];
190196
ffmpegEncoderState.mode = "software";
197+
ffmpegEncoderState.error = null;
191198
orphanCleanupState.calls = 0;
192199
orphanCleanupState.killed = 0;
193200
resetTrialState();
@@ -372,6 +379,22 @@ describe("renderLocal browser GPU config", () => {
372379
expect(producerState.createdJobs[0]?.useGpu).toBe(true);
373380
});
374381

382+
it("lets the encoder surface its own error when capability detection fails", async () => {
383+
ffmpegEncoderState.error = new Error("encoder probe timed out");
384+
385+
await renderLocal("/tmp/project", "/tmp/out.mp4", {
386+
fps: { num: 30, den: 1 },
387+
quality: "high",
388+
format: "mp4",
389+
gpu: false,
390+
browserGpuMode: "software",
391+
hdrMode: "force-sdr",
392+
quiet: true,
393+
});
394+
395+
expect(producerState.createdJobs[0]?.useGpu).toBe(false);
396+
});
397+
375398
it("resolves browser GPU from CLI flags, Docker mode, and env fallback", () => {
376399
// Default (no flag, no env): auto — engine probes and chooses.
377400
expect(resolveBrowserGpuForCli(false, undefined, undefined)).toBe("auto");

‎packages/cli/src/commands/render.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,12 +1481,16 @@ export async function renderLocal(
14811481
}
14821482

14831483
if (!options.gpu && options.format === "mp4" && preflight.ffmpegPath) {
1484-
const encoderMode = detectH264EncoderMode(preflight.ffmpegPath, false);
1484+
let encoderMode: ReturnType<typeof detectH264EncoderMode> = "software";
1485+
try {
1486+
encoderMode = detectH264EncoderMode(preflight.ffmpegPath, false);
1487+
} catch {
1488+
// Capability probing is advisory. Let the real encode surface the
1489+
// authoritative FFmpeg error instead of failing here with a bare stack.
1490+
}
14851491
if (encoderMode === "gpu") {
14861492
console.warn(
1487-
c.warn(
1488-
" FFmpeg does not include libx264; falling back to the available H.264 hardware encoder.",
1489-
),
1493+
c.warn(" FFmpeg does not include libx264; falling back to VideoToolbox H.264 encoding."),
14901494
);
14911495
options = { ...options, gpu: true };
14921496
}

0 commit comments

Comments
 (0)