bare-ffmpeg 1.0.0-16 → 1.0.0-18

package/README.md

@@ -339,6 +339,12 @@ Gets the sample rate for audio codecs.
 
 **Returns**: `number`
 
+##### `CodecParameters.extraData`
+
+Out-of-band global headers that may be used by some codecs.
+
+**Returns**: `Buffer`
+
 #### Methods
 
 ##### `CodecParameters.fromContext(context)`
@@ -636,6 +642,36 @@ Gets the denominator.
 
 **Returns**: `number`
 
+##### `Rational.valid`
+
+Returns if true if rational describes a non-zero & non-negative quantity.
+
+**Returns**: `number`
+
+##### `Rational.uninitialized`
+
+Returns if true when is not set.
+
+**Returns**: `number`
+
+##### `Rational.toNumber()`
+
+see `av_q2d()`
+
+**Returns**: `number`
+
+##### `static Rational.from(number)`
+
+see `av_d2q()`
+
+**Returns**: `Rational`
+
+##### `Rational.rescaleQ(number, timebaseA, timebaseB)`
+
+see `av_rescale_q()`
+
+**Returns**: `number`
+
 ### `Stream`
 
 The `Stream` API provides functionality to access media stream information and create decoders/encoders.

package/binding.cc

@@ -1338,6 +1338,62 @@ bare_ffmpeg_codec_parameters_get_framerate(
   return result;
 }
 
+static js_arraybuffer_t
+bare_ffmpeg_codec_parameters_get_extra_data(
+  js_env_t *env,
+  js_receiver_t,
+  js_arraybuffer_span_of_t<bare_ffmpeg_codec_parameters_t, 1> parameters
+) {
+  int err;
+
+  js_arraybuffer_t buffer;
+
+  assert(parameters->handle->extradata_size >= 0);
+
+  err = js_create_arraybuffer(
+    env,
+    parameters->handle->extradata,
+    static_cast<size_t>(parameters->handle->extradata_size),
+    buffer
+  );
+  assert(err == 0);
+
+  return buffer;
+}
+
+void
+bare_ffmpeg_codec_parameters_set_extra_data(
+  js_env_t *env,
+  js_receiver_t,
+  js_arraybuffer_span_of_t<bare_ffmpeg_codec_parameters_t, 1> parameters,
+  js_arraybuffer_t buffer,
+  uint32_t offset,
+  uint32_t len
+) {
+  int err;
+
+  std::span<uint8_t> view;
+
+  err = js_get_arraybuffer_info(env, buffer, view);
+  assert(err == 0);
+
+  if (parameters->handle->extradata_size) {
+    assert(parameters->handle->extradata_size > 0);
+    assert(parameters->handle->extradata);
+
+    av_free(parameters->handle->extradata);
+  }
+
+  size_t min_size = len + AV_INPUT_BUFFER_PADDING_SIZE;
+
+  parameters->handle->extradata = reinterpret_cast<uint8_t *>(av_malloc(min_size));
+  memset(&parameters->handle->extradata[len], 0, AV_INPUT_BUFFER_PADDING_SIZE);
+
+  memcpy(parameters->handle->extradata, &view[offset], len);
+
+  parameters->handle->extradata_size = static_cast<int>(len);
+}
+
 static js_arraybuffer_t
 bare_ffmpeg_frame_init(js_env_t *env, js_receiver_t) {
   int err;
@@ -1354,6 +1410,15 @@ bare_ffmpeg_frame_init(js_env_t *env, js_receiver_t) {
   return handle;
 }
 
+static void
+bare_ffmpeg_frame_unref(
+  js_env_t *env,
+  js_receiver_t,
+  js_arraybuffer_span_of_t<bare_ffmpeg_frame_t, 1> frame
+) {
+  av_frame_unref(frame->handle);
+}
+
 static void
 bare_ffmpeg_frame_destroy(
   js_env_t *env,
@@ -2564,9 +2629,12 @@ bare_ffmpeg_exports(js_env_t *env, js_value_t *exports) {
   V("getCodecParametersWidth", bare_ffmpeg_codec_parameters_get_width)
   V("getCodecParametersHeight", bare_ffmpeg_codec_parameters_get_height)
   V("getCodecParametersFramerate", bare_ffmpeg_codec_parameters_get_framerate)
+  V("getCodecParametersExtraData", bare_ffmpeg_codec_parameters_get_extra_data)
+  V("setCodecParametersExtraData", bare_ffmpeg_codec_parameters_set_extra_data)
 
   V("initFrame", bare_ffmpeg_frame_init)
   V("destroyFrame", bare_ffmpeg_frame_destroy)
+  V("unrefFrame", bare_ffmpeg_frame_unref)
   V("getFrameWidth", bare_ffmpeg_frame_get_width)
   V("setFrameWidth", bare_ffmpeg_frame_set_width)
   V("getFrameHeight", bare_ffmpeg_frame_get_height)

package/lib/codec-parameters.d.ts

@@ -10,6 +10,7 @@ declare class FFmpegCodecParameters {
   readonly nbChannels: number
   readonly codecType: number
   readonly channelLayout: FFmpegChannelLayout
+  extraData: Buffer
 
   constructor(handle: ArrayBuffer)
 

package/lib/codec-parameters.js

@@ -60,6 +60,19 @@ module.exports = class FFmpegCodecParameters {
     return binding.getCodecParametersHeight(this._handle)
   }
 
+  get extraData() {
+    return Buffer.from(binding.getCodecParametersExtraData(this._handle))
+  }
+
+  set extraData(value) {
+    binding.setCodecParametersExtraData(
+      this._handle,
+      value.buffer,
+      value.byteOffset,
+      value.byteLength
+    )
+  }
+
   fromContext(context) {
     binding.codecParametersFromContext(this._handle, context._handle)
   }
@@ -82,7 +95,8 @@ module.exports = class FFmpegCodecParameters {
       sampleRate: this.sampleRate,
       nbChannels: this.nbChannels,
       channelLayout: this.channelLayout,
-      frameRate: this.frameRate
+      frameRate: this.frameRate,
+      extraData: this.extraData
     }
   }
 }

package/lib/frame.d.ts

@@ -1,4 +1,5 @@
 import FFmpegChannelLayout from './channel-layout'
+import FFmpegRational from './rational'
 
 declare class FFmpegFrame {
   readonly pictType: number
@@ -11,10 +12,14 @@ declare class FFmpegFrame {
   pixelFormat: number
   format: number
   nbSamples: number
+  pts: number
+  packetDTS: number
+  timeBase: FFmpegRational
 
   constructor()
 
   alloc(): void
+  unref(): void
 
   destroy(): void
   [Symbol.dispose](): void

package/lib/frame.js

@@ -12,6 +12,10 @@ module.exports = class FFmpegFrame {
     this._handle = null
   }
 
+  unref() {
+    binding.unrefFrame(this._handle)
+  }
+
   get width() {
     return binding.getFrameWidth(this._handle)
   }

package/lib/rational.d.ts

@@ -1,8 +1,14 @@
 declare class FFmpegRational {
   numerator: number
   denominator: number
+  valid: boolean
+  unintialized: boolean
 
   constructor(numerator: number, denominator: number)
+
+  toNumber(): number
+  static from(number: number): Rational
+  static rescaleQ(n: Number, a: Rational, b: Rational)
 }
 
 export = FFmpegRational

package/lib/rational.js

@@ -7,21 +7,22 @@ module.exports = class FFmpegRational {
   }
 
   get valid() {
-    // don't support negative denominators unless
-    // required by codec or format
-    if (this.denominator < 1) return false
+    // don't support negative denominators for now
+    if (this.denominator < 0) return false
 
-    // common initial value for AVRational(0, 1)
-    if (this.q2d === 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
   }
 
-  get q2d() {
+  toNumber() {
     return this.numerator / this.denominator
   }
 
@@ -29,4 +30,11 @@ module.exports = class FFmpegRational {
     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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-ffmpeg",
-  "version": "1.0.0-16",
+  "version": "1.0.0-18",
   "description": "Low-level FFmpeg bindings for Bare",
   "exports": {
     ".": {