bare-ffmpeg 1.0.0-26 → 1.0.0-28

package/index.js

@@ -10,6 +10,10 @@ const {
   InputFormatContext,
   OutputFormatContext
 } = require('./lib/format-context')
+const Filter = require('./lib/filter')
+const FilterContext = require('./lib/filter-context')
+const FilterGraph = require('./lib/filter-graph')
+const FilterInOut = require('./lib/filter-inout')
 const Frame = require('./lib/frame')
 const IOContext = require('./lib/io-context')
 const Image = require('./lib/image')
@@ -31,6 +35,10 @@ exports.CodecParameters = CodecParameters
 exports.Decoder = Decoder
 exports.Dictionary = Dictionary
 exports.Encoder = Encoder
+exports.Filter = Filter
+exports.FilterContext = FilterContext
+exports.FilterGraph = FilterGraph
+exports.FilterInOut = FilterInOut
 exports.Frame = Frame
 exports.IOContext = IOContext
 exports.Image = Image

package/lib/codec-context.js

@@ -1,6 +1,7 @@
 const binding = require('../binding')
 const Rational = require('./rational')
 const ChannelLayout = require('./channel-layout')
+const { codecConfig } = require('./constants')
 
 module.exports = class FFmpegCodecContext {
   constructor(codec) {
@@ -120,6 +121,14 @@ module.exports = class FFmpegCodecContext {
     )
   }
 
+  get frameSize() {
+    return binding.getCodecContextFrameSize(this._handle)
+  }
+
+  get frameNum() {
+    return binding.getCodecContextFrameNum(this._handle)
+  }
+
   open(options) {
     if (this._opened) return
     this._opened = true
@@ -151,6 +160,45 @@ module.exports = class FFmpegCodecContext {
     return binding.receiveCodecContextFrame(this._handle, frame._handle)
   }
 
+  getSupportedConfig(config) {
+    if (config === codecConfig.FRAME_RATE) {
+      const data = binding.getSupportedFrameRates(
+        this._handle,
+        this._codec._handle
+      )
+      if (!data || data.length === 0) return null
+
+      const view = new Int32Array(data)
+      const rates = []
+      for (let i = 0; i < view.length; i += 2) {
+        rates.push(new Rational(view[i], view[i + 1]))
+      }
+      return rates
+    }
+
+    if (config === codecConfig.CHANNEL_LAYOUT) {
+      const handles = binding.getSupportedChannelLayouts(
+        this._handle,
+        this._codec._handle
+      )
+      if (!handles || handles.length === 0) return null
+
+      return handles.map((handle) => new ChannelLayout(handle))
+    }
+
+    const data = binding.getSupportedConfig(
+      this._handle,
+      this._codec._handle,
+      config
+    )
+
+    if (config === codecConfig.SAMPLE_RATE && !data) {
+      return null
+    }
+
+    return new Int32Array(data)
+  }
+
   [Symbol.dispose]() {
     this.destroy()
   }

package/lib/codec-parameters.js

@@ -243,22 +243,26 @@ module.exports = class FFmpegCodecParameters {
       type: this.type,
       id: this.id,
       format: this.format,
+      tag: this.tag,
+      frameRate: this.frameRate,
+      videoDelay: this.videoDelay,
       profile: this.profile,
       level: this.level,
       width: this.width,
       height: this.height,
+      sampleAsectRatio: this.sampleAspectRatio,
       bitRate: this.bitRate,
       bitsPerCodedSample: this.bitsPerCodedSample,
       bitsPerRawSample: this.bitsPerRawSample,
       sampleRate: this.sampleRate,
       nbChannels: this.nbChannels,
       channelLayout: this.channelLayout,
-      frameRate: this.frameRate,
       extraData: this.extraData,
       blockAlign: this.blockAlign,
       initialPadding: this.initialPadding,
       trailingPadding: this.trailingPadding,
-      seekPreroll: this.seekPreroll
+      seekPreroll: this.seekPreroll,
+      frameSize: this.frameSize
     }
   }
 

package/lib/constants.js

@@ -184,6 +184,15 @@ module.exports = exports = {
     '3D_REFERENCE_DISPLAYS': binding.AV_PKT_DATA_3D_REFERENCE_DISPLAYS,
     RTCP_SR: binding.AV_PKT_DATA_RTCP_SR,
     NB: binding.AV_PKT_DATA_NB
+  },
+  codecConfig: {
+    PIX_FORMAT: binding.AV_CODEC_CONFIG_PIX_FORMAT,
+    FRAME_RATE: binding.AV_CODEC_CONFIG_FRAME_RATE,
+    SAMPLE_RATE: binding.AV_CODEC_CONFIG_SAMPLE_RATE,
+    SAMPLE_FORMAT: binding.AV_CODEC_CONFIG_SAMPLE_FORMAT,
+    CHANNEL_LAYOUT: binding.AV_CODEC_CONFIG_CHANNEL_LAYOUT,
+    COLOR_RANGE: binding.AV_CODEC_CONFIG_COLOR_RANGE,
+    COLOR_SPACE: binding.AV_CODEC_CONFIG_COLOR_SPACE
   }
 }
 

package/lib/filter-context.js

@@ -0,0 +1,7 @@
+const binding = require('../binding')
+
+module.exports = class FilterContext {
+  constructor() {
+    this._handle = binding.initFilterContext()
+  }
+}

package/lib/filter-graph.js

@@ -0,0 +1,54 @@
+const binding = require('../binding')
+
+module.exports = class FilterGraph {
+  constructor() {
+    this._handle = binding.initFilterGraph()
+  }
+
+  destroy() {
+    binding.destroyFilterGraph(this._handle)
+    this._handle = null
+  }
+
+  createFilter(context, filter, name, args) {
+    const argumentsString =
+      args &&
+      `video_size=${args.width}x${args.height}` +
+        `:pix_fmt=${args.pixelFormat}` +
+        `:time_base=${args.timeBase.numerator}/${args.timeBase.denominator}` +
+        `:pixel_aspect=${args.aspectRatio.numerator}/${args.aspectRatio.denominator}`
+
+    return binding.createFilterGraphFilter(
+      this._handle,
+      context._handle,
+      filter._handle,
+      name,
+      argumentsString
+    )
+  }
+
+  parse(filterDescription, inputs, outputs) {
+    binding.parseFilterGraph(
+      this._handle,
+      inputs._handle,
+      outputs._handle,
+      filterDescription
+    )
+  }
+
+  configure() {
+    binding.configureFilterGraph(this._handle)
+  }
+
+  pushFrame(ctx, frame) {
+    return binding.pushFilterGraphFrame(ctx._handle, frame._handle)
+  }
+
+  pullFrame(ctx, frame) {
+    return binding.pullFilterGraphFrame(ctx._handle, frame._handle)
+  }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
+}

package/lib/filter-inout.js

@@ -0,0 +1,55 @@
+const binding = require('../binding')
+
+module.exports = class FilterInOut {
+  constructor(handle = binding.initFilterInout()) {
+    this._handle = handle
+    this._next = null
+    this._filterContext = null
+  }
+
+  destroy() {
+    binding.destroyFilterInOut(this._handle)
+    this._handle = null
+  }
+
+  get name() {
+    return binding.getFilterInOutName(this._handle)
+  }
+
+  set name(value) {
+    return binding.setFilterInOutName(this._handle, value)
+  }
+
+  get filterContext() {
+    return this._filterContext
+  }
+
+  set filterContext(value) {
+    this._filterContext = value
+    return binding.setFilterInOutFilterContext(
+      this._handle,
+      this._filterContext._handle
+    )
+  }
+
+  get padIdx() {
+    return binding.getFilterInOutPadIdx(this._handle)
+  }
+
+  set padIdx(value) {
+    return binding.setFilterInOutPadIdx(this._handle, value)
+  }
+
+  get next() {
+    return this._next
+  }
+
+  set next(value) {
+    this._next = value
+    return binding.setFilterInOutNext(this._handle, this._next._handle)
+  }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
+}

package/lib/filter.js

@@ -0,0 +1,7 @@
+const binding = require('../binding')
+
+module.exports = class Filter {
+  constructor(name) {
+    this._handle = binding.getFilterByName(name)
+  }
+}

package/lib/frame.js

@@ -88,6 +88,10 @@ module.exports = class FFmpegFrame {
     binding.setFrameTimeBase(this._handle, value.numerator, value.denominator)
   }
 
+  copyProperties(source) {
+    binding.copyFrameProperties(this._handle, source._handle)
+  }
+
   alloc() {
     binding.allocFrame(this._handle, 32)
   }

package/lib/input-format.js

@@ -26,4 +26,12 @@ module.exports = class FFmpegInputFormat {
   get flags() {
     return binding.getInputFormatFlags(this._handle)
   }
+
+  get extensions() {
+    return binding.getInputFormatExtensions(this._handle)
+  }
+
+  get mimeType() {
+    return binding.getInputFormatMimeType(this._handle)
+  }
 }

package/lib/output-format.js

@@ -8,4 +8,12 @@ module.exports = class FFmpegOutputFormat {
   get flags() {
     return binding.getOutputFormatFlags(this._handle)
   }
+
+  get extensions() {
+    return binding.getOutputFormatExtensions(this._handle)
+  }
+
+  get mimeType() {
+    return binding.getOutputFormatMimeType(this._handle)
+  }
 }

package/lib/packet.js

@@ -138,6 +138,10 @@ module.exports = class FFmpegPacket {
     )
   }
 
+  copyPropsFrom(sourcePacket) {
+    binding.copyPacketProps(this._handle, sourcePacket._handle)
+  }
+
   get duration() {
     return binding.getPacketDuration(this._handle)
   }
@@ -164,7 +168,8 @@ module.exports = class FFmpegPacket {
       dts: this.dts,
       pts: this.pts,
       duration: this.duration,
-      data: this.data
+      data: this.data,
+      sideData: this.sideData
     }
   }
 

package/lib/rational.js

@@ -26,15 +26,27 @@ module.exports = class FFmpegRational {
     return this.numerator / this.denominator
   }
 
+  equals(other) {
+    return (
+      this.numerator === other.numerator &&
+      this.denominator === other.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)
+    if (src.equals(dst)) return n
+
+    return binding.rationalRescaleQ(
+      n,
+      src.numerator,
+      src.denominator,
+      dst.numerator,
+      dst.denominator
     )
   }
 }

package/lib/samples.js

@@ -1,49 +1,64 @@
 const binding = require('../binding')
-const constants = require('./constants.js')
 
 module.exports = class FFmpegSamples {
-  constructor(sampleFormat, nbChannels, nbSamples, align = 0) {
-    sampleFormat = constants.toSampleFormat(sampleFormat)
+  _data
+  _frame
 
-    this._sampleFormat = sampleFormat
-    this._nbChannels = nbChannels
-    this._nbSamples = nbSamples
-    this._align = align
+  constructor({ noAlignment = false } = {}) {
+    this._noAlignment = noAlignment
+  }
 
-    this._data = Buffer.from(
-      binding.initSamples(sampleFormat, nbChannels, nbSamples, align)
-    )
+  get data() {
+    return this._data
   }
 
-  get sampleFormat() {
-    return this._sampleFormat
+  get format() {
+    return this._frame.format
   }
 
-  get nbChannels() {
-    return this._nbChannels
+  get channelLayout() {
+    return this._frame.channelLayout
   }
 
   get nbSamples() {
-    return this._nbSamples
+    return this._frame.nbSamples
   }
 
-  get align() {
-    return this._align
+  get nbChannels() {
+    return this.channelLayout && this.channelLayout.nbChannels
   }
 
-  get data() {
-    return this._data
+  get pts() {
+    return this._frame.pts
   }
 
   fill(frame) {
-    binding.fillSamples(
-      this._sampleFormat,
-      this._nbChannels,
-      this._nbSamples,
-      this._align,
+    const { format, channelLayout, nbSamples } = frame
+
+    const len = FFmpegSamples.bufferSize(
+      format,
+      channelLayout.nbChannels,
+      nbSamples,
+      this._noAlignment
+    )
+
+    if (!this._data || len !== this._data.length) {
+      this._data = Buffer.allocUnsafe(len)
+    }
+
+    const res = binding.fillSamples(
+      frame._handle,
       this._data.buffer,
       this._data.byteOffset,
-      frame._handle
+      this._noAlignment
     )
+
+    this._frame = frame
+
+    return res
+  }
+
+  static bufferSize(format, nbChannels, nbSamples, noAlignment = false) {
+    return binding.samplesBufferSize(format, nbChannels, nbSamples, noAlignment)
   }
 }

package/lib/stream.js

@@ -66,4 +66,15 @@ module.exports = class FFmpegStream {
     this._codecParameters.toContext(context)
     return context.open()
   }
+
+  [Symbol.for('bare.inspect')]() {
+    return {
+      __proto__: { constructor: FFmpegStream },
+      id: this.id,
+      index: this.index,
+      timeBase: this.timeBase,
+      avgFramerate: this.avgFramerate,
+      codecParameters: this.codecParameters
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-ffmpeg",
-  "version": "1.0.0-26",
+  "version": "1.0.0-28",
   "description": "Low-level FFmpeg bindings for Bare",
   "exports": {
     ".": "./index.js",
@@ -18,7 +18,8 @@
   "addon": true,
   "scripts": {
     "test": "prettier . --check && bare test.js",
-    "format": "prettier . --write && clang-format -i binding.cc"
+    "format": "prettier . --write && clang-format -i binding.cc",
+    "example": "bare ./examples/index.js"
   },
   "repository": {
     "type": "git",
@@ -31,6 +32,7 @@
   },
   "homepage": "https://github.com/holepunchto/bare-ffmpeg#readme",
   "devDependencies": {
+    "bare-assert": "^1.1.0",
     "brittle": "^3.4.0",
     "cmake-bare": "^1.1.2",
     "cmake-harden": "^1.0.2",