bare-ffmpeg 1.0.0-32 → 1.0.0-33

package/cmake/ports/ffmpeg/port.cmake

@@ -226,15 +226,6 @@ set(pkg_config_path)
 
 if("gpl" IN_LIST features)
   list(APPEND args --enable-gpl)
-
-  add_library(postproc STATIC IMPORTED GLOBAL)
-
-  list(APPEND libraries postproc)
-  list(APPEND byproducts lib/libpostproc.a)
-
-  target_link_libraries(postproc INTERFACE avutil)
-  target_link_libraries(avdevice INTERFACE postproc)
-  target_link_libraries(avfilter INTERFACE postproc)
 endif()
 
 if("zlib" IN_LIST features)
@@ -281,6 +272,14 @@ if("opus" IN_LIST features)
   target_link_libraries(avcodec INTERFACE opus)
 endif()
 
+if(LINUX)
+  find_port(libva)
+
+  list(APPEND args --enable-vaapi)
+  list(APPEND pkg_config_path "${libva_PREFIX}/lib/pkgconfig")
+  list(APPEND pkg_config_path "${libdrm_PREFIX}/lib/pkgconfig")
+endif()
+
 if(CMAKE_HOST_WIN32)
   find_path(
     msys2

package/cmake/ports/libdrm/port.cmake

@@ -0,0 +1,32 @@
+include_guard(GLOBAL)
+
+declare_port(
+  "git:gitlab.freedesktop.org/mesa/drm#libdrm-2.4.128"
+  libdrm
+  MESON
+  BYPRODUCTS
+    lib/libdrm.a
+  ARGS
+    -Dcairo-tests=disabled
+    -Dman-pages=disabled
+    -Dvalgrind=disabled
+    -Dinstall-test-programs=false
+    -Dudev=true
+)
+
+add_library(drm STATIC IMPORTED GLOBAL)
+
+add_dependencies(drm ${libdrm})
+
+set_target_properties(
+  drm
+  PROPERTIES
+  IMPORTED_LOCATION "${libdrm_PREFIX}/lib/libdrm.a"
+)
+
+file(MAKE_DIRECTORY "${libdrm_PREFIX}/include")
+
+target_include_directories(
+  drm
+  INTERFACE "${libdrm_PREFIX}/include"
+)

package/cmake/ports/libva/port.cmake

@@ -0,0 +1,53 @@
+include_guard(GLOBAL)
+
+find_port(libdrm)
+
+declare_port(
+  "github:intel/libva#2.22.0"
+  libva
+  MESON
+  DEPENDS drm
+  BYPRODUCTS
+    lib/libva.so.2.2200.0
+    lib/libva-drm.so.2.2200.0
+  ARGS
+    -Denable_docs=false
+    -Ddisable_drm=false
+  ENV
+    "PKG_CONFIG_PATH=${libdrm_PREFIX}/lib/pkgconfig"
+)
+
+add_library(va SHARED IMPORTED GLOBAL)
+add_library(va-drm SHARED IMPORTED GLOBAL)
+
+add_dependencies(va ${libva})
+add_dependencies(va-drm ${libva})
+
+set_target_properties(
+  va
+  PROPERTIES
+  IMPORTED_LOCATION "${libva_PREFIX}/lib/libva.so.2.2200.0"
+  IMPORTED_SONAME libva.so.2
+)
+
+set_target_properties(
+  va-drm
+  PROPERTIES
+  IMPORTED_LOCATION "${libva_PREFIX}/lib/libva-drm.so.2.2200.0"
+  IMPORTED_SONAME libva-drm.so.2
+)
+
+file(MAKE_DIRECTORY "${libva_PREFIX}/include")
+
+target_include_directories(
+  va
+  INTERFACE "${libva_PREFIX}/include"
+)
+
+target_include_directories(
+  va-drm
+  INTERFACE "${libva_PREFIX}/include"
+)
+
+target_link_libraries(va INTERFACE drm)
+target_link_libraries(va-drm INTERFACE drm va)

package/cmake/ports/x264/port.cmake

@@ -128,6 +128,12 @@ if(CMAKE_AR)
   list(APPEND env --modify "PATH=path_list_prepend:${AR_path}")
 endif()
 
+set(patches)
+
+if(WIN32)
+  list(APPEND patches patches/01-windows-clang.patch)
+endif()
+
 declare_port(
   "git:code.videolan.org/videolan/x264#stable"
   x264
@@ -135,8 +141,7 @@ declare_port(
   BYPRODUCTS lib/${lib}
   ARGS ${args}
   ENV ${env}
-  PATCHES
-    patches/01-windows-clang.patch
+  PATCHES ${patches}
 )
 
 add_library(x264 STATIC IMPORTED GLOBAL)

package/index.js

@@ -12,6 +12,9 @@ const FilterContext = require('./lib/filter-context')
 const FilterGraph = require('./lib/filter-graph')
 const FilterInOut = require('./lib/filter-inout')
 const Frame = require('./lib/frame')
+const HWDeviceContext = require('./lib/hw-device-context')
+const HWFramesContext = require('./lib/hw-frames-context')
+const HWFramesConstraints = require('./lib/hw-frames-constraints')
 const IOContext = require('./lib/io-context')
 const Image = require('./lib/image')
 const InputFormat = require('./lib/input-format')
@@ -37,6 +40,9 @@ exports.FilterContext = FilterContext
 exports.FilterGraph = FilterGraph
 exports.FilterInOut = FilterInOut
 exports.Frame = Frame
+exports.HWDeviceContext = HWDeviceContext
+exports.HWFramesContext = HWFramesContext
+exports.HWFramesConstraints = HWFramesConstraints
 exports.IOContext = IOContext
 exports.Image = Image
 exports.InputFormat = InputFormat

package/lib/codec-context.js

@@ -1,6 +1,7 @@
 const binding = require('../binding')
 const Rational = require('./rational')
 const ChannelLayout = require('./channel-layout')
+const HWDeviceContext = require('./hw-device-context')
 const { codecConfig, optionFlags } = require('./constants')
 
 module.exports = class FFmpegCodecContext {
@@ -121,6 +122,14 @@ module.exports = class FFmpegCodecContext {
     binding.setCodecContextRequestSampleFormat(this._handle, sampleFormat)
   }
 
+  get hwDeviceCtx() {
+    return HWDeviceContext.from(binding.getCodecContextHWDeviceCtx(this._handle))
+  }
+
+  set hwDeviceCtx(hwDeviceContext) {
+    binding.setCodecContextHWDeviceCtx(this._handle, hwDeviceContext._handle)
+  }
+
   set getFormat(callback) {
     const wrap = (pixelFormats) => {
       return callback(this, pixelFormats)

package/lib/codec-parameters.js

@@ -201,6 +201,38 @@ module.exports = class FFmpegCodecParameters {
     binding.setCodecParametersSeekPreroll(this._handle, value)
   }
 
+  get colorSpace() {
+    return binding.getCodecParametersColorSpace(this._handle)
+  }
+
+  set colorSpace(value) {
+    binding.setCodecParametersColorSpace(this._handle, value)
+  }
+
+  get colorPrimaries() {
+    return binding.getCodecParametersColorPrimaries(this._handle)
+  }
+
+  set colorPrimaries(value) {
+    binding.setCodecParametersColorPrimaries(this._handle, value)
+  }
+
+  get colorTRC() {
+    return binding.getCodecParametersColorTRC(this._handle)
+  }
+
+  set colorTRC(value) {
+    binding.setCodecParametersColorTRC(this._handle, value)
+  }
+
+  get colorRange() {
+    return binding.getCodecParametersColorRange(this._handle)
+  }
+
+  set colorRange(value) {
+    binding.setCodecParametersColorRange(this._handle, value)
+  }
+
   // Methods
 
   fromContext(context) {

package/lib/codec.js

@@ -51,6 +51,7 @@ 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

@@ -10,15 +10,28 @@ function makeTag(a, b, c, d) {
 module.exports = exports = {
   codecs: {
     MJPEG: binding.AV_CODEC_ID_MJPEG,
+    H264: binding.AV_CODEC_ID_H264,
+    AVC: binding.AV_CODEC_ID_H264, // Alias for H264
     AAC: binding.AV_CODEC_ID_AAC,
     OPUS: binding.AV_CODEC_ID_OPUS,
     AV1: binding.AV_CODEC_ID_AV1,
     FLAC: binding.AV_CODEC_ID_FLAC,
-    MP3: binding.AV_CODEC_ID_MP3
+    MP3: binding.AV_CODEC_ID_MP3,
+    H265: binding.AV_CODEC_ID_HEVC,
+    HEVC: binding.AV_CODEC_ID_HEVC,
+    VP8: binding.AV_CODEC_ID_VP8,
+    VP9: binding.AV_CODEC_ID_VP9,
+    VORBIS: binding.AV_CODEC_ID_VORBIS,
+    PCM_S16LE: binding.AV_CODEC_ID_PCM_S16LE,
+    PCM_S16BE: binding.AV_CODEC_ID_PCM_S16BE,
+    PCM_U8: binding.AV_CODEC_ID_PCM_U8,
+    PCM_ALAW: binding.AV_CODEC_ID_PCM_ALAW,
+    PCM_MULAW: binding.AV_CODEC_ID_PCM_MULAW
   },
   tags: {
     MJPEG: makeTag('M', 'J', 'P', 'G'),
     AV1: makeTag('A', 'V', '0', '1'),
+    H264: makeTag('H', '2', '6', '4'),
     AAC: 0x00ff,
     FLAC: 0xf1ac,
     MP3: 0x0055
@@ -209,6 +222,86 @@ module.exports = exports = {
     ALLOW_NULL: binding.AV_OPT_ALLOW_NULL,
     ARRAY_REPLACE: binding.AV_OPT_ARRAY_REPLACE,
     MULTI_COMPONENT_RANGE: binding.AV_OPT_MULTI_COMPONENT_RANGE
+  },
+  hwDeviceTypes: {
+    VIDEOTOOLBOX: binding.AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
+    CUDA: binding.AV_HWDEVICE_TYPE_CUDA,
+    VAAPI: binding.AV_HWDEVICE_TYPE_VAAPI,
+    DXVA2: binding.AV_HWDEVICE_TYPE_DXVA2,
+    QSV: binding.AV_HWDEVICE_TYPE_QSV,
+    D3D11VA: binding.AV_HWDEVICE_TYPE_D3D11VA
+  },
+  hwFrameMapFlags: {
+    NONE: 0,
+    READ: binding.AV_HWFRAME_MAP_READ,
+    WRITE: binding.AV_HWFRAME_MAP_WRITE,
+    OVERWRITE: binding.AV_HWFRAME_MAP_OVERWRITE,
+    DIRECT: binding.AV_HWFRAME_MAP_DIRECT
+  },
+  colorSpace: {
+    RGB: binding.AVCOL_SPC_RGB,
+    BT709: binding.AVCOL_SPC_BT709,
+    UNSPECIFIED: binding.AVCOL_SPC_UNSPECIFIED,
+    RESERVED: binding.AVCOL_SPC_RESERVED,
+    FCC: binding.AVCOL_SPC_FCC,
+    BT470BG: binding.AVCOL_SPC_BT470BG,
+    SMPTE170M: binding.AVCOL_SPC_SMPTE170M,
+    SMPTE240M: binding.AVCOL_SPC_SMPTE240M,
+    YCGCO: binding.AVCOL_SPC_YCGCO,
+    YCOCG: binding.AVCOL_SPC_YCOCG,
+    BT2020_NCL: binding.AVCOL_SPC_BT2020_NCL,
+    BT2020_CL: binding.AVCOL_SPC_BT2020_CL,
+    SMPTE2085: binding.AVCOL_SPC_SMPTE2085,
+    CHROMA_DERIVED_NCL: binding.AVCOL_SPC_CHROMA_DERIVED_NCL,
+    CHROMA_DERIVED_CL: binding.AVCOL_SPC_CHROMA_DERIVED_CL,
+    ICTCP: binding.AVCOL_SPC_ICTCP,
+    IPT_C2: binding.AVCOL_SPC_IPT_C2,
+    YCGCO_RE: binding.AVCOL_SPC_YCGCO_RE,
+    YCGCO_RO: binding.AVCOL_SPC_YCGCO_RO
+  },
+  colorRange: {
+    UNSPECIFIED: binding.AVCOL_RANGE_UNSPECIFIED,
+    MPEG: binding.AVCOL_RANGE_MPEG,
+    JPEG: binding.AVCOL_RANGE_JPEG
+  },
+  colorPrimaries: {
+    BT709: binding.AVCOL_PRI_BT709,
+    UNSPECIFIED: binding.AVCOL_PRI_UNSPECIFIED,
+    RESERVED: binding.AVCOL_PRI_RESERVED,
+    BT470M: binding.AVCOL_PRI_BT470M,
+    BT470BG: binding.AVCOL_PRI_BT470BG,
+    SMPTE170M: binding.AVCOL_PRI_SMPTE170M,
+    SMPTE240M: binding.AVCOL_PRI_SMPTE240M,
+    FILM: binding.AVCOL_PRI_FILM,
+    BT2020: binding.AVCOL_PRI_BT2020,
+    SMPTE428: binding.AVCOL_PRI_SMPTE428,
+    SMPTEST428_1: binding.AVCOL_PRI_SMPTEST428_1,
+    SMPTE431: binding.AVCOL_PRI_SMPTE431,
+    SMPTE432: binding.AVCOL_PRI_SMPTE432,
+    EBU3213: binding.AVCOL_PRI_EBU3213,
+    JEDEC_P22: binding.AVCOL_PRI_JEDEC_P22
+  },
+  colorTRC: {
+    BT709: binding.AVCOL_TRC_BT709,
+    UNSPECIFIED: binding.AVCOL_TRC_UNSPECIFIED,
+    RESERVED: binding.AVCOL_TRC_RESERVED,
+    GAMMA22: binding.AVCOL_TRC_GAMMA22,
+    GAMMA28: binding.AVCOL_TRC_GAMMA28,
+    SMPTE170M: binding.AVCOL_TRC_SMPTE170M,
+    SMPTE240M: binding.AVCOL_TRC_SMPTE240M,
+    LINEAR: binding.AVCOL_TRC_LINEAR,
+    LOG: binding.AVCOL_TRC_LOG,
+    LOG_SQRT: binding.AVCOL_TRC_LOG_SQRT,
+    IEC61966_2_4: binding.AVCOL_TRC_IEC61966_2_4,
+    BT1361_ECG: binding.AVCOL_TRC_BT1361_ECG,
+    IEC61966_2_1: binding.AVCOL_TRC_IEC61966_2_1,
+    BT2020_10: binding.AVCOL_TRC_BT2020_10,
+    BT2020_12: binding.AVCOL_TRC_BT2020_12,
+    SMPTE2084: binding.AVCOL_TRC_SMPTE2084,
+    SMPTEST2084: binding.AVCOL_TRC_SMPTEST2084,
+    SMPTE428: binding.AVCOL_TRC_SMPTE428,
+    SMPTEST428_1: binding.AVCOL_TRC_SMPTEST428_1,
+    ARIB_STD_B67: binding.AVCOL_TRC_ARIB_STD_B67
   }
 }
 
@@ -267,3 +360,27 @@ exports.getSampleFormatName = function (sampleFormat) {
 exports.getPixelFormatName = function (pixelFormat) {
   return binding.getPixelFormatNameByID(pixelFormat)
 }
+
+exports.getColorSpaceName = function (colorSpace) {
+  return binding.getColorSpaceNameByID(colorSpace)
+}
+
+exports.toColorSpace = function (name) {
+  return binding.getColorSpaceFromName(name)
+}
+
+exports.getColorPrimariesName = function (colorPrimaries) {
+  return binding.getColorPrimariesNameByID(colorPrimaries)
+}
+
+exports.toColorPrimaries = function (name) {
+  return binding.getColorPrimariesFromName(name)
+}
+
+exports.getColorTransferName = function (colorTransfer) {
+  return binding.getColorTransferNameByID(colorTransfer)
+}
+
+exports.toColorTransfer = function (name) {
+  return binding.getColorTransferFromName(name)
+}

package/lib/frame.js

@@ -1,6 +1,8 @@
 const binding = require('../binding')
 const ChannelLayout = require('./channel-layout')
+const HWFramesContext = require('./hw-frames-context')
 const Rational = require('./rational')
+const constants = require('./constants')
 
 module.exports = class FFmpegFrame {
   constructor() {
@@ -93,10 +95,27 @@ module.exports = class FFmpegFrame {
     binding.setFrameSampleRate(this._handle, value)
   }
 
+  get hwFramesCtx() {
+    const handle = binding.getFrameHWFramesCtx(this._handle)
+    return handle ? HWFramesContext.from(handle) : null
+  }
+
+  set hwFramesCtx(hwFramesContext) {
+    binding.setFrameHWFramesCtx(this._handle, hwFramesContext._handle)
+  }
+
   copyProperties(source) {
     binding.copyFrameProperties(this._handle, source._handle)
   }
 
+  transferData(destination) {
+    binding.transferFrameData(destination._handle, this._handle)
+  }
+
+  hwMap(destination, flags = constants.hwFrameMapFlags.NONE) {
+    binding.mapFrame(destination._handle, this._handle, flags)
+  }
+
   alloc() {
     binding.allocFrame(this._handle, 32)
   }

package/lib/hw-device-context.js

@@ -0,0 +1,31 @@
+const binding = require('../binding')
+
+module.exports = class HWDeviceContext {
+  constructor(type, device = undefined, handle = undefined) {
+    if (handle) {
+      this._handle = handle
+    } else {
+      this._handle = binding.initHWDeviceContext(type, device)
+    }
+  }
+
+  static from(handle) {
+    if (handle == null) return null
+    return new HWDeviceContext(null, undefined, handle)
+  }
+
+  destroy() {
+    binding.destroyHWDeviceContext(this._handle)
+    this._handle = null
+  }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
+
+  [Symbol.for('bare.inspect')]() {
+    return {
+      __proto__: { constructor: HWDeviceContext }
+    }
+  }
+}

package/lib/hw-frames-constraints.js

@@ -0,0 +1,54 @@
+const binding = require('../binding')
+
+module.exports = class HWFramesConstraints {
+  constructor(handle) {
+    this._handle = handle
+  }
+
+  get validSwFormats() {
+    return binding.getHWFramesConstraintsValidSwFormats(this._handle)
+  }
+
+  get validHwFormats() {
+    return binding.getHWFramesConstraintsValidHwFormats(this._handle)
+  }
+
+  get minWidth() {
+    return binding.getHWFramesConstraintsMinWidth(this._handle)
+  }
+
+  get maxWidth() {
+    return binding.getHWFramesConstraintsMaxWidth(this._handle)
+  }
+
+  get minHeight() {
+    return binding.getHWFramesConstraintsMinHeight(this._handle)
+  }
+
+  get maxHeight() {
+    return binding.getHWFramesConstraintsMaxHeight(this._handle)
+  }
+
+  // Note: HWFramesConstraints is independently allocated by FFmpeg and must be
+  // explicitly freed. It is not owned by HWFramesContext.
+  destroy() {
+    binding.destroyHWFramesConstraints(this._handle)
+    this._handle = null
+  }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
+
+  [Symbol.for('bare.inspect')]() {
+    return {
+      __proto__: { constructor: HWFramesConstraints },
+      validSwFormats: this.validSwFormats,
+      validHwFormats: this.validHwFormats,
+      minWidth: this.minWidth,
+      maxWidth: this.maxWidth,
+      minHeight: this.minHeight,
+      maxHeight: this.maxHeight
+    }
+  }
+}

package/lib/hw-frames-context.js

@@ -0,0 +1,92 @@
+const binding = require('../binding')
+const HWFramesConstraints = require('./hw-frames-constraints')
+
+module.exports = class HWFramesContext {
+  constructor(hwDeviceContext, format, swFormat, width, height, handle = undefined) {
+    if (handle) {
+      this._handle = handle
+      return
+    }
+
+    this._handle = binding.initHWFramesContext(
+      hwDeviceContext._handle,
+      format,
+      swFormat,
+      width,
+      height
+    )
+  }
+
+  static from(handle) {
+    if (handle == null) return null
+    return new HWFramesContext(null, null, null, null, null, handle)
+  }
+
+  get format() {
+    return binding.getHWFramesContextFormat(this._handle)
+  }
+
+  set format(value) {
+    binding.setHWFramesContextFormat(this._handle, value)
+  }
+
+  get swFormat() {
+    return binding.getHWFramesContextSWFormat(this._handle)
+  }
+
+  set swFormat(value) {
+    binding.setHWFramesContextSWFormat(this._handle, value)
+  }
+
+  get width() {
+    return binding.getHWFramesContextWidth(this._handle)
+  }
+
+  set width(value) {
+    binding.setHWFramesContextWidth(this._handle, value)
+  }
+
+  get height() {
+    return binding.getHWFramesContextHeight(this._handle)
+  }
+
+  set height(value) {
+    binding.setHWFramesContextHeight(this._handle, value)
+  }
+
+  get initialPoolSize() {
+    return binding.getHWFramesContextInitialPoolSize(this._handle)
+  }
+
+  set initialPoolSize(value) {
+    binding.setHWFramesContextInitialPoolSize(this._handle, value)
+  }
+
+  getBuffer(frame) {
+    binding.getHWFramesContextBuffer(this._handle, frame._handle)
+  }
+
+  getConstraints() {
+    const handle = binding.getHWFramesContextConstraints(this._handle)
+    return new HWFramesConstraints(handle)
+  }
+
+  destroy() {
+    binding.destroyHWFramesContext(this._handle)
+    this._handle = null
+  }
+
+  [Symbol.dispose]() {
+    this.destroy()
+  }
+
+  [Symbol.for('bare.inspect')]() {
+    return {
+      __proto__: { constructor: HWFramesContext },
+      format: this.format,
+      swFormat: this.swFormat,
+      width: this.width,
+      height: this.height
+    }
+  }
+}

package/package.json

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