descriptinc
diff --git a/‎.github/workflows/prebuild.yml‎
Lines changed: 83 additions & 0 deletions b/‎.github/workflows/prebuild.yml‎
Lines changed: 83 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 3 additions & 0 deletions b/‎.gitignore‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎.node-version‎
Lines changed: 1 addition & 0 deletions b/‎.node-version‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎binding.gyp‎
Lines changed: 71 additions & 6 deletions b/‎binding.gyp‎
Lines changed: 71 additions & 6 deletions
diff --git a/‎index.js‎
Lines changed: 6 additions & 0 deletions b/‎index.js‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎install.js‎
Lines changed: 5 additions & 0 deletions b/‎install.js‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎install_ffmpeg.js‎
100644100755
Lines changed: 50 additions & 30 deletions b/‎install_ffmpeg.js‎
100644100755
Lines changed: 50 additions & 30 deletions
@@ -0,0 +1,83 @@
+name: prebuild
+on: [push]
+
+jobs:
+  package:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-20.04
+          - macos-latest
+          - windows-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          lfs: true
+
+      - name: Use nodejs
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.13.0
+
+      - name: npm install
+        run: npm install
+        env:
+          PREBUILD: true
+
+      - name: install Linux dependencies
+        run: |
+          sudo add-apt-repository ppa:savoury1/ffmpeg4
+          sudo apt-get update
+          sudo apt-get install libavcodec-dev libavformat-dev libavdevice-dev libavfilter-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev libzimg-dev
+        if: ${{ runner.os == 'Linux' }}
+
+      - name: check Linux dependencies
+        run: node ./install_ffmpeg.js
+        if: ${{ runner.os == 'Linux'}}
+
+      - name: install Mac build dependencies (brew)
+        run: brew install nasm pkg-config
+        if: ${{ runner.os == 'macOS'}}
+
+      - 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 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 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|.exe' --verbose --upload ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        if: ${{ runner.os == 'Windows'}}
+
+      - 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'}}
@@ -62,6 +62,7 @@ typings/
 
 # Native module build dir
 build/
+prebuilds/
 
 # FFmpeg install folder
 ffmpeg/
@@ -73,3 +74,5 @@ ffmpeg/
 # Editors and IDE's
 *.swp
 .vscode/
+
+.DS_Store
@@ -0,0 +1 @@
+17.0.1
@@ -104,7 +104,7 @@ On Linux, use the appropriate package manager to install the FFmpeg 4.1 developm
 
     sudo add-apt-repository ppa:jonathonf/ffmpeg-4
     sudo apt-get update
-    sudo apt-get install libavcodec-dev libavformat-dev libavdevice-dev libavfilter-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev
+    sudo apt-get install libavcodec-dev libavformat-dev libavdevice-dev libavfilter-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev libzimg-dev
 
 An example for Debian / Redhat / Fedora / CentOs will follow.
 
 
@@ -8,8 +8,11 @@
                   "src/packet.cc", "src/frame.cc",
                   "src/codec_par.cc", "src/format.cc",
                   "src/codec.cc", "src/hwcontext.cc" ],
+    "defines": [
+       "NAPI_VERSION=<(napi_build_version)"
+    ],
     "conditions": [
-      ['OS!="win"', {
+      ['OS=="linux"', {
         "defines": [
           "__STDC_CONSTANT_MACROS"
         ],
@@ -30,16 +33,76 @@
             "-lavutil",
             "-lpostproc",
             "-lswresample",
-            "-lswscale"
+            "-lswscale",
+            "-lzimg"
+          ]
+        },
+        "copies": [
+            {
+              "destination": "<(PRODUCT_DIR)",
+              "files": [
+                "node_modules/ffmpeg-ffprobe-static/ffmpeg",
+                "node_modules/ffmpeg-ffprobe-static/ffprobe",
+              ]
+            }
           ]
-        }
       }],
+      ["OS=='mac'", {
+        "variables": {
+           "ffmpeg_version": "1.33rc3",
+           "target_arch_override": "<!(node -p \"'<(target_arch)' === 'x64' ? 'x86_64' : '<(target_arch)'\")",
+        },
+        "defines": [
+          "__STDC_CONSTANT_MACROS"
+        ],
+        "cflags_cc!": [
+          "-fno-rtti",
+          "-fno-exceptions"
+        ],
+        "cflags_cc": [
+          "-std=c++11",
+          "-fexceptions"
+        ],
+        "include_dirs": [
+          "<(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-<(target_arch_override).<(ffmpeg_version)/"
+          ],
+          "libraries": [
+            "-Wl,-rpath,@loader_path",
+            "-lavcodec",
+            "-lavdevice",
+            "-lavfilter",
+            "-lavformat",
+            "-lavutil",
+            "-lpostproc",
+            "-lswresample",
+            "-lswscale",
+            "-lzimg"
+          ],
+        },
+        'xcode_settings': {
+          'MACOSX_DEPLOYMENT_TARGET': '10.11',
+        },
+        "copies": [
+            {
+              "destination": "<(PRODUCT_DIR)",
+              "files": [
+                "<!@(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(' ')\")"
+              ]
+            }
+          ]
+      }
+      ],
       ['OS=="win"', {
         "configurations": {
           "Release": {
             "msvs_settings": {
               "VCCLCompilerTool": {
-                "RuntimeTypeInfo": "true"
+                "RuntimeTypeInfo": "true",
+                "AdditionalOptions": ['/WX']
               }
             }
           }
@@ -59,7 +122,7 @@
         ],
         "copies": [
             {
-              "destination": "build/Release/",
+              "destination": "<(PRODUCT_DIR)",
               "files": [
                 "ffmpeg/ffmpeg-4.x-win64-shared/bin/avcodec-58.dll",
                 "ffmpeg/ffmpeg-4.x-win64-shared/bin/avdevice-58.dll",
@@ -68,7 +131,9 @@
                 "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"
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/swscale-5.dll",
+                "node_modules/ffmpeg-ffprobe-static/ffmpeg.exe",
+                "node_modules/ffmpeg-ffprobe-static/ffprobe.exe"
               ]
             }
           ]
 
@@ -35,6 +35,12 @@ https://github.com/Streampunk/beamcoder/blob/master/LICENSE`;
 console.log(splash);
 console.log('Using FFmpeg version', beamcoder.avVersionInfo());
 
+if (Object.values(beamcoder.configurations()).some(value => value.includes('--enable-small'))) {
+  console.error('beamcoder will crash because ffmpeg is compiled' +
+    ' with --enable-small (because, for example, codec->long_name is ' +
+    'NULL and beamcoder expects it to be defined)');
+}
+
 beamcoder.demuxerStream = beamstreams.demuxerStream;
 beamcoder.muxerStream = beamstreams.muxerStream;
 
 
@@ -0,0 +1,5 @@
+const {execSync} = require('child_process');
+
+if (!process.env.PREBUILD) {
+  execSync('npx prebuild-install --runtime napi');
+}
@@ -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();
       });
@@ -166,46 +167,65 @@ async function linux() {
     console.error('libswscale.so.5 is not installed.');
     result = 1;
   }
+  if (stdout.indexOf('libzimg.so.2') < 0) {
+    console.error('libzimg.so.2 is not installed.');
+    result = 1;
+  }
 
   if (result === 1) {
     console.log(`Try running the following (Ubuntu/Debian):
-sudo add-apt-repository ppa:jonathonf/ffmpeg-4
-sudo apt-get install libavcodec-dev libavformat-dev libavdevice-dev libavfilter-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev`);
+sudo add-apt-repository ppa:savoury1/ffmpeg4
+sudo apt-get install libavcodec-dev libavformat-dev libavdevice-dev libavfilter-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev libzimg-dev`);
     process.exit(1);
   }
   return result;
 }
 
 async function darwin() {
-  console.log('Checking for FFmpeg dependencies via HomeBrew.');
-  let output;
-  let returnMessage;
+  console.log('Checking/downloading ffmpeg shared libraries');
+
+  await mkdir('ffmpeg').catch(e => {
+    if (e.code === 'EEXIST') return;
+    else throw e;
+  });
+
+  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];
+  }
 
-  try {
-    output = await exec('brew list ffmpeg');
-    returnMessage = 'FFmpeg already present via Homebrew.';
-  } catch (err) {
-    if (err.stderr !== 'Error: No such keg: /usr/local/Cellar/ffmpeg\n') {
-      console.error(err);
-      console.log('Either Homebrew is not installed or something else is wrong.\nExiting');
-      process.exit(1);
-    }
-
-    console.log('FFmpeg not installed. Attempting to install via Homebrew.');
-    try {
-      output = await exec('brew install nasm pkg-config texi2html ffmpeg');
-      returnMessage = 'FFmpeg installed via Homebrew.';
-    } catch (err) {
-      console.log('Failed to install ffmpeg:\n');
-      console.error(err);
-      process.exit(1);
-    }
+  if (arch === 'x64') {
+    arch = 'x86_64';
   }
 
-  console.log(output.stdout);
-  console.log(returnMessage);
+  const ffmpegFilename = `ffmpeg-ffprobe-shared-darwin-${arch}.${version}`;
+  const tag = `v${version}`
 
-  return 0;
+  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/${tag}/${ffmpegFilename}.zip`,
+      `${ffmpegFilename}.zip`
+    ).catch(async (err) => {
+      if (err.name === 'RedirectError') {
+        const redirectURL = err.message;
+        await get(ws, redirectURL, `${ffmpegFilename}.zip`);
+      } else {
+        console.error(err);
+        throw err;
+      }
+    });
+
+    await exec(`unzip ffmpeg/${ffmpegFilename}.zip -d ffmpeg/${ffmpegFilename}/`);
+  });
 }
 
 switch (os.platform()) {
@@ -218,15 +238,15 @@ case 'win32':
   }
   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 {