studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 63 Pull Requests 5 Releases Wiki Activity

Fix FFmpeg task when rendering list of frames #104286

Manually merged
Sybren A. Stüvel merged 2 commits from EmmanuelDurand/flamenco:fix/ffmpeg-list-of-frames into main 2024-02-24 11:58:25 +01:00
Conversation 2 Commits 2 Files Changed 2 +12 -8
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 857fd53c6d - Show all commits

10
internal/manager/job_compilers/scripts-for-unittest/simple_blender_render.js
View File

@ -148,15 +148,17 @@ function authorCreateVideoTask(settings, renderDir) {
return; return;
} }
const stem = path.stem(settings.blendfile).replace('.flamenco', ''); var frames = `${settings.frames}`;
var outfile = path.join(renderDir, `${stem}-${settings.frames}.mp4`); if (frames.search(',') != -1) {
if (outfile.search(',') != -1) {
// Get the first and last frame from the list // Get the first and last frame from the list
const chunks = frameChunker(settings.frames, 1); const chunks = frameChunker(settings.frames, 1);
const firstFrame = chunks[0]; const firstFrame = chunks[0];
const lastFrame = chunks.slice(-1)[0]; const lastFrame = chunks.slice(-1)[0];
outfile = path.join(renderDir, `${stem}-${firstFrame}-${lastFrame}.mp4`); frames = `${firstFrame}-${lastFrame}`;
} }
const stem = path.stem(settings.blendfile).replace('.flamenco', '');
const outfile = path.join(renderDir, `${stem}-${frames}.mp4`);
const outfileExt = guessOutputFileExtension(settings); const outfileExt = guessOutputFileExtension(settings);
const task = author.Task('preview-video', 'ffmpeg'); const task = author.Task('preview-video', 'ffmpeg');

10
internal/manager/job_compilers/scripts/simple_blender_render.js
View File

@ -129,15 +129,17 @@ function authorCreateVideoTask(settings, renderDir) {
return; return;
} }
const stem = path.stem(settings.blendfile).replace('.flamenco', ''); var frames = `${settings.frames}`;
var outfile = path.join(renderDir, `${stem}-${settings.frames}.mp4`); if (frames.search(',') != -1) {
if (outfile.search(',') != -1) {
// Get the first and last frame from the list // Get the first and last frame from the list
const chunks = frameChunker(settings.frames, 1); const chunks = frameChunker(settings.frames, 1);
const firstFrame = chunks[0]; const firstFrame = chunks[0];
const lastFrame = chunks.slice(-1)[0]; const lastFrame = chunks.slice(-1)[0];
outfile = path.join(renderDir, `${stem}-${firstFrame}-${lastFrame}.mp4`); frames = `${firstFrame}-${lastFrame}`;
} }
const stem = path.stem(settings.blendfile).replace('.flamenco', '');
const outfile = path.join(renderDir, `${stem}-${frames}.mp4`);
const outfileExt = needsPreviews ? ".jpg" : settings.image_file_extension; const outfileExt = needsPreviews ? ".jpg" : settings.image_file_extension;
const task = author.Task('preview-video', 'ffmpeg'); const task = author.Task('preview-video', 'ffmpeg');