Skip to content

Commit 81f4bb0

Browse files
committed
fix(media): align codec probe cache keys
1 parent 67c457a commit 81f4bb0

2 files changed

Lines changed: 18 additions & 6 deletions

File tree

‎packages/studio-server/src/helpers/mediaCodecMap.test.ts‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,12 @@ describe("scanProjectMediaCodecMap", () => {
263263
expect(map["/assets/clip.mp4"]?.browserHostile).toBe(true);
264264
});
265265

266-
it("caches a probe per (path, mtime): a second scan of an unchanged file doesn't reprobe, touching mtime does", async () => {
266+
it("caches by path + mtime + size, invalidating same-mtime re-exports and touched files", async () => {
267267
const project = tmpProject();
268268
const videoPath = join(project, "clip.mp4");
269269
writeFileSync(videoPath, "fake video bytes");
270+
const pinnedMtime = new Date(Date.now() - 60_000);
271+
utimesSync(videoPath, pinnedMtime, pinnedMtime);
270272
const html = videoHtml("clip.mp4");
271273
const cache = createMediaCodecProbeCache();
272274
const probe = countingRunner(makeRunner({ [videoPath]: "hevc" }));
@@ -285,6 +287,15 @@ describe("scanProjectMediaCodecMap", () => {
285287
expect(second["/clip.mp4"]?.codecName).toBe("hevc");
286288
expect(probe.calls()).toBe(1);
287289

290+
writeFileSync(videoPath, "larger fake video bytes");
291+
utimesSync(videoPath, pinnedMtime, pinnedMtime);
292+
const resized = await scanProjectMediaCodecMap(project, [{ html }], {
293+
cache,
294+
runner: probe.runner,
295+
});
296+
expect(resized["/clip.mp4"]?.codecName).toBe("hevc");
297+
expect(probe.calls()).toBe(2);
298+
288299
const future = new Date(Date.now() + 60_000);
289300
utimesSync(videoPath, future, future);
290301

@@ -293,7 +304,7 @@ describe("scanProjectMediaCodecMap", () => {
293304
runner: probe.runner,
294305
});
295306
expect(third["/clip.mp4"]?.codecName).toBe("hevc");
296-
expect(probe.calls()).toBe(2);
307+
expect(probe.calls()).toBe(3);
297308
});
298309

299310
it("bounds the long-lived probe cache while retaining the newest assets", async () => {

‎packages/studio-server/src/helpers/mediaCodecMap.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ export async function probeAssetCodec(
9393

9494
interface CachedAssetProbe {
9595
mtimeMs: number;
96+
size: number;
9697
facts: AssetCodecFacts | null;
9798
}
9899

@@ -130,19 +131,19 @@ async function probeAssetCodecCached(
130131
cache: MediaCodecProbeCache,
131132
runner?: FfprobeRunner,
132133
): Promise<AssetCodecFacts | null> {
133-
let mtimeMs: number;
134+
let stat: ReturnType<typeof statSync>;
134135
try {
135-
mtimeMs = statSync(filePath).mtimeMs;
136+
stat = statSync(filePath);
136137
} catch {
137138
return null;
138139
}
139140
const cached = cache.get(filePath);
140-
if (cached && cached.mtimeMs === mtimeMs) {
141+
if (cached && cached.mtimeMs === stat.mtimeMs && cached.size === stat.size) {
141142
rememberProbeResult(cache, filePath, cached);
142143
return cached.facts;
143144
}
144145
const facts = await probeAssetCodec(filePath, runner);
145-
rememberProbeResult(cache, filePath, { mtimeMs, facts });
146+
rememberProbeResult(cache, filePath, { mtimeMs: stat.mtimeMs, size: stat.size, facts });
146147
return facts;
147148
}
148149

0 commit comments

Comments
 (0)