Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(media-server): reserve job time for the libx264 retry when nvenc is on

Richie McIlroy35687756aca2
diff --git a/apps/media-server/src/__tests__/lib/nvenc-encoder.test.ts b/apps/media-server/src/__tests__/lib/nvenc-encoder.test.ts
index 23cceb76e..aff3abd03 100644
--- a/apps/media-server/src/__tests__/lib/nvenc-encoder.test.ts
+++ b/apps/media-server/src/__tests__/lib/nvenc-encoder.test.ts
@@ -16,6 +16,7 @@ import {
import {
buildNvencEncodeArgs,
canDecodeOnGpu,
+ encodeAttemptsBudgetMs,
fitWithinEven,
getVideoEncoderStatus,
type NvencOptions,
@@ -257,6 +258,11 @@ describe("nvenc encoder selection", () => {
});
describe("nvenc fallback", () => {
+ test("reserves job time for the libx264 retry only when nvenc is on", () => {
+ expect(encodeAttemptsBudgetMs(60_000, {})).toBe(60_000);
+ expect(encodeAttemptsBudgetMs(60_000, enabled)).toBe(120_000);
+ });
+
test("falls back to libx264 on any failure that was not a cancellation", () => {
expect(
nvencFallbackReason(
diff --git a/apps/media-server/src/lib/nvenc-encoder.ts b/apps/media-server/src/lib/nvenc-encoder.ts
index 8cd07b76b..eb2848ba9 100644
--- a/apps/media-server/src/lib/nvenc-encoder.ts
+++ b/apps/media-server/src/lib/nvenc-encoder.ts
@@ -176,6 +176,17 @@ export function canDecodeOnGpu(
return gpuDecodeCodecs.includes(videoCodec) && rotation === 0;
}
+// A failed NVENC encode is retried on libx264 with a fresh timeout, so the job
+// deadline has to leave room for both attempts.
+export function encodeAttemptsBudgetMs(
+ encodeTimeoutMs: number,
+ env: Env = process.env,
+): number {
+ return selectedVideoEncoder(env) === "nvenc"
+ ? encodeTimeoutMs * 2
+ : encodeTimeoutMs;
+}
+
export function nvencFallbackReason(
error: unknown,
aborted: boolean,
diff --git a/apps/media-server/src/routes/video.ts b/apps/media-server/src/routes/video.ts
index 7bcec5eb9..09495309f 100644
--- a/apps/media-server/src/routes/video.ts
+++ b/apps/media-server/src/routes/video.ts
@@ -77,6 +77,7 @@ import {
uploadFileToStorage,
uploadToS3,
} from "../lib/media-video";
+import { encodeAttemptsBudgetMs } from "../lib/nvenc-encoder";
import { RecordingTimingError } from "../lib/recording-timing";
import {
hashRecordingFile,
@@ -378,7 +379,7 @@ function extendJobLifetimeForWork(
): void {
extendJobLifetime(
jobId,
- workTimeoutMs +
+ encodeAttemptsBudgetMs(workTimeoutMs) +
JOB_TRANSFER_ALLOWANCE_MS +
POST_VERIFICATION_ASSET_BUDGET_MS +
Math.ceil(