bare-ffmpeg 1.0.0-6 → 1.0.0-7

package/CMakeLists.txt

@@ -1,18 +1,23 @@
 cmake_minimum_required(VERSION 3.25)
 
 find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
+find_package(cmake-harden REQUIRED PATHS node_modules/cmake-harden)
 find_package(cmake-ports REQUIRED PATHS node_modules/cmake-ports)
 
-project(bare_ffmpeg C)
+project(bare_ffmpeg C CXX)
 
-find_port(ffmpeg FEATURES dav1d x264)
+fetch_package("github:holepunchto/libjstl#096669a")
+
+find_port(ffmpeg FEATURES dav1d svt-av1 x264)
 
 add_bare_module(bare_ffmpeg)
 
+harden(${bare_ffmpeg})
+
 target_sources(
   ${bare_ffmpeg}
   PRIVATE
-    binding.c
+    binding.cc
 )
 
 target_link_libraries(
@@ -22,5 +27,7 @@ target_link_libraries(
     avdevice
     avformat
     avutil
+    swresample
     swscale
+    jstl
 )

package/index.js

@@ -17,6 +17,7 @@ const Scaler = require('./lib/scaler')
 const Stream = require('./lib/stream')
 const Rational = require('./lib/rational')
 const Dictionary = require('./lib/dictionary')
+const Resampler = require('./lib/resampler')
 
 exports.Codec = Codec
 exports.CodecContext = CodecContext
@@ -35,5 +36,6 @@ exports.Scaler = Scaler
 exports.Stream = Stream
 exports.Rational = Rational
 exports.Dictionary = Dictionary
+exports.Resampler = Resampler
 
 exports.constants = require('./lib/constants')

package/lib/codec-context.js

@@ -46,10 +46,11 @@ module.exports = class FFmpegCodecContext extends ReferenceCounted {
   }
 
   set timeBase(value) {
-    const view = new Int32Array(2)
-    view[0] = value.numerator
-    view[1] = value.denominator
-    binding.setCodecContextTimeBase(this._handle, view.buffer)
+    binding.setCodecContextTimeBase(
+      this._handle,
+      value.numerator,
+      value.denominator
+    )
   }
 
   open(options) {

package/lib/codec.js

@@ -36,4 +36,6 @@ module.exports = class FFmpegCodec {
 
   static MJPEG = this.for(constants.codecs.MJPEG)
   static H264 = this.for(constants.codecs.H264)
+  static AAC = this.for(constants.codecs.AAC)
+  static AV1 = this.for(constants.codecs.AV1)
 }

package/lib/constants.js

@@ -3,7 +3,9 @@ const binding = require('../binding')
 module.exports = exports = {
   codecs: {
     MJPEG: binding.AV_CODEC_ID_MJPEG,
-    H264: binding.AV_CODEC_ID_H264
+    H264: binding.AV_CODEC_ID_H264,
+    AAC: binding.AV_CODEC_ID_AAC,
+    AV1: binding.AV_CODEC_ID_AV1
   },
   pixelFormats: {
     RGBA: binding.AV_PIX_FMT_RGBA,
@@ -20,6 +22,26 @@ module.exports = exports = {
     SUBTITLE: binding.AVMEDIA_TYPE_SUBTITLE,
     ATTACHEMENT: binding.AVMEDIA_TYPE_ATTACHMENT,
     NB: binding.AVMEDIA_TYPE_NB
+  },
+  sampleFormats: {
+    NONE: binding.AV_SAMPLE_FMT_NONE,
+    U8: binding.AV_SAMPLE_FMT_U8,
+    S16: binding.AV_SAMPLE_FMT_S16,
+    S32: binding.AV_SAMPLE_FMT_S32,
+    FLT: binding.AV_SAMPLE_FMT_FLT,
+    FLTP: binding.AV_SAMPLE_FMT_FLTP,
+    DBL: binding.AV_SAMPLE_FMT_DBL,
+    U8P: binding.AV_SAMPLE_FMT_U8P,
+    S16P: binding.AV_SAMPLE_FMT_S16P,
+    S32P: binding.AV_SAMPLE_FMT_S32P,
+    DBLP: binding.AV_SAMPLE_FMT_DBLP,
+    S64: binding.AV_SAMPLE_FMT_S64,
+    S64P: binding.AV_SAMPLE_FMT_S64P,
+    NB: binding.AV_SAMPLE_FMT_NB
+  },
+  channelLayouts: {
+    MONO: binding.AV_CH_LAYOUT_MONO,
+    STEREO: binding.AV_CH_LAYOUT_STEREO
   }
 }
 

package/lib/dictionary.js

@@ -14,7 +14,9 @@ module.exports = class FFmpegDictionary extends ReferenceCounted {
   }
 
   get(key) {
-    return binding.getDictionaryEntry(this._handle, key)
+    const value = binding.getDictionaryEntry(this._handle, key)
+    if (value === undefined) return null
+    return value
   }
 
   set(key, value) {

package/lib/frame.js

@@ -37,12 +37,32 @@ module.exports = class FFmpegFrame extends ReferenceCounted {
     binding.setFramePixelFormat(this._handle, value)
   }
 
-  audioChannel(i) {
-    if (i < 0 || i > 7) {
-      throw new RangeError(`Channel index must be between 0 and 7`)
-    }
+  get format() {
+    return binding.getFrameFormat(this._handle)
+  }
+
+  set format(value) {
+    binding.setFrameFormat(this._handle, value)
+  }
+
+  get channelLayout() {
+    return binding.getFrameChannelLayout(this._handle)
+  }
+
+  set channelLayout(value) {
+    binding.setFrameChannelLayout(this._handle, value)
+  }
+
+  get nbSamples() {
+    return binding.getFrameNbSamples(this._handle)
+  }
+
+  set nbSamples(value) {
+    binding.setFrameNbSamples(this._handle, value)
+  }
 
-    return Buffer.from(binding.getFrameAudioChannel(this._handle, i))
+  audioChannel() {
+    return binding.getFrameAudioChannel(this._handle)
   }
 
   alloc() {

package/lib/image.js

@@ -41,6 +41,7 @@ module.exports = class FFmpegImage {
       this._width,
       this._height,
       this._data.buffer,
+      this._data.byteOffset,
       frame._handle
     )
   }

package/lib/io-context.js

@@ -5,7 +5,11 @@ module.exports = class FFmpegIOContext extends ReferenceCounted {
   constructor(buffer = Buffer.alloc(0)) {
     super()
 
-    this._handle = binding.initIOContext(buffer)
+    this._handle = binding.initIOContext(
+      buffer.buffer,
+      buffer.byteOffset,
+      buffer.byteLength
+    )
   }
 
   _destroy() {

package/lib/packet.js

@@ -17,7 +17,7 @@ module.exports = class FFmpegPacket extends ReferenceCounted {
   }
 
   _destroy() {
-    binding.destroyPacket(this._handle)
+    binding.unrefPacket(this._handle)
     this._handle = null
   }
 

package/lib/resampler.js

@@ -0,0 +1,49 @@
+const binding = require('../binding')
+
+class Resampler {
+  constructor(
+    inputSampleRate,
+    inputChannelLayout,
+    inputFormat,
+    outputSampleRate,
+    outputChannelLayout,
+    outputFormat
+  ) {
+    this._handle = binding.initResampler(
+      inputSampleRate,
+      inputFormat,
+      inputChannelLayout,
+      outputSampleRate,
+      outputFormat,
+      outputChannelLayout
+    )
+
+    this.inputSampleRate = inputSampleRate
+    this.outputSampleRate = outputSampleRate
+  }
+
+  convert(inputFrame, outputFrame) {
+    return binding.convertResampler(
+      this._handle,
+      inputFrame._handle,
+      outputFrame._handle
+    )
+  }
+
+  get delay() {
+    return binding.getResamplerDelay(this._handle, this.inputSampleRate)
+  }
+
+  flush(outputFrame) {
+    return binding.flushResampler(this._handle, outputFrame._handle)
+  }
+
+  destroy() {
+    if (this._handle) {
+      binding.destroyResampler(this._handle)
+      this._handle = null
+    }
+  }
+}
+
+module.exports = Resampler

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-ffmpeg",
-  "version": "1.0.0-6",
+  "version": "1.0.0-7",
   "description": "Low-level FFmpeg bindings for Bare",
   "exports": {
     ".": "./index.js",
@@ -31,6 +31,7 @@
   "devDependencies": {
     "brittle": "^3.4.0",
     "cmake-bare": "^1.1.2",
+    "cmake-harden": "^1.0.2",
     "cmake-ports": "^1.5.0",
     "prettier": "^3.3.3",
     "prettier-config-standard": "^7.0.0"