Streampunk · Nov 10, 2021 · May 30, 2023 · Dec 13, 2023 · Dec 13, 2023 · Dec 13, 2023
diff --git a/.github/workflows/prebuild.yml b/.github/workflows/prebuild.yml
@@ -0,0 +1,100 @@
+name: prebuild
+on: [push]
+
+permissions:
+  contents: write
+
+jobs:
+  linux-package:
+    permissions:
+      contents: write
+    runs-on: ubuntu-24.04
+    container:
+      image: node:18.20.4-bookworm
+    steps:
+      - name: check Linux dependencies
+        shell: bash
+        run: |
+          apt update
+          DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \
+          git git-lfs libxcb1 unzip curl python3-setuptools build-essential libxcb1-dev \
+          libavcodec-dev libavformat-dev libavdevice-dev libavfilter-dev libavutil-dev \
+          libpostproc-dev libswresample-dev libswscale-dev libzimg-dev
+
+      - uses: actions/checkout@v2
+        with:
+          lfs: true
+
+      - name: npm install
+        run: npm install
+        env:
+          PREBUILD: true
+
+      - name: check Linux dependencies
+        run: node ./install_ffmpeg.js
+
+      - name: prebuild for Linux (x64)
+        run: npx prebuild --runtime napi --arch x64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
+
+  windows-package:
+    permissions:
+      contents: write
+    runs-on: 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 Windows dependencies
+        run: node ./install_ffmpeg.js
+
+      - name: prebuild for Windows
+        run: npx prebuild --runtime napi --include-regex '.node|.dll|.exe' --verbose --upload ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+
+  macos-package:
+    permissions:
+      contents: write
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          lfs: true
+
+      - name: Use nodejs
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.13.0
+
+      - name: install Mac build dependencies (brew)
+        run: |
+          brew install nasm pkg-config python-packaging python-setuptools
+
+      - name: npm install
+        run: npm install
+        env:
+          PREBUILD: true
+
+      - name: install Mac dependencies (shared release x64)
+        run: node ./install_ffmpeg.js --arch x64
+
+      - name: install Mac dependencies (shared release arm64)
+        run: node ./install_ffmpeg.js --arch arm64
+
+      - name: prebuild Release for macOS (x64)
+        run: npx prebuild --runtime napi --arch x64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --verbose --upload ${{ secrets.GITHUB_TOKEN }}
+
+      - name: clean build directory for cross-compiling
+        run: rm ./build/Release/*.dylib || true
+
+      - name: prebuild Release for macOS (arm64)
+        run: npx prebuild --runtime napi --arch arm64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --verbose --upload ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -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
diff --git a/.node-version b/.node-version
@@ -0,0 +1 @@
+16.20.2
diff --git a/README.md b/README.md
@@ -105,7 +105,7 @@ On Linux, use the appropriate package manager to install the FFmpeg 4.1 developm
     sudo add-apt-repository ppa:jonathonf/ffmpeg-4
     sudo add-apt-repository ppa:savoury1/ffmpeg5    
     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.
 

diff --git a/binding.gyp b/binding.gyp
@@ -1,16 +1,23 @@
 {
   "targets": [{
     "target_name" : "beamcoder",
-    "sources" : [ "src/beamcoder.cc", "src/beamcoder_util.cc", 
+    "defines": [
+       "NAPI_VERSION=<(napi_build_version)"
+    ],
+    "sources" : [ "src/beamcoder.cc", "src/beamcoder_util.cc",
                   "src/log.cc" ,
                   "src/governor.cc", "src/demux.cc",
                   "src/decode.cc", "src/filter.cc",
                   "src/encode.cc", "src/mux.cc",
                   "src/packet.cc", "src/frame.cc",
                   "src/codec_par.cc", "src/format.cc",
-                  "src/codec.cc", "src/hwcontext.cc"],
+                  "src/codec.cc", "src/hwcontext.cc" ],
     "conditions": [
-      ['OS!="win"', {
+      ['OS=="linux"', {
+        "variables": {
+           "ffmpeg_version": "1.49.rc.1",
+           "target_arch_override": "<!(node -p \"'<(target_arch)' === 'x64' ? 'x86_64' : '<(target_arch)'\")",
+        },
         "defines": [
           "__STDC_CONSTANT_MACROS"
         ],
@@ -21,28 +28,89 @@
         "cflags_cc": [
           "-std=c++11",
           "-fexceptions"
-        ]
+        ],
+        "include_dirs": [
+          "<(module_root_dir)/ffmpeg/ffmpeg-ffprobe-shared-linux-<(target_arch_override).<(ffmpeg_version)/include/"
+        ],
+
+        "link_settings": {
+            "ldflags": [
+                "--verbose"
+            ],
+          "libraries": [
+              "-Wl,-rpath,./build/Release/ "
+              "-L<(module_root_dir)/ffmpeg/ffmpeg-ffprobe-shared-linux-<(target_arch_override).<(ffmpeg_version)/ "
+              "-lavcodec",
+              "-lavdevice",
+              "-lavfilter",
+              "-lavformat",
+              "-lavutil",
+              "-lpostproc",
+              "-lswresample",
+              "-lswscale",
+              "-lzimg"
+          ]
+        },
+        "copies": [
+            {
+              "destination": "<(PRODUCT_DIR)",
+              "files": [
+                "node_modules/ffmpeg-ffprobe-static/ffmpeg",
+                "node_modules/ffmpeg-ffprobe-static/ffprobe",
+              ]
+            }
+          ]
       }],
-      ['OS!="win" and OS!="linux"', {
+      ["OS=='mac'", {
+        "variables": {
+           "ffmpeg_version": "1.49.rc.1",
+           "target_arch_override": "<!(node -p \"'<(target_arch)' === 'x64' ? 'x86_64' : '<(target_arch)'\")",
+        },
+        "defines": [
+          "__STDC_CONSTANT_MACROS"
+        ],
+        "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"
+            "-lswscale",
+            "-lzimg"
+          ],
+        },
+        'xcode_settings': {
+          'MACOSX_DEPLOYMENT_TARGET': '10.11',
+          'OTHER_CFLAGS': ['-fno-rtti', '-fno-exceptions', '-arch <(target_arch_override)', '-v'],
+          'OTHER_LDFLAGS': ['-arch <(target_arch_override)'],
+        },
+        "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": []
               }
             }
           }
@@ -62,7 +130,7 @@
         ],
         "copies": [
             {
-              "destination": "build/Release/",
+              "destination": "<(PRODUCT_DIR)",
               "files": [
                 "ffmpeg/ffmpeg-5.x-win64-shared/bin/avcodec-59.dll",
                 "ffmpeg/ffmpeg-5.x-win64-shared/bin/avdevice-59.dll",
@@ -71,31 +139,13 @@
                 "ffmpeg/ffmpeg-5.x-win64-shared/bin/avutil-57.dll",
                 "ffmpeg/ffmpeg-5.x-win64-shared/bin/postproc-56.dll",
                 "ffmpeg/ffmpeg-5.x-win64-shared/bin/swresample-4.dll",
-                "ffmpeg/ffmpeg-5.x-win64-shared/bin/swscale-6.dll"
+                "ffmpeg/ffmpeg-5.x-win64-shared/bin/swscale-6.dll",
+                "node_modules/ffmpeg-ffprobe-static/ffmpeg.exe",
+                "node_modules/ffmpeg-ffprobe-static/ffprobe.exe"
               ]
             }
           ]
     }],
-    ['OS=="linux"', {
-      "libraries": [
-        "<!(pkg-config --libs libavcodec)",
-        "<!(pkg-config --libs libavdevice)",
-        "<!(pkg-config --libs libavfilter)",
-        "<!(pkg-config --libs libavformat)",
-        "<!(pkg-config --libs libavutil)",
-        "<!(pkg-config --libs libpostproc)",
-        "<!(pkg-config --libs libswresample)",
-        "<!(pkg-config --libs libswscale)"
-      ]
-    }],
-    ['OS=="mac"', {
-      "include_dirs" : [
-        "/opt/homebrew/Cellar/ffmpeg/5.0/include"
-      ],
-      "library_dirs": [
-        "/opt/homebrew/Cellar/ffmpeg/5.0/lib",
-      ]
-    }],
   ]
 }]
 }
diff --git a/index.js b/index.js
@@ -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;
 

diff --git a/install.js b/install.js
@@ -0,0 +1,5 @@
+const {execSync} = require('child_process');
+
+if (!process.env.PREBUILD) {
+  execSync('npx prebuild-install --target 4 --runtime napi');
+}
diff --git a/install_ffmpeg.js b/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();
       });
@@ -166,46 +167,66 @@ async function linux() {
     console.error('libswscale.so.6 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 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.49.rc.1';
+
+  // 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}`;
+
+  await access(`ffmpeg/${ffmpegFilename}`, fs.constants.R_OK).catch(async () => {
+    const ws = fs.createWriteStream(`ffmpeg/${ffmpegFilename}.zip`);
+    const url = `https://github.com/descriptinc/ffmpeg-build-script/releases/download/${tag}/${ffmpegFilename}.zip`
+    console.log(url);
+    await get(
+      ws,
+      url,
+      `${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;
+      }
+    });
 
-  return 0;
+    await exec(`unzip ffmpeg/${ffmpegFilename}.zip -d ffmpeg/${ffmpegFilename}/`);
+  });
 }
 
 switch (os.platform()) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,21 +1,38 @@
 {
-  "name": "beamcoder",
-  "version": "0.7.1",
+  "name": "beamcoder-prebuild",
+  "version": "0.7.1-rc.18",
   "description": "Node.js native bindings to FFmpeg.",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
-    "preinstall": "node install_ffmpeg.js",
-    "install": "node-gyp rebuild",
+    "install": "node install.js",
+    "postinstall": "node postinstall.js",
     "test": "tape test/*.js",
     "lint": "eslint **/*.js",
     "lint-html": "eslint **/*.js -f html -o ./reports/lint-results.html",
     "lint-fix": "eslint --fix **/*.js"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Streampunk/beamcoder.git"
+    "url": "git+https://github.com/descriptinc/beamcoder.git"
   },
+  "binary": {
+    "napi_versions": [
+      4
+    ]
+  },
+  "files": [
+    "types/**",
+    "beamstreams.js",
+    "index.d.ts",
+    "index.js",
+    "paths.js",
+    "paths.d.ts",
+    "install.js",
+    "postinstall.js",
+    "LICENSE",
+    "README.md"
+  ],
   "keywords": [
     "FFmpeg",
     "libav",
@@ -30,16 +47,26 @@
   "author": "Streampunk Media Ltd",
   "license": "GPL-3.0-or-later",
   "bugs": {
-    "url": "https://github.com/Streampunk/beamcoder/issues"
+    "url": "https://github.com/descriptinc/beamcoder/issues"
   },
-  "homepage": "https://github.com/Streampunk/beamcoder#readme",
+  "homepage": "https://github.com/descriptinc/beamcoder#readme",
   "dependencies": {
     "bindings": "^1.5.0",
+    "prebuild-install": "^6.0.0",
     "segfault-handler": "^1.3.0"
   },
   "devDependencies": {
     "eslint": "^8.9.0",
+    "node-gyp": "^9.4.1",
+    "patch-package": "^6.2.2",
+    "prebuild": "^12.1.0",
+    "ffmpeg-ffprobe-static": "^5.1.0-rc.1",
     "tape": "^5.5.2"
   },
+  "overrides": {
+    "prebuild": {
+      "node-gyp": "^9.4.1"
+    }
+  },
   "gypfile": true
 }
diff --git a/patches/prebuild+12.1.0.patch b/patches/prebuild+12.1.0.patch
@@ -0,0 +1,43 @@
+diff --git a/node_modules/prebuild/pack.js b/node_modules/prebuild/pack.js
+index 7552a4d..3be8aae 100644
+--- a/node_modules/prebuild/pack.js
++++ b/node_modules/prebuild/pack.js
+@@ -20,20 +20,30 @@ function pack (filenames, tarPath, cb) {
+     tarStream.pipe(zlib.createGzip({ level: 9 })).pipe(ws)
+
+     eachSeries(filenames, function processFile (filename, nextFile) {
+-      fs.stat(filename, function (err, st) {
++      fs.lstat(filename, function (err, st) {
+         if (err) return nextFile(err)
+
+-        var stream = tarStream.entry({
++        var header = {
+           name: filename.replace(/\\/g, '/').replace(/:/g, '_'),
+           size: st.size,
+           mode: st.mode | mode('444') | mode('222'),
+           gid: st.gid,
+-          uid: st.uid
+-        })
+-
+-        fs.createReadStream(filename).pipe(stream).on('finish', nextFile)
+-
+-        stream.on('error', nextFile)
++          uid: st.uid,
++        }
++
++        if (st.isSymbolicLink()) {
++          fs.readlink(filename, function (err, linkname) {
++            if (err) return nextFile(err)
++            header.type = 'symlink'
++            header.linkname = linkname
++            tarStream.entry(header)
++            nextFile()
++          })
++        } else {
++          var stream = tarStream.entry(header)
++          fs.createReadStream(filename).pipe(stream).on('finish', nextFile)
++          stream.on('error', nextFile)
++        }
+       })
+     }, function allFilesProcessed (err) {
+       tarStream.finalize()
diff --git a/paths.d.ts b/paths.d.ts
@@ -0,0 +1,3 @@
+export const ffmpegPath: string | null;
+export const ffprobePath: string | null;
+export const beamcoderPath: string | null;
diff --git a/paths.js b/paths.js
@@ -0,0 +1,53 @@
+/*
+  Aerostat Beam Coder - Node.js native bindings to FFmpeg
+  Copyright (C) 2019 Streampunk Media Ltd.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+  https://www.streampunk.media/ mailto:furnace@streampunk.media
+  14 Ormiscaig, Aultbea, Achnasheen, IV22 2JJ  U.K.
+*/
+
+const path = require('path');
+const os = require('os');
+
+function getPath(name, addDotExeOnWindows) {
+  const binaries = {
+    darwin: ['x64', 'arm64'],
+    linux: ['x64'],
+    win32: ['x64'],
+  };
+
+  const platform = process.env.npm_config_platform || os.platform();
+
+  const arch = process.env.npm_config_arch || os.arch();
+
+  if (!binaries[platform] || binaries[platform].indexOf(arch) === -1) {
+    return null;
+  }
+
+  return path.join(
+    __dirname,
+    'build',
+    // FIXME: toggleable
+    'Release',
+    platform === 'win32' && addDotExeOnWindows ? name + '.exe' : name
+  );
+}
+
+module.exports = {
+  ffmpegPath: getPath('ffmpeg', true),
+  ffprobePath: getPath('ffprobe', true),
+  beamcoderPath: getPath('beamcoder.node', false),
+};
diff --git a/postinstall.js b/postinstall.js
@@ -0,0 +1,5 @@
+const {execSync} = require('child_process');
+
+if (process.env.PREBUILD) {
+  execSync('npx patch-package');
+}
diff --git a/src/codec.cc b/src/codec.cc
@@ -22,6 +22,14 @@
 #include "codec.h"
 #include "hwcontext.h"
 
+#ifndef FF_DEBUG_VIS_QP
+#define FF_DEBUG_VIS_QP 0x2000
+#endif
+
+#ifndef FF_DEBUG_VIS_MB_TYPE
+#define FF_DEBUG_VIS_MB_TYPE 0x4000
+#endif
+
 napi_value getCodecCtxCodecID(napi_env env, napi_callback_info info) {
   napi_status status;
   napi_value result;

diff --git a/types/Filter.d.ts b/types/Filter.d.ts
@@ -265,8 +265,8 @@ export interface VideoInputParam extends InputParam {
 	height: number
 	pixelFormat: string
 	pixelAspect: Array<number>
-	hw_device_ctx: HWDeviceContext // Optional
-	swPixelFormat: string // Optional
+	hw_device_ctx?: HWDeviceContext // Optional
+	swPixelFormat?: string // Optional
 }
 /** The required parameters for setting up audio filter inputs */
 export interface AudioInputParam extends InputParam {