Spaces:
Running
Running
Commit
·
ef340fc
1
Parent(s):
6256e8c
Update render script'
Browse files- app.js +2 -2
- renderer.js +11 -1
- routes.js +2 -1
app.js
CHANGED
|
@@ -409,10 +409,10 @@ app.all('/render', async (req, res) => {
|
|
| 409 |
let npmScript = req.query.media_type == 'image' ? 'render-still' : 'render-build';
|
| 410 |
if (manuObj.meta.posterImage) {
|
| 411 |
doRenderPoster(jobID, () => {
|
| 412 |
-
doRender(jobID, manuObj.meta.renderComposition, cb,
|
| 413 |
});
|
| 414 |
} else {
|
| 415 |
-
doRender(jobID, manuObj.meta.renderComposition, cb,
|
| 416 |
}
|
| 417 |
} else {
|
| 418 |
notify(
|
|
|
|
| 409 |
let npmScript = req.query.media_type == 'image' ? 'render-still' : 'render-build';
|
| 410 |
if (manuObj.meta.posterImage) {
|
| 411 |
doRenderPoster(jobID, () => {
|
| 412 |
+
doRender(jobID, manuObj.meta.renderComposition, cb, req.query.media_type);
|
| 413 |
});
|
| 414 |
} else {
|
| 415 |
+
doRender(jobID, manuObj.meta.renderComposition, cb, req.query.media_type);
|
| 416 |
}
|
| 417 |
} else {
|
| 418 |
notify(
|
renderer.js
CHANGED
|
@@ -35,7 +35,17 @@ export async function generateOutputBundle(jobId) {
|
|
| 35 |
return outFile;
|
| 36 |
}
|
| 37 |
|
| 38 |
-
export function
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
const npmScript = 'render-build';
|
| 40 |
const renderComposition = composition || 'SemibitComposition';
|
| 41 |
let outFile = `out/${jobId}-video.mp4`;
|
|
|
|
| 35 |
return outFile;
|
| 36 |
}
|
| 37 |
|
| 38 |
+
export function getNpmScript(mediaType) {
|
| 39 |
+
if (mediaType === 'image') {
|
| 40 |
+
return 'render-still';
|
| 41 |
+
} else if (mediaType === 'video') {
|
| 42 |
+
return 'render-build';
|
| 43 |
+
} else {
|
| 44 |
+
return 'render-build';
|
| 45 |
+
}
|
| 46 |
+
}
|
| 47 |
+
|
| 48 |
+
export function doRender(jobId, composition, sendToObserver, npmScript = 'render-build') {
|
| 49 |
const npmScript = 'render-build';
|
| 50 |
const renderComposition = composition || 'SemibitComposition';
|
| 51 |
let outFile = `out/${jobId}-video.mp4`;
|
routes.js
CHANGED
|
@@ -66,7 +66,8 @@ RenderRouter.post('/api/render-sync', async (req, res) => {
|
|
| 66 |
originalManuscript.meta.renderComposition,
|
| 67 |
(jobId, log) => {
|
| 68 |
logs.push(log);
|
| 69 |
-
}
|
|
|
|
| 70 |
);
|
| 71 |
}
|
| 72 |
const uploader = new FileUploader('oracle', {
|
|
|
|
| 66 |
originalManuscript.meta.renderComposition,
|
| 67 |
(jobId, log) => {
|
| 68 |
logs.push(log);
|
| 69 |
+
},
|
| 70 |
+
getNpmScript(req.query.media_type)
|
| 71 |
);
|
| 72 |
}
|
| 73 |
const uploader = new FileUploader('oracle', {
|