Cvanwink/arm 3

.circleci/config.yml

@@ -9,22 +9,22 @@ jobs:
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       UV_THREADPOOL_SIZE: 16
     docker:
-    - image: streampunkmedia/testbeam:10-4.1
+    - image: streampunkmedia/testbeam:16-4.4
     steps:
     - checkout
     - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
     - restore_cache:
         keys:
         # This branch if available
-        - v1-dep-{{ .Branch }}-
+        - v2-dep-{{ .Branch }}-
         # Default branch if not
-        - v1-dep-master-
+        - v2-dep-master-
         # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
-        - v1-dep-
+        - v2-dep-
     - run: npm install tap-xunit
     - run: npm install --unsafe-perm
     - save_cache:
-        key: v1-dep-{{ .Branch }}-{{ epoch }}
+        key: v2-dep-{{ .Branch }}-{{ epoch }}
         paths:
         - ./node_modules
     - run: echo 'export PATH="~/Streampunk/beamcoder/node_modules/.bin:$PATH"' >> $BASH_ENV

.circleci/test_image/Dockerfile

@@ -0,0 +1,13 @@
+FROM cimg/node:16.13
+
+# install FFmpeg
+RUN sudo apt-get update \
+  && sudo apt-get install software-properties-common \
+  && sudo add-apt-repository ppa:savoury1/ffmpeg4 \
+  && sudo apt-get update \
+  && sudo apt-get upgrade && sudo apt-get dist-upgrade \
+  && sudo apt-get install libavcodec-dev libavformat-dev libavdevice-dev libavfilter-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev
+
+# delete all the apt list files since they're big and get stale quickly
+RUN sudo rm -rf /var/lib/apt/lists/*
+# this forces "apt-get update" in dependent images, which is also good

.circleci/test_image/build.md

@@ -0,0 +1,13 @@
+# Instructions for building the CircleCI docker image for testing
+
+- install docker desktop
+- cd to this directory
+- docker build -t streampunkmedia/testbeam:x-y.z .
+- run container locally to check build
+- push to Docker Hub
+- update config.yml to pull new version tag
+- push to git to trigger new build and test
+
+(x: NodeAPI base version, y.z: FFmpeg build number)
+
+See https://circleci.com/developer/images/image/cimg/node for CircleCI docker image tags

.github/workflows/prebuild.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Use nodejs
         uses: actions/setup-node@v1
         with:
-          node-version: 14.8.0
+          node-version: 16.13.0
 
       - name: npm install
         run: npm install
@@ -37,27 +37,43 @@ jobs:
         run: brew install nasm pkg-config
         if: ${{ runner.os == 'macOS'}}
 
-      - name: install Mac dependencies (shared release)
-        run: node ./install_ffmpeg.js
+      - name: install Mac dependencies (shared release x64)
+        run: node ./install_ffmpeg.js --arch x64
+        if: ${{ runner.os == 'macOS'}}
+
+      - name: install Mac dependencies (shared release arm64)
+        run: node ./install_ffmpeg.js --arch arm64
         if: ${{ runner.os == 'macOS'}}
 
       - name: install Windows dependencies
         run: node ./install_ffmpeg.js
         if: ${{ runner.os == 'Windows'}}
 
-      - name: prebuild for macOS (x64)
-        run: npx prebuild --runtime napi --arch x64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
+      - name: prebuild Release for macOS (x64)
+        run: npx prebuild --runtime napi --arch x64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --verbose --upload ${{ secrets.GITHUB_TOKEN }}
         if: ${{ runner.os == 'macOS'}}
 
-#      - name: prebuild for macOS (arm64)
-#        run: npx prebuild --runtime napi --arch arm64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
+#      - name: prebuild Debug for macOS (x64)
+#        run: npx prebuild --debug --runtime napi --arch x64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
 #        if: ${{ runner.os == 'macOS'}}
 
+      - name: clean build directory for cross-compiling
+        run: rm ./build/Release/*.dylib
+        if: ${{ runner.os == 'macOS'}}
+
+      - name: prebuild Release for macOS (arm64)
+        run: npx prebuild --runtime napi --arch arm64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --verbose --upload ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ runner.os == 'macOS'}}
+
       - name: prebuild for Windows
-        run: npx prebuild --runtime napi --include-regex '"(\.node|\.dll|ffmpeg\.exe|ffprobe\.exe)$"' --upload ${{ secrets.GITHUB_TOKEN }}
+        run: npx prebuild --runtime napi --include-regex '.node|.dll|.exe' --verbose --upload ${{ secrets.GITHUB_TOKEN }}
         shell: bash
         if: ${{ runner.os == 'Windows'}}
 
-      - name: prebuild for Linux
-        run: npx prebuild --runtime napi --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
+      - name: prebuild for Linux (x64)
+        run: npx prebuild --runtime napi --arch x64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ runner.os == 'Linux'}}
+
+      - name: prebuild for Linux (arm64)
+        run: npx prebuild --runtime napi --arch arm64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
         if: ${{ runner.os == 'Linux'}}

.node-version

@@ -1 +1 @@
-12.18.3
+17.0.1

.vscode/c_cpp_properties.json

@@ -9,8 +9,8 @@
                 "C:/Program Files (x86)/Windows Kits/8.1/Include/shared",
                 "C:/Program Files (x86)/Windows Kits/8.1/Include/winrt",
                 "${workspaceFolder}/**",
-                "${workspaceFolder}/ffmpeg/ffmpeg-4.3.1-win64-shared/include/**",
-                "${env:USERPROFILE}/AppData/Local/node-gyp/Cache/12.18.2/include/node"
+                "${workspaceFolder}/ffmpeg/ffmpeg-4.x-win64-shared/include/**",
+                "${env:USERPROFILE}/AppData/Local/node-gyp/Cache/12.21.0/include/node"
             ],
             "defines": [
                 "_DEBUG",

.vscode/settings.json

@@ -53,5 +53,6 @@
     "xtr1common": "cpp",
     "xtree": "cpp",
     "xutility": "cpp"
-  }
+  },
+  "cmake.configureOnOpen": false
 }

README.md

@@ -92,8 +92,7 @@ This will install all necessary dependencies, download the FFmpeg shared and dev
 
 Note that if you want to use a local version of FFmpeg then, before the install, symbolic link or copy appropriate folders to:
 
-    ./node_modules/beamcoder/ffmpeg/ffmpeg-4.1-win64-shared
-    ./node_modules/beamcoder/ffmpeg/ffmpeg-4.1-win64-dev
+    ./node_modules/beamcoder/ffmpeg/ffmpeg-4.x-win64-shared
 
 To ensure that sufficient threads are available to process several requests in parallel, set the `UV_THREADPOOL_SIZE` environment variable, e.g.:
 

binding.gyp

@@ -38,7 +38,7 @@
         },
         "copies": [
             {
-              "destination": "build/Release/",
+              "destination": "<(PRODUCT_DIR)",
               "files": [
                 "node_modules/ffmpeg-ffprobe-static/ffmpeg",
                 "node_modules/ffmpeg-ffprobe-static/ffprobe",
@@ -48,7 +48,8 @@
       }],
       ["OS=='mac'", {
         "variables": {
-           "ffmpeg_version": "1.21.rc6"
+           "ffmpeg_version": "1.33rc3",
+           "target_arch_override": "<!(node -p \"'<(target_arch)' === 'x64' ? 'x86_64' : '<(target_arch)'\")",
         },
         "defines": [
           "__STDC_CONSTANT_MACROS"
@@ -62,11 +63,11 @@
           "-fexceptions"
         ],
         "include_dirs": [
-          "<(module_root_dir)/ffmpeg/ffmpeg-ffprobe-shared-darwin-x86_64.<(ffmpeg_version)/include/"
+          "<(module_root_dir)/ffmpeg/ffmpeg-ffprobe-shared-darwin-<(target_arch_override).<(ffmpeg_version)/include/"
         ],
         "link_settings": {
           "library_dirs": [
-            "<(module_root_dir)/ffmpeg/ffmpeg-ffprobe-shared-darwin-x86_64.<(ffmpeg_version)/"
+            "<(module_root_dir)/ffmpeg/ffmpeg-ffprobe-shared-darwin-<(target_arch_override).<(ffmpeg_version)/"
           ],
           "libraries": [
             "-Wl,-rpath,@loader_path",
@@ -85,9 +86,9 @@
         },
         "copies": [
             {
-              "destination": "build/Release/",
+              "destination": "<(PRODUCT_DIR)",
               "files": [
-                "<!@(node -p \"require('fs').readdirSync('ffmpeg/ffmpeg-ffprobe-shared-darwin-x86_64.<(ffmpeg_version)').map(f => 'ffmpeg/ffmpeg-ffprobe-shared-darwin-x86_64.<(ffmpeg_version)/' + f).join(' ')\")"
+                "<!@(node -p \"require('fs').readdirSync('ffmpeg/ffmpeg-ffprobe-shared-darwin-<(target_arch_override).<(ffmpeg_version)').map(f => 'ffmpeg/ffmpeg-ffprobe-shared-darwin-<(target_arch_override).<(ffmpeg_version)/' + f).join(' ')\")"
               ]
             }
           ]
@@ -105,32 +106,32 @@
           }
         },
         "include_dirs" : [
-          "ffmpeg/ffmpeg-4.3-win64-shared/include"
+          "ffmpeg/ffmpeg-4.x-win64-shared/include"
         ],
         "libraries": [
-          "-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/avcodec",
-          "-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/avdevice",
-          "-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/avfilter",
-          "-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/avformat",
-          "-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/avutil",
-          "-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/postproc",
-          "-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/swresample",
-          "-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/swscale"
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avcodec",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avdevice",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avfilter",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avformat",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avutil",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/postproc",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/swresample",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/swscale"
         ],
         "copies": [
             {
-              "destination": "build/Release/",
+              "destination": "<(PRODUCT_DIR)",
               "files": [
-                "ffmpeg/ffmpeg-4.3-win64-shared/bin/avcodec-58.dll",
-                "ffmpeg/ffmpeg-4.3-win64-shared/bin/avdevice-58.dll",
-                "ffmpeg/ffmpeg-4.3-win64-shared/bin/avfilter-7.dll",
-                "ffmpeg/ffmpeg-4.3-win64-shared/bin/avformat-58.dll",
-                "ffmpeg/ffmpeg-4.3-win64-shared/bin/avutil-56.dll",
-                "ffmpeg/ffmpeg-4.3-win64-shared/bin/postproc-55.dll",
-                "ffmpeg/ffmpeg-4.3-win64-shared/bin/swresample-3.dll",
-                "ffmpeg/ffmpeg-4.3-win64-shared/bin/swscale-5.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/avcodec-58.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/avdevice-58.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/avfilter-7.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/avformat-58.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/avutil-56.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/postproc-55.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/swresample-3.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/swscale-5.dll",
                 "node_modules/ffmpeg-ffprobe-static/ffmpeg.exe",
-                "node_modules/ffmpeg-ffprobe-static/ffprobe.exe",
+                "node_modules/ffmpeg-ffprobe-static/ffprobe.exe"
               ]
             }
           ]

install_ffmpeg.js

@@ -24,6 +24,7 @@ const fs = require('fs');
 const util = require('util');
 const https = require('https');
 const cp = require('child_process');
+const { argv } = require('process');
 const [ mkdir, access, rename, execFile, exec ] = // eslint-disable-line
   [ fs.mkdir, fs.access, fs.rename, cp.execFile, cp.exec ].map(util.promisify);
 
@@ -83,7 +84,7 @@ async function inflate(rs, folder, name) {
   return new Promise((comp, err) => {
     console.log(`Unzipping '${folder}/${name}.zip'.`);
     rs.pipe(unzip.Extract({ path: folder }).on('close', () => {
-      fs.rename(`./${folder}/${directoryName}`, `./${folder}/${name}`, () => {
+      fs.rename(`${folder}/${directoryName}`, `${folder}/${name}`, () => {
         console.log(`Unzipping of '${folder}/${name}.zip' completed.`);
         comp();
       });
@@ -100,14 +101,16 @@ async function win32() {
     else throw e;
   });
 
-  const ffmpegFilename = 'ffmpeg-4.3-win64-shared';
+  const ffmpegFilename = 'ffmpeg-4.x-win64-shared';
   await access(`ffmpeg/${ffmpegFilename}`, fs.constants.R_OK).catch(async () => {
     const html = await getHTML('https://github.com/BtbN/FFmpeg-Builds/wiki/Latest', 'latest autobuilds');
     const htmlStr = html.toString('utf-8');
     const autoPos = htmlStr.indexOf('<p><a href=');
     const endPos = htmlStr.indexOf('</div>', autoPos);
     const autoStr = htmlStr.substring(autoPos, endPos);
-    const sharedEndPos = autoStr.lastIndexOf('">win64-gpl-shared-4.3');
+    const sharedEndPos = autoStr.lastIndexOf('">win64-gpl-shared-4.');
+    if (sharedEndPos === -1)
+      throw new Error('Failed to find latest v4.x autobuild from "https://github.com/BtbN/FFmpeg-Builds/wiki/Latest"');
     const startStr = '<p><a href="';
     const sharedStartPos = autoStr.lastIndexOf(startStr, sharedEndPos) + startStr.length;
     const downloadSource = autoStr.substring(sharedStartPos, sharedEndPos);
@@ -182,14 +185,30 @@ async function darwin() {
     else throw e;
   });
 
-  const version = '1.21.rc6';
-  const ffmpegFilename = `ffmpeg-ffprobe-shared-darwin-x86_64.${version}`;
+  const version = '1.33rc3';
+
+  // default to platform-architecture
+  let arch = os.arch()
+
+  // but if the '--arch' argument is provided
+  // use the next argument as the value (e.g. 'x64' or 'arm64')
+  const overrideArchIndex = process.argv.indexOf('--arch');
+  if (0 < overrideArchIndex && overrideArchIndex < process.argv.length - 1) {
+    arch = process.argv[overrideArchIndex + 1];
+  }
+
+  if (arch === 'x64') {
+    arch = 'x86_64';
+  }
+
+  const ffmpegFilename = `ffmpeg-ffprobe-shared-darwin-${arch}.${version}`;
+  const tag = `v${version}`
 
   await access(`ffmpeg/${ffmpegFilename}`, fs.constants.R_OK).catch(async () => {
     const ws = fs.createWriteStream(`ffmpeg/${ffmpegFilename}.zip`);
     await get(
       ws,
-      `https://github.com/descriptinc/ffmpeg-build-script/releases/download/v${version}/${ffmpegFilename}.zip`,
+      `https://github.com/descriptinc/ffmpeg-build-script/releases/download/${tag}/${ffmpegFilename}.zip`,
       `${ffmpegFilename}.zip`
     ).catch(async (err) => {
       if (err.name === 'RedirectError') {
@@ -211,19 +230,19 @@ case 'win32':
     console.error('Only 64-bit platforms are supported.');
     process.exit(1);
   } else {
-    win32();
+    win32().catch(console.error);
   }
   break;
 case 'linux':
-  if (os.arch() != 'x64') {
+  if (os.arch() != 'x64' && os.arch() != 'arm64') {
     console.error('Only 64-bit platforms are supported.');
     process.exit(1);
   } else {
     linux();
   }
   break;
 case 'darwin':
-  if (os.arch() != 'x64') {
+  if (os.arch() != 'x64' && os.arch() != 'arm64') {
     console.error('Only 64-bit platforms are supported.');
     process.exit(1);
   } else {