bare-ffmpeg 1.0.0-6 → 1.0.0-8

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

@@ -1,17 +1,14 @@
 const binding = require('../binding')
-const ReferenceCounted = require('./reference-counted')
 const Rational = require('./rational')
 
-module.exports = class FFmpegCodecContext extends ReferenceCounted {
+module.exports = class FFmpegCodecContext {
   constructor(codec) {
-    super()
-
     this._codec = codec
     this._opened = false
     this._handle = binding.initCodecContext(codec._handle)
   }
 
-  _destroy() {
+  destroy() {
     binding.destroyCodecContext(this._handle)
     this._handle = null
   }
@@ -46,10 +43,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) {
@@ -64,14 +62,11 @@ module.exports = class FFmpegCodecContext extends ReferenceCounted {
   }
 
   sendPacket(packet) {
-    binding.sendCodecContextPacket(this._handle, packet._handle)
-    return this
+    return binding.sendCodecContextPacket(this._handle, packet._handle)
   }
 
   receivePacket(packet) {
-    const res = binding.receiveCodecContextPacket(this._handle, packet._handle)
-    if (res) packet._ref()
-    return res
+    return binding.receiveCodecContextPacket(this._handle, packet._handle)
   }
 
   sendFrame(frame) {
@@ -81,4 +76,8 @@ module.exports = class FFmpegCodecContext extends ReferenceCounted {
   receiveFrame(frame) {
     return binding.receiveCodecContextFrame(this._handle, frame._handle)
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

package/lib/codec-parameters.js

@@ -1,14 +1,11 @@
 const binding = require('../binding')
-const ReferenceCounted = require('./reference-counted')
 
-module.exports = class FFmpegCodecParameters extends ReferenceCounted {
+module.exports = class FFmpegCodecParameters {
   constructor(handle) {
-    super()
-
     this._handle = handle
   }
 
-  _destroy() {
+  destroy() {
     this._handle = null
   }
 
@@ -35,4 +32,8 @@ module.exports = class FFmpegCodecParameters extends ReferenceCounted {
   toContext(context) {
     binding.codecParametersToContext(context._handle, this._handle)
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

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

@@ -1,23 +1,26 @@
 const binding = require('../binding')
-const ReferenceCounted = require('./reference-counted')
 
-module.exports = class FFmpegDictionary extends ReferenceCounted {
+module.exports = class FFmpegDictionary {
   constructor() {
-    super()
-
     this._handle = binding.initDictionary()
   }
 
-  _destroy() {
+  destroy() {
     binding.destroyDictionary(this._handle)
     this._handle = null
   }
 
   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) {
     binding.setDictionaryEntry(this._handle, key, value)
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

package/lib/format-context.js

@@ -1,22 +1,19 @@
 const binding = require('../binding')
 const Stream = require('./stream.js')
-const ReferenceCounted = require('./reference-counted')
 const OutputFormat = require('./output-format')
 const IOContext = require('./io-context')
 const InputFormat = require('./input-format')
 const Dictionary = require('./dictionary')
 
-class FFmpegFormatContext extends ReferenceCounted {
+class FFmpegFormatContext {
   constructor(io) {
-    super()
-
-    this._io = io ? io._ref() : null
+    this._io = io
     this._streams = []
   }
 
-  _destroy() {
+  destroy() {
     if (this._io) {
-      this._io._unref()
+      this._io.destroy()
       this._io = null
     }
 
@@ -33,13 +30,19 @@ class FFmpegFormatContext extends ReferenceCounted {
   }
 
   readFrame(packet) {
-    if (packet._refs !== 0) {
-      throw new Error('Cannot read into packet with active references')
+    return binding.readFormatContextFrame(this._handle, packet._handle)
+  }
+
+  getBestStreamIndex(type) {
+    return binding.getFormatContextBestStreamIndex(this._handle, type)
+  }
+
+  getStream(index) {
+    if (index < 0 || index >= this._streams.length) {
+      return null
     }
 
-    const result = binding.readFormatContextFrame(this._handle, packet._handle)
-    if (result) packet._ref()
-    return result
+    return this._streams[index]
   }
 
   getBestStream(type) {
@@ -58,16 +61,22 @@ class FFmpegFormatContext extends ReferenceCounted {
 
     return this._streams[bestIndex]
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }
 
 let defaultURL = null
 
 switch (Bare.platform) {
   case 'darwin':
-    defaultURL = '0'
+    defaultURL = '0:0'
     break
   case 'linux':
     // TODO: test on real machine
+    // we might need separate contexts for linux
+    // video: V4L2 and audio: ALSA/PulseAudio
     defaultURL = '/dev/video0'
     break
   case 'win32':
@@ -102,8 +111,8 @@ exports.InputFormatContext = class FFmpegInputFormatContext extends (
     }
   }
 
-  _destroy() {
-    super._destroy()
+  destroy() {
+    super.destroy()
 
     binding.closeInputFormatContext(this._handle)
     this._handle = null
@@ -121,8 +130,8 @@ exports.OutputFormatContext = class FFmpegOutputFormatContext extends (
     this._handle = binding.openOutputFormatContext(format._handle, io._handle)
   }
 
-  _destroy() {
-    super._destroy()
+  destroy() {
+    super.destroy()
 
     binding.closeOutputFormatContext(this._handle)
     this._handle = null

package/lib/frame.js

@@ -1,14 +1,11 @@
 const binding = require('../binding')
-const ReferenceCounted = require('./reference-counted')
 
-module.exports = class FFmpegFrame extends ReferenceCounted {
+module.exports = class FFmpegFrame {
   constructor() {
-    super()
-
     this._handle = binding.initFrame()
   }
 
-  _destroy() {
+  destroy() {
     binding.destroyFrame(this._handle)
     this._handle = null
   }
@@ -37,15 +34,39 @@ 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)
+  }
 
-    return Buffer.from(binding.getFrameAudioChannel(this._handle, i))
+  set nbSamples(value) {
+    binding.setFrameNbSamples(this._handle, value)
+  }
+
+  audioChannel() {
+    return binding.getFrameAudioChannel(this._handle)
   }
 
   alloc() {
     binding.allocFrame(this._handle, 32)
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

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/input-format.js

@@ -4,6 +4,7 @@ let defaultName = null
 
 switch (Bare.platform) {
   case 'darwin':
+  case 'ios':
     defaultName = 'avfoundation'
     break
   case 'linux':

package/lib/io-context.js

@@ -1,15 +1,20 @@
 const binding = require('../binding')
-const ReferenceCounted = require('./reference-counted')
 
-module.exports = class FFmpegIOContext extends ReferenceCounted {
+module.exports = class FFmpegIOContext {
   constructor(buffer = Buffer.alloc(0)) {
-    super()
-
-    this._handle = binding.initIOContext(buffer)
+    this._handle = binding.initIOContext(
+      buffer.buffer,
+      buffer.byteOffset,
+      buffer.byteLength
+    )
   }
 
-  _destroy() {
+  destroy() {
     binding.destroyIOContext(this._handle)
     this._handle = null
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

package/lib/packet.js

@@ -1,10 +1,7 @@
 const binding = require('../binding')
-const ReferenceCounted = require('./reference-counted')
 
-module.exports = class FFmpegPacket extends ReferenceCounted {
+module.exports = class FFmpegPacket {
   constructor(buffer) {
-    super()
-
     if (buffer) {
       this._handle = binding.initPacketFromBuffer(
         buffer.buffer,
@@ -16,13 +13,12 @@ module.exports = class FFmpegPacket extends ReferenceCounted {
     }
   }
 
-  _destroy() {
-    binding.destroyPacket(this._handle)
+  destroy() {
+    binding.unrefPacket(this._handle)
     this._handle = null
   }
 
   unref() {
-    this._unref()
     binding.unrefPacket(this._handle)
   }
 
@@ -33,4 +29,8 @@ module.exports = class FFmpegPacket extends ReferenceCounted {
   get data() {
     return Buffer.from(binding.getPacketData(this._handle))
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

package/lib/resampler.js

@@ -0,0 +1,53 @@
+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
+    }
+  }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
+}
+
+module.exports = Resampler

package/lib/scaler.js

@@ -1,8 +1,7 @@
 const binding = require('../binding')
 const constants = require('./constants')
-const ReferenceCounted = require('./reference-counted')
 
-module.exports = class FFmpegScaler extends ReferenceCounted {
+module.exports = class FFmpegScaler {
   constructor(
     sourcePixelFormat,
     sourceWidth,
@@ -11,8 +10,6 @@ module.exports = class FFmpegScaler extends ReferenceCounted {
     targetWidth,
     targetHeight
   ) {
-    super()
-
     sourcePixelFormat = constants.toPixelFormat(sourcePixelFormat)
     targetPixelFormat = constants.toPixelFormat(targetPixelFormat)
 
@@ -33,7 +30,7 @@ module.exports = class FFmpegScaler extends ReferenceCounted {
     )
   }
 
-  _destroy() {
+  destroy() {
     binding.destroyScaler(this._handle)
     this._handle = null
   }
@@ -56,4 +53,8 @@ module.exports = class FFmpegScaler extends ReferenceCounted {
       target._handle
     )
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

package/lib/stream.js

@@ -2,12 +2,9 @@ const binding = require('../binding')
 const Codec = require('./codec')
 const CodecContext = require('./codec-context')
 const CodecParameters = require('./codec-parameters')
-const ReferenceCounted = require('./reference-counted')
 
-module.exports = class FFmpegStream extends ReferenceCounted {
+module.exports = class FFmpegStream {
   constructor(handle) {
-    super()
-
     this._handle = handle
 
     this._codec = Codec.for(binding.getStreamCodec(this._handle))
@@ -17,7 +14,7 @@ module.exports = class FFmpegStream extends ReferenceCounted {
     )
   }
 
-  _destroy() {
+  destroy() {
     this._codecParameters.destroy()
     this._codecParameters = null
   }
@@ -41,4 +38,8 @@ module.exports = class FFmpegStream extends ReferenceCounted {
     this._codecParameters.toContext(context)
     return context.open()
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-ffmpeg",
-  "version": "1.0.0-6",
+  "version": "1.0.0-8",
   "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"