Merge pull request #56 from Ragg-/fix/cant-resolve-ffmpeg-on-macos

Fix failed to spawn ffmpeg on macOS

src/delir-core/src/renderer/renderer.ts

@@ -472,6 +472,7 @@ export default class Renderer {
         exportPath: string,
         tmpDir: string,
         targetCompositionId: string,
+        ffmpegBin: string,
     })
     {
         return new ProgressPromise(async (
@@ -512,6 +513,7 @@ export default class Renderer {
                 },
                 inputFramerate: rootComp.framerate,
                 dest: tmpMovieFilePath,
+                ffmpegBin,
             })
 
             const progPromise = Renderer.render({
@@ -567,7 +569,7 @@ export default class Renderer {
 
             notifier({state: 'Concat and encoding...'})
             await new Promise((resolve, reject) => {
-                const ffmpeg = spawn('ffmpeg', [
+                const ffmpeg = spawn(ffmpegBin, [
                     '-y',
                     // '-f',
                     // 'utvideo',

src/renderer/services/renderer.ts

@@ -4,6 +4,7 @@ import {join} from 'path'
 import * as Delir from 'delir-core'
 import {ProjectHelper} from 'delir-core'
 
+import * as Platform from '../utils/platform'
 import dispatcher from '../dispatcher'
 import {KnownPayload} from '../actions/PayloadTypes'
 
@@ -129,6 +130,12 @@ const handlePayload = (payload: KnownPayload) => {
         }
 
         case EditorStateDispatchTypes.RenderDestinate: (() => {
+            const appPath = remote.app.getPath('exe')
+            const ffmpegBin = require('path').resolve(
+                appPath,
+                Platform.isMacOS() ? '../../Resources/ffmpeg' : './ffmpeg.exe'
+            )
+
             const file = remote.dialog.showSaveDialog(({
                 title: 'Destinate',
                 buttonLabel: 'Render',
@@ -152,6 +159,7 @@ const handlePayload = (payload: KnownPayload) => {
                     exportPath: file,
                     tmpDir: remote.app.getPath('temp'),
                     targetCompositionId: activeComp.id,
+                    ffmpegBin
                 })
                 .progress(progress => {
                     if (progress.isRendering) {