bare-ffmpeg 1.0.0-28 → 1.0.0-29

package/README.md

@@ -266,6 +266,12 @@ Parameters:
 
 #### Methods
 
+##### `InputFormatContext.inputFormat`
+
+Gets the input format associated with this context.
+
+**Returns**: `InputFormat` instance or `undefined` if not available
+
 ##### `InputFormatContext.destroy()`
 
 Destroys the `InputFormatContext` and closes the input format. Automatically called when the object is managed by a `using` declaration.
@@ -299,6 +305,12 @@ Parameters:
 
 **Returns**: A new `Stream` instance
 
+##### `OutputFormatContext.outputFormat`
+
+Gets the output format associated with this context.
+
+**Returns**: `OutputFormat` instance or `undefined` if not available
+
 ##### `OutputFormatContext.destroy()`
 
 Destroys the `OutputFormatContext` and closes the output format. Automatically called when the object is managed by a `using` declaration.

package/binding.cc

@@ -29,6 +29,7 @@ extern "C" {
 #include <libavutil/frame.h>
 #include <libavutil/imgutils.h>
 #include <libavutil/log.h>
+#include <libavutil/mathematics.h>
 #include <libavutil/mem.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/rational.h>
@@ -129,12 +130,6 @@ typedef struct {
 
 static uv_once_t bare_ffmpeg__init_guard = UV_ONCE_INIT;
 
-static inline bool
-bare_ffmpeg__bad_timebase(const AVRational r) {
-  return r.den < 1 ||    // Invalid denominator
-         av_q2d(r) == 0; // Initial state (0 / 1)
-}
-
 static void
 bare_ffmpeg__on_init(void) {
   av_log_set_level(AV_LOG_ERROR);
@@ -711,6 +706,48 @@ bare_ffmpeg_format_context_dump(
   }
 }
 
+static std::optional<js_arraybuffer_t>
+get_bare_ffmpeg_format_context_output_format(
+  js_env_t *env,
+  js_receiver_t,
+  js_arraybuffer_span_of_t<bare_ffmpeg_format_context_t, 1> context
+) {
+  int err;
+
+  if (!context->handle->oformat) return std::nullopt;
+
+  js_arraybuffer_t handle;
+
+  bare_ffmpeg_output_format_t *format;
+  err = js_create_arraybuffer(env, format, handle);
+  assert(err == 0);
+
+  format->handle = context->handle->oformat;
+
+  return handle;
+}
+
+static std::optional<js_arraybuffer_t>
+get_bare_ffmpeg_format_context_input_format(
+  js_env_t *env,
+  js_receiver_t,
+  js_arraybuffer_span_of_t<bare_ffmpeg_format_context_t, 1> context
+) {
+  int err;
+
+  if (!context->handle->iformat) return std::nullopt;
+
+  js_arraybuffer_t handle;
+
+  bare_ffmpeg_input_format_t *format;
+  err = js_create_arraybuffer(env, format, handle);
+  assert(err == 0);
+
+  format->handle = context->handle->iformat;
+
+  return handle;
+}
+
 static int32_t
 bare_ffmpeg_stream_get_index(
   js_env_t *env,
@@ -2775,30 +2812,20 @@ bare_ffmpeg_packet_set_time_base(
   packet->handle->time_base.den = den;
 }
 
-static int64_t
+static void
 bare_ffmpeg_packet_rescale_ts(
   js_env_t *env,
   js_arraybuffer_span_of_t<bare_ffmpeg_packet_t, 1> packet,
-  int32_t num,
-  int32_t den
-) {
-  AVRational src = packet->handle->time_base;
-  AVRational dst = {num, den};
-
-  if (
-    bare_ffmpeg__bad_timebase(src) ||
-    bare_ffmpeg__bad_timebase(dst) ||
-    packet->handle->dts == AV_NOPTS_VALUE ||
-    packet->handle->pts == AV_NOPTS_VALUE
-  ) {
-    return false;
-  }
-
-  av_packet_rescale_ts(packet->handle, src, dst);
-
-  packet->handle->time_base = dst;
-
-  return true;
+  int32_t src_num,
+  int32_t src_den,
+  int32_t dst_num,
+  int32_t dst_den
+) {
+  av_packet_rescale_ts(
+    packet->handle,
+    {src_num, src_den},
+    {dst_num, dst_den}
+  );
 }
 
 static int64_t
@@ -2945,11 +2972,6 @@ bare_ffmpeg_scaler_scale(
   int height,
   js_arraybuffer_span_of_t<bare_ffmpeg_frame_t, 1> target
 ) {
-  int err;
-
-  err = av_frame_copy_props(target->handle, source->handle);
-  assert(err == 0);
-
   return sws_scale(
     scaler->handle,
     reinterpret_cast<const uint8_t *const *>(source->handle->data),
@@ -3628,9 +3650,15 @@ bare_ffmpeg_rational_rescale_q(
   int32_t bq_num,
   int32_t bq_den,
   int32_t cq_num,
-  int32_t cq_den
-) {
-  return av_rescale_q(ts, {bq_num, bq_den}, {cq_num, cq_den});
+  int32_t cq_den,
+  int64_t av_round
+) {
+  return av_rescale_q_rnd(
+    ts,
+    {bq_num, bq_den},
+    {cq_num, cq_den},
+    static_cast<AVRounding>(av_round)
+  );
 }
 
 static js_value_t *
@@ -3674,6 +3702,8 @@ bare_ffmpeg_exports(js_env_t *env, js_value_t *exports) {
   V("writeFormatContextFrame", bare_ffmpeg_format_context_write_frame)
   V("writeFormatContextTrailer", bare_ffmpeg_format_context_write_trailer)
   V("dumpFormatContext", bare_ffmpeg_format_context_dump)
+  V("getFormatContextOutputFormat", get_bare_ffmpeg_format_context_output_format)
+  V("getFormatContextInputFormat", get_bare_ffmpeg_format_context_input_format)
 
   V("getStreamIndex", bare_ffmpeg_stream_get_index)
   V("getStreamId", bare_ffmpeg_stream_get_id)
@@ -4176,6 +4206,12 @@ bare_ffmpeg_exports(js_env_t *env, js_value_t *exports) {
   V(AV_CODEC_CONFIG_COLOR_RANGE)
   V(AV_CODEC_CONFIG_COLOR_SPACE)
 
+  V(AV_ROUND_ZERO)
+  V(AV_ROUND_INF)
+  V(AV_ROUND_DOWN)
+  V(AV_ROUND_UP)
+  V(AV_ROUND_NEAR_INF) // default
+  V(AV_ROUND_PASS_MINMAX)
 #undef V
 
   return exports;

package/lib/codec-context.js

@@ -217,7 +217,10 @@ module.exports = class FFmpegCodecContext {
       timeBase: this.timeBase,
       channelLayout: this.channelLayout,
       gopSize: this.gopSize,
-      extraData: this.extraData
+      extraData: this.extraData,
+      frameRate: this.frameRate,
+      frameSize: this.frameSize,
+      frameNum: this.frameNum
     }
   }
 }

package/lib/constants.js

@@ -193,6 +193,14 @@ module.exports = exports = {
     CHANNEL_LAYOUT: binding.AV_CODEC_CONFIG_CHANNEL_LAYOUT,
     COLOR_RANGE: binding.AV_CODEC_CONFIG_COLOR_RANGE,
     COLOR_SPACE: binding.AV_CODEC_CONFIG_COLOR_SPACE
+  },
+  rounding: {
+    AV_ROUND_ZERO: binding.AV_ROUND_ZERO,
+    AV_ROUND_INF: binding.AV_ROUND_INF,
+    AV_ROUND_DOWN: binding.AV_ROUND_DOWN,
+    AV_ROUND_UP: binding.AV_ROUND_UP,
+    AV_ROUND_NEAR_INF: binding.AV_ROUND_NEAR_INF,
+    AV_ROUND_PASS_MINMAX: binding.AV_ROUND_PASS_MINMAX
   }
 }
 

package/lib/format-context.js

@@ -111,16 +111,21 @@ exports.InputFormatContext = class FFmpegInputFormatContext extends (
     }
   }
 
-  dump(printIdx = 0, printUrl = '') {
-    binding.dumpFormatContext(this._handle, false, printIdx, printUrl)
-  }
-
   destroy() {
     super.destroy()
 
     binding.closeInputFormatContext(this._handle)
     this._handle = null
   }
+
+  dump(printIdx = 0, printUrl = '') {
+    binding.dumpFormatContext(this._handle, false, printIdx, printUrl)
+  }
+
+  get inputFormat() {
+    const handle = binding.getFormatContextInputFormat(this._handle)
+    if (handle) return InputFormat.from(handle)
+  }
 }
 
 exports.OutputFormatContext = class FFmpegOutputFormatContext extends (
@@ -167,4 +172,9 @@ exports.OutputFormatContext = class FFmpegOutputFormatContext extends (
   dump(printIdx = 0, printUrl = '') {
     binding.dumpFormatContext(this._handle, true, printIdx, printUrl)
   }
+
+  get outputFormat() {
+    const handle = binding.getFormatContextOutputFormat(this._handle)
+    if (handle) return OutputFormat.from(handle)
+  }
 }

package/lib/input-format.js

@@ -19,8 +19,13 @@ switch (Bare.platform) {
 }
 
 module.exports = class FFmpegInputFormat {
-  constructor(name = defaultName) {
-    this._handle = binding.initInputFormat(name)
+  constructor(name = defaultName, handle) {
+    if (handle) this._handle = handle
+    else this._handle = binding.initInputFormat(name)
+  }
+
+  static from(handle) {
+    return new FFmpegInputFormat(null, handle)
   }
 
   get flags() {
@@ -34,4 +39,13 @@ module.exports = class FFmpegInputFormat {
   get mimeType() {
     return binding.getInputFormatMimeType(this._handle)
   }
+
+  [Symbol.for('bare.inspect')]() {
+    return {
+      __proto__: { constructor: FFmpegInputFormat },
+      flags: this.flags,
+      extensions: this.extensions,
+      mimeType: this.mimeType
+    }
+  }
 }

package/lib/output-format.js

@@ -1,8 +1,13 @@
 const binding = require('../binding')
 
 module.exports = class FFmpegOutputFormat {
-  constructor(name) {
-    this._handle = binding.initOutputFormat(name)
+  constructor(name, handle) {
+    if (handle) this._handle = handle
+    else this._handle = binding.initOutputFormat(name)
+  }
+
+  static from(handle) {
+    return new FFmpegOutputFormat(null, handle)
   }
 
   get flags() {
@@ -16,4 +21,13 @@ module.exports = class FFmpegOutputFormat {
   get mimeType() {
     return binding.getOutputFormatMimeType(this._handle)
   }
+
+  [Symbol.for('bare.inspect')]() {
+    return {
+      __proto__: { constructor: FFmpegOutputFormat },
+      flags: this.flags,
+      extensions: this.extensions,
+      mimeType: this.mimeType
+    }
+  }
 }

package/lib/packet.js

@@ -130,11 +130,13 @@ module.exports = class FFmpegPacket {
     binding.setPacketTimeBase(this._handle, value.numerator, value.denominator)
   }
 
-  rescaleTimestamps(rational) {
+  rescaleTimestamps(srcTimeBase, dstTimeBase) {
     return binding.rescalePacketTimestamps(
       this._handle,
-      rational.numerator,
-      rational.denominator
+      srcTimeBase.numerator,
+      srcTimeBase.denominator,
+      dstTimeBase.numerator,
+      dstTimeBase.denominator
     )
   }
 

package/lib/rational.js

@@ -1,4 +1,5 @@
 const binding = require('../binding')
+const { AV_ROUND_NEAR_INF } = require('./constants').rounding
 
 module.exports = class FFmpegRational {
   constructor(numerator = 0, denominator = 1) {
@@ -38,7 +39,7 @@ module.exports = class FFmpegRational {
     return new FFmpegRational(view[0], view[1])
   }
 
-  static rescaleQ(n, src, dst) {
+  static rescaleQ(n, src, dst, round = AV_ROUND_NEAR_INF) {
     if (src.equals(dst)) return n
 
     return binding.rationalRescaleQ(
@@ -46,7 +47,8 @@ module.exports = class FFmpegRational {
       src.numerator,
       src.denominator,
       dst.numerator,
-      dst.denominator
+      dst.denominator,
+      round
     )
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-ffmpeg",
-  "version": "1.0.0-28",
+  "version": "1.0.0-29",
   "description": "Low-level FFmpeg bindings for Bare",
   "exports": {
     ".": "./index.js",