bare-ffmpeg 1.0.0-2 → 1.0.0-21

package/lib/io-context.js

@@ -1,15 +1,38 @@
 const binding = require('../binding')
-const ReferenceCounted = require('./reference-counted')
 
-module.exports = class FFmpegIOContext extends ReferenceCounted {
-  constructor(buffer = Buffer.alloc(0)) {
-    super()
+module.exports = class FFmpegIOContext {
+  constructor(buffer, opts = {}) {
+    let offset = 0
+    let len = 0
 
-    this._handle = binding.initIOContext(buffer)
+    if (typeof buffer === 'number') {
+      len = buffer
+      buffer = undefined
+    } else if (buffer) {
+      offset = buffer.byteOffset
+      len = buffer.byteLength
+      buffer = buffer.buffer
+    } else {
+      buffer = Buffer.alloc(0)
+    }
+
+    let onwrite
+
+    if (typeof opts.onwrite === 'function') {
+      onwrite = function (chunk) {
+        opts.onwrite(Buffer.from(chunk))
+      }
+    }
+
+    this._handle = binding.initIOContext(buffer, offset, len, onwrite)
   }
 
-  _destroy() {
+  destroy() {
     binding.destroyIOContext(this._handle)
     this._handle = null
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

package/lib/log.js

@@ -0,0 +1,16 @@
+const binding = require('../binding')
+const constants = require('./constants')
+
+module.exports = {
+  ...constants.logLevels
+}
+
+Object.defineProperty(module.exports, 'level', {
+  get() {
+    return binding.getLogLevel()
+  },
+
+  set(level) {
+    return binding.setLogLevel(level)
+  }
+})

package/lib/output-format.js

@@ -4,4 +4,8 @@ module.exports = class FFmpegOutputFormat {
   constructor(name) {
     this._handle = binding.initOutputFormat(name)
   }
+
+  get flags() {
+    return binding.getOutputFormatFlags(this._handle)
+  }
 }

package/lib/packet.js

@@ -1,17 +1,9 @@
 const binding = require('../binding')
-const ReferenceCounted = require('./reference-counted')
+const Rational = require('./rational')
 
-module.exports = class FFmpegPacket extends ReferenceCounted {
+module.exports = class FFmpegPacket {
   constructor(buffer) {
-    super()
-
     if (buffer) {
-      if (!Buffer.isBuffer(buffer)) {
-        throw TypeError(
-          `Buffer parameter should be of type Buffer but got: ${typeof buffer}`
-        )
-      }
-
       this._handle = binding.initPacketFromBuffer(
         buffer.buffer,
         buffer.byteOffset,
@@ -22,13 +14,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)
   }
 
@@ -36,7 +27,91 @@ module.exports = class FFmpegPacket extends ReferenceCounted {
     return binding.getPacketStreamIndex(this._handle)
   }
 
+  set streamIndex(value) {
+    return binding.setPacketStreamIndex(this._handle, value)
+  }
+
   get data() {
     return Buffer.from(binding.getPacketData(this._handle))
   }
+
+  set data(value) {
+    binding.setPacketData(
+      this._handle,
+      value.buffer,
+      value.byteOffset,
+      value.byteLength
+    )
+  }
+
+  get isKeyframe() {
+    return binding.isPacketKeyframe(this._handle)
+  }
+
+  get dts() {
+    return binding.getPacketDTS(this._handle)
+  }
+
+  set dts(value) {
+    return binding.setPacketDTS(this._handle, value)
+  }
+
+  get pts() {
+    return binding.getPacketPTS(this._handle)
+  }
+
+  set pts(value) {
+    return binding.setPacketPTS(this._handle, value)
+  }
+
+  get timeBase() {
+    const view = new Int32Array(binding.getPacketTimeBase(this._handle))
+    return new Rational(view[0], view[1])
+  }
+
+  set timeBase(value) {
+    binding.setPacketTimeBase(this._handle, value.numerator, value.denominator)
+  }
+
+  rescaleTimestamps(rational) {
+    return binding.rescalePacketTimestamps(
+      this._handle,
+      rational.numerator,
+      rational.denominator
+    )
+  }
+
+  get duration() {
+    return binding.getPacketDuration(this._handle)
+  }
+
+  set duration(value) {
+    return binding.setPacketDuration(this._handle, value)
+  }
+
+  get flags() {
+    return binding.getPacketFlags(this._handle)
+  }
+
+  set flags(value) {
+    return binding.setPacketFlags(this._handle, value)
+  }
+
+  [Symbol.for('bare.inspect')]() {
+    return {
+      __proto__: { constructor: FFmpegPacket },
+      streamIndex: this.streamIndex,
+      flags: this.flags,
+      isKeyframe: this.isKeyframe,
+      timeBase: this.timeBase,
+      dts: this.dts,
+      pts: this.pts,
+      duration: this.duration,
+      data: this.data
+    }
+  }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

package/lib/rational.js

@@ -1,6 +1,40 @@
+const binding = require('../binding')
+
 module.exports = class FFmpegRational {
-  constructor(numerator, denominator) {
+  constructor(numerator = 0, denominator = 1) {
     this.numerator = numerator
     this.denominator = denominator
   }
+
+  get valid() {
+    // don't support negative denominators for now
+    if (this.denominator < 0) return false
+
+    const n = this.toNumber()
+
+    if (Number.isNaN(n) || n === 0) return false
+
+    return true
+  }
+
+  get uninitialized() {
+    // common initial value for AVRational(0, 1)
+    return this.numerator === 0 && this.denominator === 1
+  }
+
+  toNumber() {
+    return this.numerator / this.denominator
+  }
+
+  static from(num) {
+    const view = new Int32Array(binding.rationalD2Q(num))
+    return new FFmpegRational(view[0], view[1])
+  }
+
+  static rescaleQ(n, src, dst) {
+    return (
+      (n * (src.numerator / src.denominator)) /
+      (dst.numerator / dst.denominator)
+    )
+  }
 }

package/lib/resampler.js

@@ -0,0 +1,63 @@
+const binding = require('../binding')
+const ChannelLayout = require('./channel-layout')
+
+class FFmpegResampler {
+  constructor(
+    inputSampleRate,
+    inputChannelLayout,
+    inputFormat,
+    outputSampleRate,
+    outputChannelLayout,
+    outputFormat
+  ) {
+    inputChannelLayout = ChannelLayout.from(inputChannelLayout)
+    outputChannelLayout = ChannelLayout.from(outputChannelLayout)
+
+    this._inputSampleRate = inputSampleRate
+    this._outputSampleRate = outputSampleRate
+
+    this._handle = binding.initResampler(
+      inputSampleRate,
+      inputFormat,
+      inputChannelLayout._handle,
+      outputSampleRate,
+      outputFormat,
+      outputChannelLayout._handle
+    )
+  }
+
+  get inputSampleRate() {
+    return this._inputSampleRate
+  }
+
+  get outputSampleRate() {
+    return this._outputSampleRate
+  }
+
+  get delay() {
+    return binding.getResamplerDelay(this._handle, this._inputSampleRate)
+  }
+
+  convert(inputFrame, outputFrame) {
+    return binding.convertResampler(
+      this._handle,
+      inputFrame._handle,
+      outputFrame._handle
+    )
+  }
+
+  flush(outputFrame) {
+    return binding.flushResampler(this._handle, outputFrame._handle)
+  }
+
+  destroy() {
+    binding.destroyResampler(this._handle)
+    this._handle = null
+  }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
+}
+
+module.exports = FFmpegResampler

package/lib/samples.js

@@ -0,0 +1,49 @@
+const binding = require('../binding')
+const constants = require('./constants.js')
+
+module.exports = class FFmpegSamples {
+  constructor(sampleFormat, nbChannels, nbSamples, align = 0) {
+    sampleFormat = constants.toSampleFormat(sampleFormat)
+
+    this._sampleFormat = sampleFormat
+    this._nbChannels = nbChannels
+    this._nbSamples = nbSamples
+    this._align = align
+
+    this._data = Buffer.from(
+      binding.initSamples(sampleFormat, nbChannels, nbSamples, align)
+    )
+  }
+
+  get sampleFormat() {
+    return this._sampleFormat
+  }
+
+  get nbChannels() {
+    return this._nbChannels
+  }
+
+  get nbSamples() {
+    return this._nbSamples
+  }
+
+  get align() {
+    return this._align
+  }
+
+  get data() {
+    return this._data
+  }
+
+  fill(frame) {
+    binding.fillSamples(
+      this._sampleFormat,
+      this._nbChannels,
+      this._nbSamples,
+      this._align,
+      this._data.buffer,
+      this._data.byteOffset,
+      frame._handle
+    )
+  }
+}

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
   }
@@ -42,10 +39,10 @@ module.exports = class FFmpegScaler extends ReferenceCounted {
     if (typeof y !== 'number') {
       target = y
       y = 0
-      height = this._targetHeight
+      height = source.height
     } else if (typeof height !== 'number') {
       target = height
-      height = this._targetHeight
+      height = source.height
     }
 
     return binding.scaleScaler(
@@ -56,4 +53,8 @@ module.exports = class FFmpegScaler extends ReferenceCounted {
       target._handle
     )
   }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
 }

package/lib/stream.js

@@ -2,42 +2,67 @@ const binding = require('../binding')
 const Codec = require('./codec')
 const CodecContext = require('./codec-context')
 const CodecParameters = require('./codec-parameters')
-const ReferenceCounted = require('./reference-counted')
+const Rational = require('./rational')
 
-module.exports = class FFmpegStream extends ReferenceCounted {
+module.exports = class FFmpegStream {
   constructor(handle) {
-    super()
-
     this._handle = handle
 
-    this._codec = Codec.for(binding.getStreamCodec(this._handle))
-
     this._codecParameters = new CodecParameters(
       binding.getStreamCodecParameters(this._handle)
     )
   }
 
-  _destroy() {
-    this._codecParameters.destroy()
-    this._codecParameters = null
+  get id() {
+    return binding.getStreamId(this._handle)
+  }
+
+  set id(value) {
+    binding.setStreamId(this._handle, value)
+  }
+
+  get index() {
+    return binding.getStreamIndex(this._handle)
   }
 
   get codec() {
-    return this._codec
+    return Codec.for(this.codecParameters.id)
   }
 
   get codecParameters() {
     return this._codecParameters
   }
 
+  get timeBase() {
+    const view = new Int32Array(binding.getStreamTimeBase(this._handle))
+    return new Rational(view[0], view[1])
+  }
+
+  set timeBase(value) {
+    binding.setStreamTimeBase(this._handle, value.numerator, value.denominator)
+  }
+
+  get avgFramerate() {
+    const view = new Int32Array(binding.getStreamAverageFramerate(this._handle))
+    return new Rational(view[0], view[1])
+  }
+
+  set avgFramerate(value) {
+    binding.setStreamAverageFramerate(
+      this._handle,
+      value.numerator,
+      value.denominator
+    )
+  }
+
   decoder() {
-    const context = new CodecContext(this._codec.decoder)
+    const context = new CodecContext(this.codec.decoder)
     this._codecParameters.toContext(context)
     return context.open()
   }
 
   encoder() {
-    const context = new CodecContext(this._codec.encoder)
+    const context = new CodecContext(this.codec.encoder)
     this._codecParameters.toContext(context)
     return context.open()
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-ffmpeg",
-  "version": "1.0.0-2",
+  "version": "1.0.0-21",
   "description": "Low-level FFmpeg bindings for Bare",
   "exports": {
     ".": "./index.js",
@@ -8,15 +8,17 @@
   },
   "files": [
     "index.js",
-    "binding.c",
+    "binding.cc",
     "binding.js",
     "CMakeLists.txt",
     "lib",
-    "prebuilds"
+    "prebuilds",
+    "cmake"
   ],
   "addon": true,
   "scripts": {
-    "test": "prettier . --check && bare test.js"
+    "test": "prettier . --check && bare test.js",
+    "format": "prettier . --write && clang-format -i binding.cc"
   },
   "repository": {
     "type": "git",
@@ -31,6 +33,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"