bare-ffmpeg 1.0.0-22 → 1.0.0-24

package/CMakeLists.txt

@@ -8,7 +8,7 @@ project(bare_ffmpeg C CXX)
 
 fetch_package("github:holepunchto/libjstl#5b85a24")
 
-find_port(ffmpeg FEATURES gpl dav1d svt-av1 x264 opus)
+find_port(ffmpeg FEATURES dav1d svt-av1 opus)
 
 add_bare_module(bare_ffmpeg)
 

package/README.md

@@ -108,6 +108,21 @@ for (const [key, value] of dict) {
 }
 ```
 
+#### Static methods
+
+##### `Dictionary.from(object)`
+
+A helper to create a `Dictionary` instance from an object.
+
+```js
+const dict = ffmpeg.Dictionary.from({
+  foo: 'bar',
+  baz: 'qux'
+})
+```
+
+**Returns**: A new `Dictionary` instance
+
 ### `FormatContext`
 
 The `FormatContext` API provides the base functionality for reading and writing media files.

package/binding.cc

@@ -34,8 +34,8 @@ extern "C" {
 }
 
 using bare_ffmpeg_io_context_write_cb_t = js_function_t<void, js_arraybuffer_t>;
-using bare_ffmpeg_io_context_read_cb_t = js_function_t<int32_t, js_typedarray_t<uint8_t>, int32_t>;
-using bare_ffmpeg_io_context_seek_cb_t = js_function_t<void, int64_t>;
+using bare_ffmpeg_io_context_read_cb_t = js_function_t<int32_t, js_arraybuffer_t, int32_t>;
+using bare_ffmpeg_io_context_seek_cb_t = js_function_t<int64_t, int64_t, std::string>;
 
 typedef struct {
   AVIOContext *handle;
@@ -45,8 +45,6 @@ typedef struct {
   js_persistent_t<bare_ffmpeg_io_context_write_cb_t> on_write;
   js_persistent_t<bare_ffmpeg_io_context_read_cb_t> on_read;
   js_persistent_t<bare_ffmpeg_io_context_seek_cb_t> on_seek;
-
-  int64_t offset;
 } bare_ffmpeg_io_context_t;
 
 typedef struct {
@@ -168,24 +166,17 @@ bare_ffmpeg__on_io_context_read(void *opaque, uint8_t *buf, int len) {
   err = js_create_external_arraybuffer(env, buf, static_cast<size_t>(len), arraybuffer);
   assert(err == 0);
 
-  js_typedarray_t<uint8_t> uint8array;
-  err = js_create_typedarray(env, static_cast<size_t>(len), arraybuffer, uint8array);
-  assert(err == 0);
-
   int32_t result;
-  err = js_call_function<js_type_options_t{}, int32_t, js_typedarray_t<uint8_t>, int32_t>(env, callback, uint8array, len, result);
-  assert(err == 0);
+  int call_status = js_call_function<js_type_options_t{}, int32_t, js_arraybuffer_t, int32_t>(env, callback, arraybuffer, len, result);
 
   err = js_detach_arraybuffer(env, arraybuffer);
   assert(err == 0);
 
-  if (result == 0) return AVERROR_EOF;
-
-  if (result > len) result = len;
+  if (call_status < 0) return AVERROR(EIO);
 
-  context->offset += static_cast<int64_t>(result);
+  if (result == 0) return AVERROR_EOF;
 
-  return static_cast<int>(result);
+  return result;
 }
 
 static int64_t
@@ -197,27 +188,37 @@ bare_ffmpeg__on_io_context_seek(void *opaque, int64_t offset, int whence) {
   auto env = context->env;
 
   int64_t result;
-
+  std::string whence_str;
   switch (whence) {
+  case AVSEEK_SIZE:
+    whence_str = "avseek_size";
+    break;
+  case AVSEEK_FORCE:
+    whence_str = "avseek_force";
+    break;
   case SEEK_SET:
-    result = offset;
+    whence_str = "seek_set";
     break;
   case SEEK_CUR:
-    result = context->offset + offset;
+    whence_str = "seek_cur";
     break;
   case SEEK_END:
+    whence_str = "seek_end";
+    break;
   default:
-    return -1;
+    whence_str = "unknown:" + std::to_string(whence);
   }
 
   bare_ffmpeg_io_context_seek_cb_t callback;
   err = js_get_reference_value(env, context->on_seek, callback);
   assert(err == 0);
 
-  err = js_call_function(env, callback, result);
-  assert(err == 0);
+  err = js_call_function<js_type_options_t{}, int64_t, int64_t, std::string>(env, callback, offset, whence_str, result);
+  if (err < 0) return AVERROR(EIO); // read-error
 
-  context->offset = result;
+  if (result == -1) {
+    return AVERROR(ENOSYS); // seek-op not supported by IO
+  }
 
   return result;
 }
@@ -242,7 +243,6 @@ bare_ffmpeg_io_context_init(
   assert(err == 0);
 
   context->env = env;
-  context->offset = 0;
 
   int writable = 0;
 

package/cmake/ports/ffmpeg/port.cmake

@@ -285,6 +285,7 @@ if(CMAKE_HOST_WIN32)
   find_path(
     msys2
     NAMES msys2.exe
+    PATHS "C:/tools/msys64"
     REQUIRED
   )
 

package/lib/codec.js

@@ -51,7 +51,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 OPUS = this.for(constants.codecs.OPUS)
   static AV1 = this.for(constants.codecs.AV1)

package/lib/constants.js

@@ -1,7 +1,6 @@
 const binding = require('../binding')
 const errors = require('./errors')
 
-// Helpers
 function makeTag(a, b, c, d) {
   return (
     a.charCodeAt(0) |
@@ -14,7 +13,6 @@ function makeTag(a, b, c, d) {
 module.exports = exports = {
   codecs: {
     MJPEG: binding.AV_CODEC_ID_MJPEG,
-    H264: binding.AV_CODEC_ID_H264,
     AAC: binding.AV_CODEC_ID_AAC,
     OPUS: binding.AV_CODEC_ID_OPUS,
     AV1: binding.AV_CODEC_ID_AV1,
@@ -22,11 +20,7 @@ module.exports = exports = {
     MP3: binding.AV_CODEC_ID_MP3
   },
   tags: {
-    // Source Ref:
-    // https://github.com/FFmpeg/FFmpeg/blob/master/libavformat/riff.c#L36
-    // https://github.com/FFmpeg/FFmpeg/blob/master/libavformat/riff.c#L530
     MJPEG: makeTag('M', 'J', 'P', 'G'),
-    H264: makeTag('H', '2', '6', '4'),
     AV1: makeTag('A', 'V', '0', '1'),
     AAC: 0x00ff,
     FLAC: 0xf1ac,

package/lib/dictionary.js

@@ -1,6 +1,16 @@
 const binding = require('../binding')
 
 module.exports = class FFmpegDictionary {
+  static from(obj) {
+    const dictionary = new FFmpegDictionary()
+
+    for (const [key, value] of Object.entries(obj)) {
+      dictionary.set(key, value)
+    }
+
+    return dictionary
+  }
+
   constructor() {
     this._handle = binding.initDictionary()
   }

package/lib/io-context.js

@@ -16,19 +16,12 @@ module.exports = class FFmpegIOContext {
       buffer = Buffer.alloc(0)
     }
 
-    let onwrite
-    if (opts.onwrite) {
-      onwrite = (chunk) => {
-        opts.onwrite(Buffer.from(chunk))
-      }
-    }
-
     this._handle = binding.initIOContext(
       buffer,
       offset,
       len,
-      onwrite,
-      opts.onread,
+      opts.onwrite && onwriteWrapper.bind(null, opts.onwrite),
+      opts.onread && onreadWrapper.bind(null, opts.onread),
       opts.onseek
     )
   }
@@ -42,3 +35,11 @@ module.exports = class FFmpegIOContext {
     this.destroy()
   }
 }
+
+function onwriteWrapper(target, arraybuffer) {
+  return target(Buffer.from(arraybuffer))
+}
+
+function onreadWrapper(target, arraybuffer, requestedLen) {
+  return target(Buffer.from(arraybuffer), requestedLen)
+}

package/package.json

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