Merge pull request #428 from charlielee/issue-402-2

Fix macOS video export
charlielee · Dec 13, 2022 · 7f07877 · 7f07877
2 parents 706922f + eeb8368
commit 7f07877
Show file tree

Hide file tree

Showing 4 changed files with 153 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "package:dist": "electron-builder"
   },
   "dependencies": {
-    "@ffmpeg-installer/ffmpeg": "^1.1.0",
+    "@ffmpeg-installer/ffmpeg": "1.1.0",
     "@redux-devtools/extension": "^3.2.3",
     "classnames": "^2.3.1",
     "conf": "^10.0.3",
@@ -57,6 +57,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^14.4.3",
+    "@types/ffmpeg-installer__ffmpeg": "^1.0.0",
     "@types/jest": "^28.1.6",
     "@types/node": "^16.5.0",
     "@types/react": "^18.0.17",

diff --git a/src/renderer/services/project/projectBuilder.test.ts b/src/renderer/services/project/projectBuilder.test.ts
@@ -29,7 +29,7 @@ describe("makeTake", () => {
 
 describe("makeFrameTrackItem", () => {
   it("should make frame track item with no Track Group ID supplied", () => {
-    const filePath = "/frame.png";
+    const filePath = "/frame.jpg";
 
     expect(makeFrameTrackItem(filePath)).toStrictEqual({
       filePath,
@@ -40,7 +40,7 @@ describe("makeFrameTrackItem", () => {
   });
 
   it("should make frame track item with Track Group ID supplied", () => {
-    const filePath = "/frame.png";
+    const filePath = "/frame.jpg";
     const trackGroupId = TRACK_GROUP_ID;
 
     expect(makeFrameTrackItem(filePath, trackGroupId)).toStrictEqual({
@@ -67,7 +67,7 @@ describe("makeFrameFilePath", () => {
     const fileName = "cheese";
 
     expect(makeFrameFilePath(take, fileName)).toEqual(
-      `${takeDirectoryPath}/ba_002_03_frame_cheese.png`
+      `${takeDirectoryPath}/ba_002_03_frame_cheese.jpg`
     );
   });
 
@@ -77,7 +77,7 @@ describe("makeFrameFilePath", () => {
     const takeDirectoryPath = makeTakeDirectoryPath(options);
 
     expect(makeFrameFilePath(take)).toEqual(
-      `${takeDirectoryPath}/ba_002_03_frame_00004.png`
+      `${takeDirectoryPath}/ba_002_03_frame_00004.jpg`
     );
   });
 });
diff --git a/src/renderer/services/project/projectBuilder.ts b/src/renderer/services/project/projectBuilder.ts
@@ -64,6 +64,6 @@ export const makeFrameFilePath = (take: Take, frameName?: string): string =>
       zeroPad(take.shotNumber, 3),
       zeroPad(take.takeNumber, 2),
       "frame",
-      `${frameName ?? zeroPad(take.lastExportedFrameNumber + 1, 5)}.png`,
+      `${frameName ?? zeroPad(take.lastExportedFrameNumber + 1, 5)}.jpg`,
     ].join("_")
   );