Skip to content

Commit acd0bc3

Browse files
authored
fix(producer): honor disabled looping for finite-loop GIF inputs (heygen-com#3943)
1 parent dfb7e5a commit acd0bc3

2 files changed

Lines changed: 17 additions & 7 deletions

File tree

‎packages/producer/src/services/animatedGifPrep.test.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,22 +182,27 @@ describe("prepareAnimatedGifInputs", () => {
182182
expect(result.preparedAssets.size).toBe(0);
183183
});
184184

185-
it("lets data-loop override infinite GIF metadata", async () => {
185+
it.each([0, 3])("lets data-loop=false override GIF loop count %i", async (loopCount) => {
186186
const projectDir = makeProject();
187-
writeFileSync(join(projectDir, "reaction.gif"), gif([...frame(10), ...frame(10)], 0));
187+
writeFileSync(join(projectDir, "reaction.gif"), gif([...frame(10), ...frame(10)], loopCount));
188+
const calls: AnimatedGifTranscodeRequest[] = [];
188189
const result = await prepareAnimatedGifInputs(
189190
`<img data-start="0" data-duration="2" data-loop="false" src="reaction.gif" />`,
190191
{
191192
projectDir,
192193
downloadDir: projectDir,
193194
transcode: async (request) => {
195+
calls.push(request);
194196
writeFileSync(request.outputPath, "webm");
195197
},
196198
},
197199
);
198200

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

203208
it("expands finite loop metadata into the transcoded source", async () => {

‎packages/producer/src/services/animatedGifPrep.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,18 +169,18 @@ function resolveClipWindowSeconds(img: Element, compositionDuration: number | nu
169169

170170
function resolvePreparedPlayback(
171171
metadata: AnimatedGifMetadata,
172-
loop: boolean,
172+
loopOverride: boolean | null,
173173
windowSeconds: number | null,
174174
): { loopIterations: number; padSeconds: number } {
175175
const gifDuration = metadata.durationSeconds > 0 ? metadata.durationSeconds : null;
176176

177177
let loopIterations = 1;
178-
if (loop) {
178+
if (resolveLoop(metadata, loopOverride)) {
179179
loopIterations =
180180
windowSeconds != null && gifDuration != null
181181
? Math.min(MAX_LOOP_ITERATIONS, Math.max(1, Math.ceil(windowSeconds / gifDuration)))
182182
: 1;
183-
} else if (metadata.loopCount != null && metadata.loopCount > 1) {
183+
} else if (loopOverride == null && metadata.loopCount != null && metadata.loopCount > 1) {
184184
loopIterations = Math.min(MAX_LOOP_ITERATIONS, metadata.loopCount);
185185
}
186186

@@ -387,9 +387,14 @@ export async function prepareAnimatedGifInputs(
387387
const metadata = parseAnimatedGifMetadata(bytes);
388388
if (!metadata?.animated) continue;
389389

390-
const loop = resolveLoop(metadata, readLoopOverride(img));
390+
const loopOverride = readLoopOverride(img);
391+
const loop = resolveLoop(metadata, loopOverride);
391392
const windowSeconds = resolveClipWindowSeconds(img, compositionDuration);
392-
const { loopIterations, padSeconds } = resolvePreparedPlayback(metadata, loop, windowSeconds);
393+
const { loopIterations, padSeconds } = resolvePreparedPlayback(
394+
metadata,
395+
loopOverride,
396+
windowSeconds,
397+
);
393398
const hash = computePreparedGifHash(bytes, loopIterations, padSeconds);
394399
const filename = `${CACHE_SCHEMA}-${hash.slice(0, 24)}.webm`;
395400
const cachePath = join(cacheDir, filename);

0 commit comments

Comments
 (0)