bare-ffmpeg 1.0.0-14 → 1.0.0-15

package/README.md

@@ -573,6 +573,16 @@ Parameters:
 
 **Returns**: void
 
+##### `Image.read(frame)`
+
+Reads image data from a frame into the image buffer.
+
+Parameters:
+
+- `frame` (`Frame`): The frame to read from
+
+**Returns**: `void`
+
 ##### `Image.lineSize([plane])`
 
 Gets the line size for a specific plane.

package/binding.cc

@@ -16,6 +16,7 @@ extern "C" {
 #include <libavdevice/avdevice.h>
 #include <libavformat/avformat.h>
 #include <libavformat/avio.h>
+#include <libavutil/audio_fifo.h>
 #include <libavutil/channel_layout.h>
 #include <libavutil/dict.h>
 #include <libavutil/error.h>
@@ -26,7 +27,6 @@ extern "C" {
 #include <libavutil/pixfmt.h>
 #include <libavutil/rational.h>
 #include <libavutil/samplefmt.h>
-#include <libavutil/audio_fifo.h>
 #include <libswresample/swresample.h>
 #include <libswscale/swscale.h>
 }
@@ -763,6 +763,25 @@ bare_ffmpeg_codec_context_set_sample_rate(
   context->handle->sample_rate = sample_rate;
 }
 
+static int
+bare_ffmpeg_codec_context_get_gop_size(
+  js_env_t *env,
+  js_receiver_t,
+  js_arraybuffer_span_of_t<bare_ffmpeg_codec_context_t, 1> context
+) {
+  return context->handle->gop_size;
+}
+
+static void
+bare_ffmpeg_codec_context_set_gop_size(
+  js_env_t *env,
+  js_receiver_t,
+  js_arraybuffer_span_of_t<bare_ffmpeg_codec_context_t, 1> context,
+  int32_t gop_size
+) {
+  context->handle->gop_size = gop_size;
+}
+
 static bool
 bare_ffmpeg_codec_context_send_packet(
   js_env_t *env,
@@ -1063,6 +1082,15 @@ bare_ffmpeg_frame_set_nb_samples(
   frame->handle->nb_samples = nb_samples;
 }
 
+static int32_t
+bare_ffmpeg_frame_get_pict_type(
+  js_env_t *env,
+  js_receiver_t,
+  js_arraybuffer_span_of_t<bare_ffmpeg_frame_t, 1> frame
+) {
+  return frame->handle->pict_type;
+}
+
 static void
 bare_ffmpeg_frame_alloc(
   js_env_t *env,
@@ -1145,6 +1173,43 @@ bare_ffmpeg_image_fill(
   }
 }
 
+static void
+bare_ffmpeg_image_read(
+  js_env_t *env,
+  js_receiver_t,
+  int32_t pixel_format,
+  int32_t width,
+  int32_t height,
+  int32_t align,
+  js_arraybuffer_span_t data,
+  uint64_t offset,
+  js_arraybuffer_span_of_t<bare_ffmpeg_frame_t, 1> frame
+) {
+  uint8_t *dst_data[4];
+  int dst_linesize[4];
+
+  int err = av_image_fill_arrays(
+    dst_data,
+    dst_linesize,
+    &data[offset],
+    static_cast<AVPixelFormat>(pixel_format),
+    width,
+    height,
+    align
+  );
+  assert(err >= 0);
+
+  av_image_copy(
+    dst_data,
+    dst_linesize,
+    frame->handle->data,
+    frame->handle->linesize,
+    static_cast<AVPixelFormat>(pixel_format),
+    width,
+    height
+  );
+}
+
 static int
 bare_ffmpeg_image_get_line_size(
   js_env_t *env,
@@ -1309,6 +1374,15 @@ bare_ffmpeg_packet_get_data(
   return handle;
 }
 
+static bool
+bare_ffmpeg_packet_is_keyframe(
+  js_env_t *,
+  js_receiver_t,
+  js_arraybuffer_span_of_t<bare_ffmpeg_packet_t, 1> packet
+) {
+  return packet->handle->flags & AV_PKT_FLAG_KEY;
+}
+
 static js_arraybuffer_t
 bare_ffmpeg_scaler_init(
   js_env_t *env,
@@ -1717,7 +1791,7 @@ bare_ffmpeg_audio_fifo_drain(
   int32_t nb_samples
 ) {
   int err;
- 
+
   int len = av_audio_fifo_drain(fifo->handle, nb_samples);
 
   if (len < 0) {
@@ -1725,7 +1799,7 @@ bare_ffmpeg_audio_fifo_drain(
     assert(err == 0);
     throw js_pending_exception;
   }
- 
+
   return len;
 }
 
@@ -1806,6 +1880,9 @@ bare_ffmpeg_exports(js_env_t *env, js_value_t *exports) {
   V("setCodecContextChannelLayout", bare_ffmpeg_codec_context_set_channel_layout);
   V("getCodecContextSampleRate", bare_ffmpeg_codec_context_get_sample_rate);
   V("setCodecContextSampleRate", bare_ffmpeg_codec_context_set_sample_rate);
+  V("getCodecContextGOPSize", bare_ffmpeg_codec_context_get_gop_size)
+  V("setCodecContextGOPSize", bare_ffmpeg_codec_context_set_gop_size)
+
   V("sendCodecContextPacket", bare_ffmpeg_codec_context_send_packet)
   V("receiveCodecContextPacket", bare_ffmpeg_codec_context_receive_packet)
   V("sendCodecContextFrame", bare_ffmpeg_codec_context_send_frame)
@@ -1836,10 +1913,12 @@ bare_ffmpeg_exports(js_env_t *env, js_value_t *exports) {
   V("setFrameChannelLayout", bare_ffmpeg_frame_set_channel_layout)
   V("getFrameNbSamples", bare_ffmpeg_frame_get_nb_samples)
   V("setFrameNbSamples", bare_ffmpeg_frame_set_nb_samples)
+  V("getFramePictType", bare_ffmpeg_frame_get_pict_type)
   V("allocFrame", bare_ffmpeg_frame_alloc)
 
   V("initImage", bare_ffmpeg_image_init)
   V("fillImage", bare_ffmpeg_image_fill)
+  V("readImage", bare_ffmpeg_image_read)
   V("getImageLineSize", bare_ffmpeg_image_get_line_size)
 
   V("initSamples", bare_ffmpeg_samples_init)
@@ -1850,6 +1929,7 @@ bare_ffmpeg_exports(js_env_t *env, js_value_t *exports) {
   V("unrefPacket", bare_ffmpeg_packet_unref)
   V("getPacketStreamIndex", bare_ffmpeg_packet_get_stream_index)
   V("getPacketData", bare_ffmpeg_packet_get_data)
+  V("isPacketKeyframe", bare_ffmpeg_packet_is_keyframe)
 
   V("initScaler", bare_ffmpeg_scaler_init)
   V("destroyScaler", bare_ffmpeg_scaler_destroy)
@@ -1900,6 +1980,7 @@ bare_ffmpeg_exports(js_env_t *env, js_value_t *exports) {
   V(AV_PIX_FMT_RGB24)
   V(AV_PIX_FMT_YUVJ420P)
   V(AV_PIX_FMT_YUV420P)
+  V(AV_PIX_FMT_UYVY422)
 
   V(AVMEDIA_TYPE_UNKNOWN)
   V(AVMEDIA_TYPE_VIDEO)
@@ -1932,6 +2013,15 @@ bare_ffmpeg_exports(js_env_t *env, js_value_t *exports) {
   V(AV_CH_LAYOUT_5POINT0)
   V(AV_CH_LAYOUT_5POINT1)
   V(AV_CH_LAYOUT_7POINT1)
+
+  V(AV_PICTURE_TYPE_NONE)
+  V(AV_PICTURE_TYPE_I)
+  V(AV_PICTURE_TYPE_P)
+  V(AV_PICTURE_TYPE_B)
+  V(AV_PICTURE_TYPE_S)
+  V(AV_PICTURE_TYPE_SI)
+  V(AV_PICTURE_TYPE_SP)
+  V(AV_PICTURE_TYPE_BI)
 #undef V
 
   return exports;

package/cmake/ports/opus/port.cmake

@@ -11,6 +11,10 @@ set(args
   -DBUILD_TESTING=OFF
 )
 
+if(WIN32)
+  list(APPEND args -DOPUS_DISABLE_INTRINSICS=ON)
+endif()
+
 declare_port(
   "github:xiph/opus@v1.5.2"
   opus

package/lib/codec-context.js

@@ -78,6 +78,14 @@ module.exports = class FFmpegCodecContext {
     )
   }
 
+  get gopSize() {
+    return binding.getCodecContextGOPSize(this._handle)
+  }
+
+  set gopSize(value) {
+    binding.setCodecContextGOPSize(this._handle, value)
+  }
+
   open(options) {
     if (this._opened) return
     this._opened = true

package/lib/constants.js

@@ -56,6 +56,16 @@ module.exports = exports = {
     '5.0': binding.AV_CH_LAYOUT_5POINT0,
     5.1: binding.AV_CH_LAYOUT_5POINT1,
     7.1: binding.AV_CH_LAYOUT_7POINT1
+  },
+  pictureType: {
+    NONE: binding.AV_PICTURE_TYPE_NONE,
+    I: binding.AV_PICTURE_TYPE_I,
+    P: binding.AV_PICTURE_TYPE_P,
+    B: binding.AV_PICTURE_TYPE_B,
+    S: binding.AV_PICTURE_TYPE_S,
+    SI: binding.AV_PICTURE_TYPE_SI,
+    SP: binding.AV_PICTURE_TYPE_SP,
+    BI: binding.AV_PICTURE_TYPE_BI
   }
 }
 

package/lib/frame.js

@@ -62,6 +62,10 @@ module.exports = class FFmpegFrame {
     binding.setFrameNbSamples(this._handle, value)
   }
 
+  get pictType() {
+    return binding.getFramePictType(this._handle)
+  }
+
   alloc() {
     binding.allocFrame(this._handle, 32)
   }

package/lib/image.js

@@ -47,6 +47,18 @@ module.exports = class FFmpegImage {
     )
   }
 
+  read(frame) {
+    binding.readImage(
+      this._pixelFormat,
+      this._width,
+      this._height,
+      this._align,
+      this._data.buffer,
+      this._data.byteOffset,
+      frame._handle
+    )
+  }
+
   lineSize(plane = 0) {
     return binding.getImageLineSize(this._pixelFormat, this._width, plane)
   }

package/lib/input-format.js

@@ -3,6 +3,9 @@ const binding = require('../binding')
 let defaultName = null
 
 switch (Bare.platform) {
+  case 'android':
+    defaultName = 'android_camera'
+    break
   case 'darwin':
   case 'ios':
     defaultName = 'avfoundation'

package/lib/packet.js

@@ -30,6 +30,10 @@ module.exports = class FFmpegPacket {
     return Buffer.from(binding.getPacketData(this._handle))
   }
 
+  get isKeyframe() {
+    return binding.isPacketKeyframe(this._handle)
+  }
+
   [Symbol.dispose]() {
     this.destroy()
   }

package/package.json

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