Skip to content

fix(producer): honor disabled looping for finite-loop GIF inputs #3943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kapelame wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −7
Open

fix(producer): honor disabled looping for finite-loop GIF inputs #3943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/producer/src/services/animatedGifPrep.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,22 +147,27 @@ describe("prepareAnimatedGifInputs", () => {
expect(result.preparedAssets.size).toBe(0);
});

it("lets data-loop override infinite GIF metadata", async () => {
it.each([0, 3])("lets data-loop=false override GIF loop count %i", async (loopCount) => {
const projectDir = makeProject();
writeFileSync(join(projectDir, "reaction.gif"), gif([...frame(10), ...frame(10)], 0));
writeFileSync(join(projectDir, "reaction.gif"), gif([...frame(10), ...frame(10)], loopCount));
const calls: AnimatedGifTranscodeRequest[] = [];
const result = await prepareAnimatedGifInputs(
`<img data-start="0" data-duration="2" data-loop="false" src="reaction.gif" />`,
{
projectDir,
downloadDir: projectDir,
transcode: async (request) => {
calls.push(request);
writeFileSync(request.outputPath, "webm");
},
},
);

const { document } = parseHTML(result.html);
expect(document.querySelector("video")?.hasAttribute("loop")).toBe(false);
expect(result.preparedGifs[0]?.loopIterations).toBe(1);
expect(result.preparedGifs[0]?.padSeconds).toBe(1.8);
expect(calls[0]?.args).not.toContain("-stream_loop");
});

it("expands finite loop metadata into the transcoded source", async () => {
Expand Down
15 changes: 10 additions & 5 deletions packages/producer/src/services/animatedGifPrep.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,18 +177,18 @@ function resolveClipWindowSeconds(img: Element, compositionDuration: number | nu

function resolvePreparedPlayback(
metadata: AnimatedGifMetadata,
loop: boolean,
loopOverride: boolean | null,
windowSeconds: number | null,
): { loopIterations: number; padSeconds: number } {
const gifDuration = metadata.durationSeconds > 0 ? metadata.durationSeconds : null;

let loopIterations = 1;
if (loop) {
if (resolveLoop(metadata, loopOverride)) {
loopIterations =
windowSeconds != null && gifDuration != null
? Math.min(MAX_LOOP_ITERATIONS, Math.max(1, Math.ceil(windowSeconds / gifDuration)))
: 1;
} else if (metadata.loopCount != null && metadata.loopCount > 1) {
} else if (loopOverride == null && metadata.loopCount != null && metadata.loopCount > 1) {
loopIterations = Math.min(MAX_LOOP_ITERATIONS, metadata.loopCount);
}

Expand Down Expand Up @@ -395,9 +395,14 @@ export async function prepareAnimatedGifInputs(
const metadata = parseAnimatedGifMetadata(bytes);
if (!metadata?.animated) continue;

const loop = resolveLoop(metadata, readLoopOverride(img));
const loopOverride = readLoopOverride(img);
const loop = resolveLoop(metadata, loopOverride);
const windowSeconds = resolveClipWindowSeconds(img, compositionDuration);
const { loopIterations, padSeconds } = resolvePreparedPlayback(metadata, loop, windowSeconds);
const { loopIterations, padSeconds } = resolvePreparedPlayback(
metadata,
loopOverride,
windowSeconds,
);
const hash = computePreparedGifHash(bytes, loopIterations, padSeconds);
const filename = `${CACHE_SCHEMA}-${hash.slice(0, 24)}.webm`;
const cachePath = join(cacheDir, filename);
Expand Down