Merge 596d7d1 into b03837f

delucis · Jul 19, 2019 · 0593b99 · 0593b99
2 parents b03837f + 596d7d1
commit 0593b99
Show file tree

Hide file tree

Showing 4 changed files with 1,572 additions and 1,322 deletions.
diff --git a/lib/compile-video.js b/lib/compile-video.js
@@ -16,7 +16,7 @@ module.exports = compileVideo
  * @param   {Number}  initialFrame Frame number the sequence starts on
  * @return  {Promise<String>}   Returns the path to the saved video file
  */
-function compileVideo (
+async function compileVideo (
   frameDir,
   {
     outDir = process.cwd(),
@@ -29,11 +29,11 @@ function compileVideo (
   validate('S|SO', arguments)
   validate('SSNS', [outDir, filename, fps, frameFormat])
 
-  return new Promise(async (resolve, reject) => {
-    const framesPath = join(frameDir, `%d.${frameFormat}`)
+  const framesPath = join(frameDir, `%d.${frameFormat}`)
 
-    await mkdir(outDir)
+  await mkdir(outDir)
 
+  return new Promise((resolve, reject) => {
     // spawn a child process and use ffmpeg to compile frames to video file
     const ffmpeg = spawn(ffmpegPath, [
       '-v', 'warning',

diff --git a/lib/frame-maker.js b/lib/frame-maker.js
@@ -121,9 +121,7 @@ async function FrameMaker (
     let imageData
     for (let sample = 0; sample < samplesPerFrame; sample++) {
       const sampleFrame = frame + sample * shutterAngle / samplesPerFrame
-      try {
-        await drawFrame(sampleFrame, canvas, context)
-      } catch (error) { throw error }
+      await drawFrame(sampleFrame, canvas, context)
       imageData = context.getImageData(0, 0, width, height)
       for (let idx = 0; idx < imageData.data.length; idx++) {
         composite[idx] += imageData.data[idx]
@@ -145,27 +143,23 @@ async function FrameMaker (
      * @param  {Number} frame       The current frame number
      * @return {Promise<Buffer>}    Resolves to an image buffer
      */
-    getFrame (frame) {
-      return new Promise(async (resolve, reject) => {
-        let canvas, context
-        if (renderInParallel) {
-          canvas = createCanvas(width, height)
-          context = canvas.getContext('2d')
-        } else {
-          canvas = rootCanvas
-          context = rootContext
-        }
-
-        try {
-          if (samplesPerFrame > 1) {
-            await drawWithMotionBlur(frame, canvas, context)
-          } else {
-            await drawFrame(frame, canvas, context)
-          }
-        } catch (error) {
-          reject(error)
-        }
+    async getFrame (frame) {
+      let canvas, context
+      if (renderInParallel) {
+        canvas = createCanvas(width, height)
+        context = canvas.getContext('2d')
+      } else {
+        canvas = rootCanvas
+        context = rootContext
+      }
+
+      if (samplesPerFrame > 1) {
+        await drawWithMotionBlur(frame, canvas, context)
+      } else {
+        await drawFrame(frame, canvas, context)
+      }
 
+      return new Promise((resolve, reject) => {
         canvas.toBuffer(
           function (error, buffer) {
             if (error) reject(error)