From f3e45b492eb91be881ba44c529fae524f2c76849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel?= Date: Fri, 6 Nov 2026 10:00:26 +0000 Subject: [PATCH] fix(studio-server): proxy MPEG-4 Part 2 and MJPEG video the browser cannot decode (#7310) * fix(studio-server): proxy MPEG-4 Part 2 and MJPEG video the browser cannot decode * fix(studio-server): drop the codec comment the comment gate counts --- .../studio-server/src/helpers/mediaCodecMap.test.ts | 11 +++++++---- packages/studio-server/src/helpers/mediaCodecMap.ts | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/studio-server/src/helpers/mediaCodecMap.test.ts b/packages/studio-server/src/helpers/mediaCodecMap.test.ts index 93c0b09d84..ac7cca1f83 100644 --- a/packages/studio-server/src/helpers/mediaCodecMap.test.ts +++ b/packages/studio-server/src/helpers/mediaCodecMap.test.ts @@ -231,9 +231,12 @@ describe("BROWSER_HOSTILE_CODECS representative mimes", () => { expect(typeof BROWSER_HOSTILE_CODECS[codecName]?.representativeMime).toBe("string"); }); - it("has no representative mime for prores, which is never decodable", () => { - expect(BROWSER_HOSTILE_CODECS.prores?.representativeMime).toBeNull(); - }); + it.each(["prores", "mpeg4", "mjpeg"])( + "has no representative mime for %s, which is never decodable", + (codecName) => { + expect(BROWSER_HOSTILE_CODECS[codecName]?.representativeMime).toBeNull(); + }, + ); }); describe("shouldPrewarmProxy", () => { @@ -241,7 +244,7 @@ describe("shouldPrewarmProxy", () => { return { codecName, browserHostile: true, representativeMime: null, hasAlpha: false }; } - it.each(["hevc", "prores", "theora"])( + it.each(["hevc", "prores", "theora", "mpeg4", "mjpeg"])( "pre-warms %s, which has no cross-platform browser decode", (codecName) => { expect(shouldPrewarmProxy(facts(codecName))).toBe(true); diff --git a/packages/studio-server/src/helpers/mediaCodecMap.ts b/packages/studio-server/src/helpers/mediaCodecMap.ts index 270d344be3..affea9d071 100644 --- a/packages/studio-server/src/helpers/mediaCodecMap.ts +++ b/packages/studio-server/src/helpers/mediaCodecMap.ts @@ -68,6 +68,8 @@ export const BROWSER_HOSTILE_CODECS: Record = { hevc: { representativeMime: 'video/mp4; codecs="hvc1.1.6.L120.B0"', prewarm: true }, prores: { representativeMime: null, prewarm: true }, theora: { representativeMime: 'video/ogg; codecs="theora"', prewarm: true }, + mpeg4: { representativeMime: null, prewarm: true }, + mjpeg: { representativeMime: null, prewarm: true }, // Every mainstream engine decodes AV1 and VP9, so canPlayType keeps the // original and only the rare browser that cannot pays for a transcode. av1: { representativeMime: 'video/mp4; codecs="av01.0.08M.08"', prewarm: false },