Sk/merge upstream

.circleci/config.yml

@@ -9,7 +9,7 @@ jobs:
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       UV_THREADPOOL_SIZE: 16
     docker:
-    - image: streampunkmedia/testbeam:16-4.4
+    - image: streampunkmedia/testbeam:16-5.0
     steps:
     - checkout
     - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS

.circleci/test_image/Dockerfile

@@ -1,9 +1,10 @@
-FROM cimg/node:16.13
+FROM cimg/node:16.14
 
 # install FFmpeg
 RUN sudo apt-get update \
   && sudo apt-get install software-properties-common \
   && sudo add-apt-repository ppa:savoury1/ffmpeg4 \
+  && sudo add-apt-repository ppa:savoury1/ffmpeg5 \
   && 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

.github/workflows/prebuild.yml

@@ -1,21 +1,49 @@
 name: prebuild
 on: [push]
 
+permissions:
+  contents: write
+
 jobs:
-  package:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-20.04
-          - macos-latest
-          - windows-latest
+  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:
@@ -26,58 +54,47 @@ jobs:
         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
+      - name: install Windows dependencies
         run: node ./install_ffmpeg.js
-        if: ${{ runner.os == 'Linux'}}
+
+      - 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
-        if: ${{ runner.os == 'macOS'}}
+        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
-        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'}}
+        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 }}
-        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'}}

.node-version

@@ -1 +1 @@
-17.0.1
+16.20.2

.vscode/c_cpp_properties.json

@@ -8,9 +8,8 @@
                 "C:/Program Files (x86)/Windows Kits/10/Include/10.0.10240.0/ucrt",
                 "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.x-win64-shared/include/**",
-                "${env:USERPROFILE}/AppData/Local/node-gyp/Cache/12.21.0/include/node"
+                "${workspaceFolder}/ffmpeg/ffmpeg-5.x-win64-shared/include/**",
+                "${env:USERPROFILE}/AppData/Local/node-gyp/Cache/16.14.0/include/node"
             ],
             "defines": [
                 "_DEBUG",

README.md

@@ -55,7 +55,7 @@ If you are looking to write your own frame-by-frame transcoder, media mangler or
 
 Does beam coder support X, Y or Z protocol / format / codec / file type / stream type / hardware etc.? If FFmpeg supports it, its possible and likely. Beam coder is self-describing at runtime, allowing exploration of what should be possible. However, you have to start somewhere, and the developers have been testing with the codecs and formats they are familiar with. Issues are expected so please raise any problems or requests for additional features as git hub issues. Even better, raise a pull request to fix a problem or add in missing features. Automated testing will be extended in due course, memory management improved, more examples added and hardware accelerated codecs added.
 
-Beam coder will be a cross-platform module for Windows, Mac and Linux. The release version of FFmpeg that beam coder links with is currently 4.1.
+Beam coder will be a cross-platform module for Windows, Mac and Linux. The release version of FFmpeg that beam coder links with is currently 5.0.
 
 Typescript bindings are available
 
@@ -69,9 +69,9 @@ Beam coder is the first release of Streampunk Media's [_Aerostat_](https://en.wi
 
 ### Pre-requisites
 
-Native packages require a build stage that needs some setup. This includes Python 2.7 (not 3) and build tools.
+Native packages require a build stage that needs some setup. This includes Python 3 and build tools.
 
-1. Install the LTS version of [Node.js](https://nodejs.org/en/) for your platform, currently the latest v10.
+1. Install the LTS version of [Node.js](https://nodejs.org/en/) for your platform, currently the latest v16.
 2. Enable [node-gyp - the Node.js native addon build tool](https://github.com/nodejs/node-gyp) for your platform by following the [installation instructions](https://github.com/nodejs/node-gyp#installation).
 
 Note: For MacOSX _Mojave_, install the following package after `xcode-select --install`:
@@ -92,7 +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.x-win64-shared
+    ./node_modules/beamcoder/ffmpeg/ffmpeg-5.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.:
 
@@ -103,6 +103,7 @@ To ensure that sufficient threads are available to process several requests in p
 On Linux, use the appropriate package manager to install the FFmpeg 4.1 development dependencies first. An error will be printed if these cannot be found at expected locations. For example, on Ubuntu:
 
     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 libzimg-dev
 
@@ -280,6 +281,11 @@ To control the level of logging from FFmpeg you can use the `beamcoder.logging()
 * `debug` - stuff which is only useful for libav* developers
 * `trace` - extremely verbose debugging for libav* developers
 
+To bypass the default ffmpeg logger you can use `beamcoder.setLoggingCallback()`. For example, to log all the messages using `console.log` :
+```javascript
+beamcoder.setLoggingCallback(msg => console.log(msg))
+```
+
 ### Demuxing
 
 The process of demuxing (de-multiplexing) extracts time-labelled packets of data contained in a media stream or file. FFmpeg provides a diverse range of demuxing capability with support for a wide range of input formats and protocols (`beamcoder.protocols()`).

binding.gyp

@@ -1,18 +1,23 @@
 {
   "targets": [{
     "target_name" : "beamcoder",
+    "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" ],
-    "defines": [
-       "NAPI_VERSION=<(napi_build_version)"
-    ],
     "conditions": [
       ['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"
         ],
@@ -24,17 +29,26 @@
           "-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": [
-            "-lavcodec",
-            "-lavdevice",
-            "-lavfilter",
-            "-lavformat",
-            "-lavutil",
-            "-lpostproc",
-            "-lswresample",
-            "-lswscale",
-            "-lzimg"
+              "-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": [
@@ -49,20 +63,12 @@
       }],
       ["OS=='mac'", {
         "variables": {
-           "ffmpeg_version": "1.33rc3",
+           "ffmpeg_version": "1.49.rc.1",
            "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/"
         ],
@@ -85,6 +91,8 @@
         },
         '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": [
             {
@@ -102,42 +110,42 @@
             "msvs_settings": {
               "VCCLCompilerTool": {
                 "RuntimeTypeInfo": "true",
-                "AdditionalOptions": ['/WX']
+                "AdditionalOptions": []
               }
             }
           }
         },
         "include_dirs" : [
-          "ffmpeg/ffmpeg-4.x-win64-shared/include"
+          "ffmpeg/ffmpeg-5.x-win64-shared/include"
         ],
         "libraries": [
-          "-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"
+          "-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/avcodec",
+          "-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/avdevice",
+          "-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/avfilter",
+          "-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/avformat",
+          "-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/avutil",
+          "-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/postproc",
+          "-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/swresample",
+          "-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/swscale"
         ],
         "copies": [
             {
               "destination": "<(PRODUCT_DIR)",
               "files": [
-                "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",
+                "ffmpeg/ffmpeg-5.x-win64-shared/bin/avcodec-59.dll",
+                "ffmpeg/ffmpeg-5.x-win64-shared/bin/avdevice-59.dll",
+                "ffmpeg/ffmpeg-5.x-win64-shared/bin/avfilter-8.dll",
+                "ffmpeg/ffmpeg-5.x-win64-shared/bin/avformat-59.dll",
+                "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",
                 "node_modules/ffmpeg-ffprobe-static/ffmpeg.exe",
                 "node_modules/ffmpeg-ffprobe-static/ffprobe.exe"
               ]
             }
           ]
-    }]
+    }],
   ]
 }]
 }

install.js

@@ -1,5 +1,5 @@
 const {execSync} = require('child_process');
 
 if (!process.env.PREBUILD) {
-  execSync('npx prebuild-install --runtime napi');
+  execSync('npx prebuild-install --target 4 --runtime napi');
 }