@mediabunny/server 1.45.4 → 1.46.0

package/dist/modules/src/audio-decoder.js

@@ -47,6 +47,10 @@ const misc_1 = require("./misc");
 const misc_2 = require("../../../src/misc");
 const audio_sample_1 = require("./audio-sample");
 class NodeAvAudioDecoder extends mediabunny_1.CustomAudioDecoder {
+    constructor() {
+        super(...arguments);
+        this.codecContext = null;
+    }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     static supports(codec, config) {
         return codec === 'aac'
@@ -83,6 +87,7 @@ class NodeAvAudioDecoder extends mediabunny_1.CustomAudioDecoder {
         this.codecContext = codecContext;
     }
     async decode(packet) {
+        (0, misc_2.assert)(this.codecContext);
         this.packet.isKeyframe = packet.type === 'key';
         this.packet.data = Buffer.from(packet.data);
         this.packet.timeBase = { num: 1, den: this.config.sampleRate };
@@ -91,6 +96,7 @@ class NodeAvAudioDecoder extends mediabunny_1.CustomAudioDecoder {
         this.packet.duration = BigInt(Math.round(packet.duration * this.config.sampleRate));
         const ret = await this.codecContext.sendPacket(this.packet);
         NodeAv.FFmpegError.throwIfError(ret, 'Send packet');
+        this.packet.unref(); // Don't need the data again, so just unref it
         while (true) {
             const receiveRet = await this.codecContext.receiveFrame(this.frame);
             if (receiveRet === NodeAv.AVERROR_EAGAIN || receiveRet === NodeAv.AVERROR_EOF) {
@@ -109,6 +115,7 @@ class NodeAvAudioDecoder extends mediabunny_1.CustomAudioDecoder {
         this.onSample(new mediabunny_1.AudioSample(new audio_sample_1.AvFrameAudioSampleResource(clone)));
     }
     async flush() {
+        (0, misc_2.assert)(this.codecContext);
         // Send null packet to signal flush
         const ret = await this.codecContext.sendPacket(null);
         NodeAv.FFmpegError.throwIfError(ret, 'Flush decoder');
@@ -124,7 +131,7 @@ class NodeAvAudioDecoder extends mediabunny_1.CustomAudioDecoder {
         this.codecContext.flushBuffers();
     }
     close() {
-        this.codecContext.freeContext();
+        this.codecContext?.freeContext();
         this.frame.free();
         this.packet.free();
     }

package/dist/modules/src/audio-encoder.d.ts

@@ -11,15 +11,15 @@ import { AdtsHeaderTemplate } from '../../../shared/aac-misc';
 export declare class NodeAvAudioEncoder extends CustomAudioEncoder {
     frame: NodeAv.Frame;
     packet: NodeAv.Packet;
-    avCodec: NodeAv.Codec;
     codecContext: NodeAv.CodecContext | null;
+    resampler: NodeAv.SoftwareResampleContext | null;
+    dstFrame: NodeAv.Frame | null;
+    avCodec: NodeAv.Codec;
     firstExpectedTimestamp: number | null;
     outputTimestampOffset: number;
-    resampler: NodeAv.SoftwareResampleContext | null;
     inputParametersKey: string | null;
     resamplerInputSampleRate: number | null;
     nextResamplerPts: bigint | null;
-    dstFrame: NodeAv.Frame | null;
     packetEmitted: boolean;
     adtsHeaderTemplate: AdtsHeaderTemplate | null;
     static supports(codec: AudioCodec, config: AudioEncoderConfig): boolean;

package/dist/modules/src/audio-encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audio-encoder.d.ts","sourceRoot":"","sources":["../../../src/audio-encoder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACN,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,KAAK,YAAY,EAGjB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAIlC,OAAO,EACN,kBAAkB,EAGlB,MAAM,0BAA0B,CAAC;AAUlC,qBAAa,kBAAmB,SAAQ,kBAAkB;IACzD,KAAK,EAAG,MAAM,CAAC,KAAK,CAAC;IACrB,MAAM,EAAG,MAAM,CAAC,MAAM,CAAC;IACvB,OAAO,EAAG,MAAM,CAAC,KAAK,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC,YAAY,GAAG,IAAI,CAAQ;IAChD,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC7C,qBAAqB,SAAK;IAE1B,SAAS,EAAE,MAAM,CAAC,uBAAuB,GAAG,IAAI,CAAQ;IACxD,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAQ;IACzC,wBAAwB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC/C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAQ;IACvC,QAAQ,EAAE,MAAM,CAAC,KAAK,GAAG,IAAI,CAAQ;IACrC,aAAa,UAAS;IACtB,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;WAErC,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO;IA2B1E,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBrB,kBAAkB;IA+BlB,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA6E/C,mBAAmB;IAuBnB,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,IAAI;IAgB3D,aAAa,CAAC,GAAG,EAAE,MAAM;IAsGnB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C5B,KAAK,IAAI,YAAY,CAAC,IAAI,CAAC;CAO3B"}
+{"version":3,"file":"audio-encoder.d.ts","sourceRoot":"","sources":["../../../src/audio-encoder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACN,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,KAAK,YAAY,EAGjB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAIlC,OAAO,EACN,kBAAkB,EAGlB,MAAM,0BAA0B,CAAC;AAUlC,qBAAa,kBAAmB,SAAQ,kBAAkB;IACzD,KAAK,EAAG,MAAM,CAAC,KAAK,CAAC;IACrB,MAAM,EAAG,MAAM,CAAC,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC,YAAY,GAAG,IAAI,CAAQ;IAChD,SAAS,EAAE,MAAM,CAAC,uBAAuB,GAAG,IAAI,CAAQ;IACxD,QAAQ,EAAE,MAAM,CAAC,KAAK,GAAG,IAAI,CAAQ;IACrC,OAAO,EAAG,MAAM,CAAC,KAAK,CAAC;IACvB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC7C,qBAAqB,SAAK;IAE1B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAQ;IACzC,wBAAwB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC/C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAQ;IACvC,aAAa,UAAS;IACtB,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;WAErC,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO;IA2B1E,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBrB,kBAAkB;IA+BlB,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAiF/C,mBAAmB;IAuBnB,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,IAAI;IAgB3D,aAAa,CAAC,GAAG,EAAE,MAAM;IAsGnB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C5B,KAAK,IAAI,YAAY,CAAC,IAAI,CAAC;CAO3B"}

package/dist/modules/src/audio-encoder.js

@@ -56,13 +56,13 @@ class NodeAvAudioEncoder extends mediabunny_1.CustomAudioEncoder {
     constructor() {
         super(...arguments);
         this.codecContext = null;
+        this.resampler = null;
+        this.dstFrame = null;
         this.firstExpectedTimestamp = null;
         this.outputTimestampOffset = 0;
-        this.resampler = null;
         this.inputParametersKey = null;
         this.resamplerInputSampleRate = null;
         this.nextResamplerPts = null;
-        this.dstFrame = null;
         this.packetEmitted = false;
         this.adtsHeaderTemplate = null;
     }
@@ -122,6 +122,10 @@ class NodeAvAudioEncoder extends mediabunny_1.CustomAudioEncoder {
         }
         this.firstExpectedTimestamp ??= audioSample.timestamp;
         if (audioSample._data instanceof audio_sample_1.AvFrameAudioSampleResource) {
+            // Release any buffers still referenced from the previous encode before reffing the new frame, otherwise
+            // av_frame_ref leaks them
+            // https://github.com/Vanilagy/mediabunny/issues/392
+            this.frame.unref();
             this.frame.ref(audioSample._data.frame);
         }
         else {

package/dist/modules/src/audio-sample.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audio-sample.d.ts","sourceRoot":"","sources":["../../../src/audio-sample.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAIlC;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,SAAQ,mBAAmB;IAIlE;;;OAGG;IACH,IAAI,KAAK,iBAMR;gBAEW,KAAK,EAAE,MAAM,CAAC,KAAK;IAU/B,SAAS,IAAI,iBAAiB;IAU9B,aAAa,IAAI,MAAM;IAIvB,mBAAmB,IAAI,MAAM;IAI7B,iBAAiB,IAAI,MAAM;IAI3B,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,IAAI;IAKb,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU;CAI5C;AAED,eAAO,MAAM,wBAAwB,GAAI,QAAQ,WAAW,EAAE,OAAO,MAAM,CAAC,KAAK,SAYhF,CAAC"}
+{"version":3,"file":"audio-sample.d.ts","sourceRoot":"","sources":["../../../src/audio-sample.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAIlC;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,SAAQ,mBAAmB;IAIlE;;;OAGG;IACH,IAAI,KAAK,iBAMR;gBAEW,KAAK,EAAE,MAAM,CAAC,KAAK;IAa/B,SAAS,IAAI,iBAAiB;IAU9B,aAAa,IAAI,MAAM;IAIvB,mBAAmB,IAAI,MAAM;IAI7B,iBAAiB,IAAI,MAAM;IAI3B,YAAY,IAAI,MAAM;IAItB,KAAK,IAAI,IAAI;IAKb,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU;CAI5C;AAED,eAAO,MAAM,wBAAwB,GAAI,QAAQ,WAAW,EAAE,OAAO,MAAM,CAAC,KAAK,SAYhF,CAAC"}

package/dist/modules/src/audio-sample.js

@@ -70,6 +70,9 @@ class AvFrameAudioSampleResource extends mediabunny_1.AudioSampleResource {
     }
     constructor(frame) {
         super();
+        if (!(frame instanceof NodeAv.Frame)) {
+            throw new TypeError('frame must be a NodeAv.Frame.');
+        }
         if (frame.getMediaType() !== NodeAv.AVMEDIA_TYPE_AUDIO) {
             throw new Error('AvFrameAudioSampleResource must be initialized with an audio frame.');
         }

package/dist/modules/src/index.d.ts

@@ -5,8 +5,24 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-import { AudioSample, VideoSample } from 'mediabunny';
+import { AudioSample, MaybePromise, VideoSample } from 'mediabunny';
 import * as NodeAv from 'node-av';
+/**
+ * Options for configuring Mediabunny's server-side polyfills.
+ * @group \@mediabunny/server
+ * @public
+ */
+type MediabunnyServerOptions = {
+    /**
+     * The hardware context to use for hardware-accelerated decoding and encoding. When set to a
+     * `NodeAv.HardwareContext`, that context is used directly. When set to a function, the function is invoked (with
+     * no caching) every time a hardware decoder or encoder codec is resolved, receiving the codec ID and returning the
+     * context to use for it (or `null` for no hardware acceleration).
+     *
+     * When not set, a context is automatically detected on first use and then cached.
+     */
+    hardwareContext?: NodeAv.HardwareContext | null | ((codecId: NodeAv.AVCodecID) => MaybePromise<NodeAv.HardwareContext | null>);
+};
 /**
  * Registers video and audio decoders and encoders for all codecs, using FFmpeg's libavcodec under the hood.
  * Additionally, a custom `VideoSample` transformer based on libavfilter is registered to enable resizing, rotation and
@@ -17,10 +33,13 @@ import * as NodeAv from 'node-av';
  * The decoders and encoders will automatically detect hardware acceleration support for each codec and platform and
  * make use of it if applicable.
  *
+ * You can pass optional {@link MediabunnyServerOptions} for additional configuration.
+ *
  * @group \@mediabunny/server
  * @public
  */
-export declare const registerMediabunnyServer: () => void;
+export declare const registerMediabunnyServer: (options?: MediabunnyServerOptions) => void;
+export type { MediabunnyServerOptions };
 export { AvFrameVideoSampleResource } from './video-sample';
 export { AvFrameAudioSampleResource } from './audio-sample';
 /**

package/dist/modules/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,WAAW,EAAoE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxH,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAqBlC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,wBAAwB,YAiBpC,CAAC;AAEF,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAE5D;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,SAAS,GAAU,QAAQ,WAAW,GAAG,WAAW,EAAE,OAAO,MAAM,CAAC,KAAK,kBA0BrF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACN,WAAW,EACX,YAAY,EAIZ,WAAW,EACX,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAqBlC;;;;GAIG;AACH,KAAK,uBAAuB,GAAG;IAC9B;;;;;;;OAOG;IACH,eAAe,CAAC,EACb,MAAM,CAAC,eAAe,GACtB,IAAI,GACJ,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,KAAK,YAAY,CAAC,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;CAChF,CAAC;AAKF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,wBAAwB,GAAI,UAAS,uBAA4B,SAiC7E,CAAC;AAEF,YAAY,EAAE,uBAAuB,EAAE,CAAC;AAExC,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAE5D;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,SAAS,GAAU,QAAQ,WAAW,GAAG,WAAW,EAAE,OAAO,MAAM,CAAC,KAAK,kBAqCrF,CAAC"}

package/dist/modules/src/index.js

@@ -40,7 +40,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toAvFrame = exports.AvFrameAudioSampleResource = exports.AvFrameVideoSampleResource = exports.registerMediabunnyServer = void 0;
+exports.toAvFrame = exports.AvFrameAudioSampleResource = exports.AvFrameVideoSampleResource = exports.registerMediabunnyServer = exports._serverOptions = void 0;
 const mediabunny_1 = require("mediabunny");
 const NodeAv = __importStar(require("node-av"));
 const video_decoder_1 = require("./video-decoder");
@@ -58,6 +58,8 @@ if (globalThis[SERVER_LOADED_SYMBOL]) {
 }
 globalThis[SERVER_LOADED_SYMBOL] = true;
 let registered = false;
+/** @internal */
+exports._serverOptions = {};
 /**
  * Registers video and audio decoders and encoders for all codecs, using FFmpeg's libavcodec under the hood.
  * Additionally, a custom `VideoSample` transformer based on libavfilter is registered to enable resizing, rotation and
@@ -68,14 +70,24 @@ let registered = false;
  * The decoders and encoders will automatically detect hardware acceleration support for each codec and platform and
  * make use of it if applicable.
  *
+ * You can pass optional {@link MediabunnyServerOptions} for additional configuration.
+ *
  * @group \@mediabunny/server
  * @public
  */
-const registerMediabunnyServer = () => {
+const registerMediabunnyServer = (options = {}) => {
+    if (typeof options !== 'object' || !options) {
+        throw new TypeError('options must be an object.');
+    }
+    if (options.hardwareContext != null
+        && !(options.hardwareContext instanceof NodeAv.HardwareContext || typeof options.hardwareContext === 'function')) {
+        throw new TypeError('options.hardwareContext, when provided, must be a NodeAv.HardwareContext, a function, or null.');
+    }
     if (registered) {
         return;
     }
     registered = true;
+    exports._serverOptions = options;
     NodeAv.Log.setLevel(NodeAv.AV_LOG_ERROR);
     // Video
     (0, mediabunny_1.registerDecoder)(video_decoder_1.NodeAvVideoDecoder);
@@ -103,8 +115,16 @@ Object.defineProperty(exports, "AvFrameAudioSampleResource", { enumerable: true,
  * @public
  */
 const toAvFrame = async (sample, frame) => {
+    if (!(sample instanceof mediabunny_1.VideoSample) && !(sample instanceof mediabunny_1.AudioSample)) {
+        throw new TypeError('sample must be a VideoSample or an AudioSample.');
+    }
+    if (!(frame instanceof NodeAv.Frame)) {
+        throw new TypeError('frame must be a NodeAv.Frame.');
+    }
     if (sample instanceof mediabunny_1.VideoSample) {
         if (sample._data instanceof video_sample_1.AvFrameVideoSampleResource) {
+            // We're overriding the frame, so release whatever it referenced before, otherwise av_frame_ref leaks it
+            frame.unref();
             frame.ref(sample._data.frame);
         }
         else {
@@ -119,6 +139,8 @@ const toAvFrame = async (sample, frame) => {
     }
     else {
         if (sample._data instanceof audio_sample_1.AvFrameAudioSampleResource) {
+            // We're overriding the frame, so release whatever it referenced before, otherwise av_frame_ref leaks it
+            frame.unref();
             frame.ref(sample._data.frame);
         }
         else {

package/dist/modules/src/misc.d.ts

@@ -9,8 +9,8 @@ import { VideoSamplePixelFormat, MediaCodec } from 'mediabunny';
 import * as NodeAv from 'node-av';
 export declare const CODEC_TO_CODEC_ID: Partial<Record<MediaCodec, NodeAv.AVCodecID>>;
 export declare const getHardwareContext: () => NodeAv.HardwareContext | null;
-export declare const getHardwareDecoderCodec: (codecId: NodeAv.AVCodecID) => NodeAv.Codec | null;
-export declare const getHardwareEncoderCodec: (codecId: NodeAv.AVCodecID) => NodeAv.Codec | null;
+export declare const getHardwareDecoderCodec: (codecId: NodeAv.AVCodecID) => Promise<NodeAv.Codec | null>;
+export declare const getHardwareEncoderCodec: (codecId: NodeAv.AVCodecID) => Promise<NodeAv.Codec | null>;
 export declare const mapColorPrimaries: (primaries: string) => NodeAv.AVColorPrimaries | null;
 export declare const unmapColorPrimaries: (primaries: number) => "bt709" | "bt470bg" | "smpte170m" | "bt2020" | "smpte432" | null;
 export declare const mapTransferCharacteristics: (transfer: string) => NodeAv.AVColorTransferCharacteristic | null;

package/dist/modules/src/misc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../src/misc.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAElC,eAAO,MAAM,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,CAc3E,CAAC;AAGF,eAAO,MAAM,kBAAkB,QAAO,MAAM,CAAC,eAAe,GAAG,IAK9D,CAAC;AAGF,eAAO,MAAM,uBAAuB,GAAI,SAAS,MAAM,CAAC,SAAS,KAAG,MAAM,CAAC,KAAK,GAAG,IAMlF,CAAC;AAGF,eAAO,MAAM,uBAAuB,GAAI,SAAS,MAAM,CAAC,SAAS,KAAG,MAAM,CAAC,KAAK,GAAG,IAMlF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,WAAW,MAAM,mCAUlD,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,WAAW,MAAM,qEAUpD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,UAAU,MAAM,gDAW1D,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,UAAU,MAAM,4EAW5D,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,+BAUnD,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,QAAQ,MAAM,oEAUrD,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,mBAAmB,MAAM,CAAC,aAAa,KAAG,sBAAsB,GAAG,IAqChG,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,aAAa,sBAAsB,yBA+BlE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,oBAAoB,MAAM,CAAC,cAAc,KAAG,iBAAiB,GAAG,IAanG,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,cAAc,iBAAiB,KAAG,MAAM,CAAC,cAa9E,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,KAAG,MAAM,CAAC,aAS7D,CAAC"}
+{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../src/misc.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAGlC,eAAO,MAAM,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,CAc3E,CAAC;AAGF,eAAO,MAAM,kBAAkB,QAAO,MAAM,CAAC,eAAe,GAAG,IAU9D,CAAC;AAYF,eAAO,MAAM,uBAAuB,GAAU,SAAS,MAAM,CAAC,SAAS,KAAG,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAapG,CAAC;AAGF,eAAO,MAAM,uBAAuB,GAAU,SAAS,MAAM,CAAC,SAAS,KAAG,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAapG,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,WAAW,MAAM,mCAUlD,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,WAAW,MAAM,qEAUpD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,UAAU,MAAM,gDAW1D,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,UAAU,MAAM,4EAW5D,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,+BAUnD,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,QAAQ,MAAM,oEAUrD,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,mBAAmB,MAAM,CAAC,aAAa,KAAG,sBAAsB,GAAG,IAqChG,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,aAAa,sBAAsB,yBA+BlE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,oBAAoB,MAAM,CAAC,cAAc,KAAG,iBAAiB,GAAG,IAanG,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,cAAc,iBAAiB,KAAG,MAAM,CAAC,cAa9E,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,KAAG,MAAM,CAAC,aAS7D,CAAC"}

package/dist/modules/src/misc.js

@@ -42,6 +42,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChannelLayout = exports.fromAudioSampleFormat = exports.toAudioSampleFormat = exports.fromPixelFormat = exports.toPixelFormat = exports.unmapMatrixCoefficients = exports.mapMatrixCoefficients = exports.unmapTransferCharacteristics = exports.mapTransferCharacteristics = exports.unmapColorPrimaries = exports.mapColorPrimaries = exports.getHardwareEncoderCodec = exports.getHardwareDecoderCodec = exports.getHardwareContext = exports.CODEC_TO_CODEC_ID = void 0;
 const NodeAv = __importStar(require("node-av"));
+const index_1 = require("./index");
 exports.CODEC_TO_CODEC_ID = {
     avc: NodeAv.AV_CODEC_ID_H264,
     hevc: NodeAv.AV_CODEC_ID_HEVC,
@@ -58,14 +59,29 @@ exports.CODEC_TO_CODEC_ID = {
 };
 let cachedHardwareContext = undefined;
 const getHardwareContext = () => {
+    if (index_1._serverOptions.hardwareContext !== undefined && typeof index_1._serverOptions.hardwareContext !== 'function') {
+        // Return the user-provided one
+        return index_1._serverOptions.hardwareContext;
+    }
     if (cachedHardwareContext === undefined) {
         cachedHardwareContext = NodeAv.HardwareContext.auto();
     }
     return cachedHardwareContext;
 };
 exports.getHardwareContext = getHardwareContext;
+const validateHwContext = (hw) => {
+    if (hw !== null && !(hw instanceof NodeAv.HardwareContext)) {
+        throw new TypeError('When serverOptions.hardwareContext is a function, it must return or resolve to a'
+            + ' NodeAv.HardwareContext or null.');
+    }
+};
 const hardwareDecoderCodecCache = new Map();
-const getHardwareDecoderCodec = (codecId) => {
+const getHardwareDecoderCodec = async (codecId) => {
+    if (typeof index_1._serverOptions.hardwareContext === 'function') {
+        const hw = await index_1._serverOptions.hardwareContext(codecId);
+        validateHwContext(hw);
+        return hw?.getDecoderCodec(codecId) ?? null;
+    }
     if (!hardwareDecoderCodecCache.has(codecId)) {
         const hw = (0, exports.getHardwareContext)();
         hardwareDecoderCodecCache.set(codecId, hw?.getDecoderCodec(codecId) ?? null);
@@ -74,7 +90,12 @@ const getHardwareDecoderCodec = (codecId) => {
 };
 exports.getHardwareDecoderCodec = getHardwareDecoderCodec;
 const hardwareEncoderCodecCache = new Map();
-const getHardwareEncoderCodec = (codecId) => {
+const getHardwareEncoderCodec = async (codecId) => {
+    if (typeof index_1._serverOptions.hardwareContext === 'function') {
+        const hw = await index_1._serverOptions.hardwareContext(codecId);
+        validateHwContext(hw);
+        return hw?.getEncoderCodec(codecId) ?? null;
+    }
     if (!hardwareEncoderCodecCache.has(codecId)) {
         const hw = (0, exports.getHardwareContext)();
         hardwareEncoderCodecCache.set(codecId, hw?.getEncoderCodec(codecId) ?? null);

package/dist/modules/src/video-decoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"video-decoder.d.ts","sourceRoot":"","sources":["../../../src/video-decoder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,aAAa,EAAe,KAAK,YAAY,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACrH,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAKlC,qBAAa,kBAAmB,SAAQ,kBAAkB;IACzD,KAAK,EAAG,MAAM,CAAC,KAAK,CAAC;IACrB,MAAM,EAAG,MAAM,CAAC,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC,YAAY,GAAG,IAAI,CAAQ;IAChD,gBAAgB,EAAG,QAAQ,CAAC;IAG5B,cAAc,EAAE;QACf,oBAAoB,EAAE,MAAM,CAAC;QAC7B,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,eAAe,EAAE,OAAO,CAAC;KACzB,EAAE,CAAM;WAGO,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO;IAI1E,IAAI;IAOJ,gBAAgB,CAAC,MAAM,EAAE,aAAa;IAiDtC,MAAM,CAAC,MAAM,EAAE,aAAa;IAkElC,YAAY,CAAC,GAAG,EAAE,MAAM;IAuClB,KAAK;IAuBX,KAAK,IAAI,YAAY,CAAC,IAAI,CAAC;CAK3B"}
+{"version":3,"file":"video-decoder.d.ts","sourceRoot":"","sources":["../../../src/video-decoder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,aAAa,EAAe,KAAK,YAAY,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACrH,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAKlC,qBAAa,kBAAmB,SAAQ,kBAAkB;IACzD,KAAK,EAAG,MAAM,CAAC,KAAK,CAAC;IACrB,MAAM,EAAG,MAAM,CAAC,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC,YAAY,GAAG,IAAI,CAAQ;IAChD,gBAAgB,EAAG,QAAQ,CAAC;IAG5B,cAAc,EAAE;QACf,oBAAoB,EAAE,MAAM,CAAC;QAC7B,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,eAAe,EAAE,OAAO,CAAC;KACzB,EAAE,CAAM;WAGO,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO;IAI1E,IAAI;IAOJ,gBAAgB,CAAC,MAAM,EAAE,aAAa;IAiDtC,MAAM,CAAC,MAAM,EAAE,aAAa;IAqElC,YAAY,CAAC,GAAG,EAAE,MAAM;IAuClB,KAAK;IAuBX,KAAK,IAAI,YAAY,CAAC,IAAI,CAAC;CAK3B"}

package/dist/modules/src/video-decoder.js

@@ -82,7 +82,7 @@ class NodeAvVideoDecoder extends mediabunny_1.CustomVideoDecoder {
             codec = NodeAv.Codec.findDecoder(codecId);
         }
         else {
-            codec = (0, misc_1.getHardwareDecoderCodec)(codecId) ?? NodeAv.Codec.findDecoder(codecId);
+            codec = (await (0, misc_1.getHardwareDecoderCodec)(codecId)) ?? NodeAv.Codec.findDecoder(codecId);
         }
         if (!codec) {
             throw new Error(`Unable to obtain libav codec for '${this.codec}'.`);
@@ -108,8 +108,8 @@ class NodeAvVideoDecoder extends mediabunny_1.CustomVideoDecoder {
     async decode(packet) {
         if (this.codecContext === null) {
             await this.initCodecContext(packet);
-            (0, misc_2.assert)(this.codecContext);
         }
+        (0, misc_2.assert)(this.codecContext);
         this.packet.isKeyframe = packet.type === 'key';
         this.packet.data = Buffer.from(packet.data);
         this.packet.timeBase = { num: 1, den: 1e6 };
@@ -151,6 +151,7 @@ class NodeAvVideoDecoder extends mediabunny_1.CustomVideoDecoder {
         }
         const ret = await this.codecContext.sendPacket(this.packet);
         NodeAv.FFmpegError.throwIfError(ret, 'Send packet');
+        this.packet.unref(); // Don't need the data again, so just unref it
         while (true) {
             const receiveRet = await this.codecContext.receiveFrame(this.frame);
             if (receiveRet === NodeAv.AVERROR_EAGAIN || receiveRet === NodeAv.AVERROR_EOF) {

package/dist/modules/src/video-encoder.d.ts

@@ -10,13 +10,13 @@ import * as NodeAv from 'node-av';
 export declare class NodeAvVideoEncoder extends CustomVideoEncoder {
     frame: NodeAv.Frame;
     packet: NodeAv.Packet;
-    avCodec: NodeAv.Codec;
     codecContext: NodeAv.CodecContext | null;
+    scaler: NodeAv.SoftwareScaleContext | null;
+    dstFrame: NodeAv.Frame | null;
+    avCodec: NodeAv.Codec;
     lastBuffer: Buffer | null;
     packetEmitted: boolean;
-    scaler: NodeAv.SoftwareScaleContext | null;
     lastScalerKey: string | null;
-    dstFrame: NodeAv.Frame | null;
     preciseTimings: {
         microsecondTimestamp: number;
         timestamp: number;

package/dist/modules/src/video-encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"video-encoder.d.ts","sourceRoot":"","sources":["../../../src/video-encoder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACN,kBAAkB,EAClB,KAAK,YAAY,EAEjB,UAAU,EACV,WAAW,EAGX,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AA0BlC,qBAAa,kBAAmB,SAAQ,kBAAkB;IACzD,KAAK,EAAG,MAAM,CAAC,KAAK,CAAC;IACrB,MAAM,EAAG,MAAM,CAAC,MAAM,CAAC;IACvB,OAAO,EAAG,MAAM,CAAC,KAAK,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC,YAAY,GAAG,IAAI,CAAQ;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAQ;IACjC,aAAa,UAAS;IAEtB,MAAM,EAAE,MAAM,CAAC,oBAAoB,GAAG,IAAI,CAAQ;IAClD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAQ;IACpC,QAAQ,EAAE,MAAM,CAAC,KAAK,GAAG,IAAI,CAAQ;IAGrC,cAAc,EAAE;QACf,oBAAoB,EAAE,MAAM,CAAC;QAC7B,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,eAAe,EAAE,OAAO,CAAC;KACzB,EAAE,CAAM;WAEO,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO;IAK1E,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BrB,kBAAkB;IAoFlB,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoHzF,aAAa,CAAC,GAAG,EAAE,MAAM;IA4OnB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB5B,KAAK,IAAI,YAAY,CAAC,IAAI,CAAC;CAO3B"}
+{"version":3,"file":"video-encoder.d.ts","sourceRoot":"","sources":["../../../src/video-encoder.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACN,kBAAkB,EAClB,KAAK,YAAY,EAEjB,UAAU,EACV,WAAW,EAGX,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AA0BlC,qBAAa,kBAAmB,SAAQ,kBAAkB;IACzD,KAAK,EAAG,MAAM,CAAC,KAAK,CAAC;IACrB,MAAM,EAAG,MAAM,CAAC,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC,YAAY,GAAG,IAAI,CAAQ;IAChD,MAAM,EAAE,MAAM,CAAC,oBAAoB,GAAG,IAAI,CAAQ;IAClD,QAAQ,EAAE,MAAM,CAAC,KAAK,GAAG,IAAI,CAAQ;IACrC,OAAO,EAAG,MAAM,CAAC,KAAK,CAAC;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAQ;IACjC,aAAa,UAAS;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGpC,cAAc,EAAE;QACf,oBAAoB,EAAE,MAAM,CAAC;QAC7B,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,eAAe,EAAE,OAAO,CAAC;KACzB,EAAE,CAAM;WAEO,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO;IAK1E,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BrB,kBAAkB;IAoFlB,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwHzF,aAAa,CAAC,GAAG,EAAE,MAAM;IA0OnB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB5B,KAAK,IAAI,YAAY,CAAC,IAAI,CAAC;CAO3B"}

package/dist/modules/src/video-encoder.js

@@ -52,11 +52,11 @@ class NodeAvVideoEncoder extends mediabunny_1.CustomVideoEncoder {
     constructor() {
         super(...arguments);
         this.codecContext = null;
+        this.scaler = null;
+        this.dstFrame = null;
         this.lastBuffer = null;
         this.packetEmitted = false;
-        this.scaler = null;
         this.lastScalerKey = null;
-        this.dstFrame = null;
         // Bookkeeping to restore the original timing information
         this.preciseTimings = [];
     }
@@ -80,7 +80,7 @@ class NodeAvVideoEncoder extends mediabunny_1.CustomVideoEncoder {
             codec = NodeAv.Codec.findEncoder(codecId);
         }
         else {
-            codec = (0, misc_1.getHardwareEncoderCodec)(codecId) ?? NodeAv.Codec.findEncoder(codecId);
+            codec = (await (0, misc_1.getHardwareEncoderCodec)(codecId)) ?? NodeAv.Codec.findEncoder(codecId);
         }
         if (!codec) {
             throw new Error(`Unable to obtain libav codec for '${this.codec}'.`);
@@ -164,9 +164,13 @@ class NodeAvVideoEncoder extends mediabunny_1.CustomVideoEncoder {
     async encode(videoSample, options) {
         if (this.codecContext === null) {
             await this.createCodecContext();
-            (0, misc_2.assert)(this.codecContext);
         }
+        (0, misc_2.assert)(this.codecContext);
         if (videoSample._data instanceof video_sample_1.AvFrameVideoSampleResource) {
+            // Release any buffers still referenced from the previous encode before reffing the new frame, otherwise
+            // av_frame_ref leaks them
+            // https://github.com/Vanilagy/mediabunny/issues/392
+            this.frame.unref();
             this.frame.ref(videoSample._data.frame);
         }
         else {

package/dist/modules/src/video-sample.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"video-sample.d.ts","sourceRoot":"","sources":["../../../src/video-sample.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACN,KAAK,YAAY,EACjB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,WAAW,EACX,cAAc,EACd,oCAAoC,EACpC,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAqBlC;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,0BAA2B,SAAQ,mBAAmB;IAIlE;;;OAGG;IACH,IAAI,KAAK,iBAMR;gBAEW,KAAK,EAAE,MAAM,CAAC,KAAK;IAU/B,SAAS,IAAI,sBAAsB,GAAG,IAAI;IAI1C,aAAa,IAAI,MAAM;IAIvB,cAAc,IAAI,MAAM;IAIxB,mBAAmB,IAAI,MAAM;IAQ7B,oBAAoB,IAAI,MAAM;IAQ9B,aAAa,IAAI,qBAAqB;IActC,KAAK,IAAI,IAAI;IAKb,aAAa,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;IASzC,WAAW,CAChB,IAAI,EAAE,WAAW,CAAC,eAAe,EAAE,WAAW,CAAC,EAG/C,UAAU,EAAE,oBAAoB,GAC9B,OAAO,CAAC,WAAW,CAAC;CAiCvB;AAED,eAAO,MAAM,wBAAwB,GAAU,QAAQ,WAAW,EAAE,OAAO,MAAM,CAAC,KAAK,EAAE,YAAY,MAAM,GAAG,IAAI,qCA+BjH,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAChC,QAAQ,WAAW,EACnB,aAAa,oCAAoC,KAC/C,OAAO,CAAC,WAAW,GAAG,IAAI,CAkG5B,CAAC"}
+{"version":3,"file":"video-sample.d.ts","sourceRoot":"","sources":["../../../src/video-sample.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACN,KAAK,YAAY,EACjB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,WAAW,EACX,cAAc,EACd,oCAAoC,EACpC,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAqBlC;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,0BAA2B,SAAQ,mBAAmB;IAIlE;;;OAGG;IACH,IAAI,KAAK,iBAMR;gBAEW,KAAK,EAAE,MAAM,CAAC,KAAK;IAa/B,SAAS,IAAI,sBAAsB,GAAG,IAAI;IAI1C,aAAa,IAAI,MAAM;IAIvB,cAAc,IAAI,MAAM;IAIxB,mBAAmB,IAAI,MAAM;IAQ7B,oBAAoB,IAAI,MAAM;IAQ9B,aAAa,IAAI,qBAAqB;IActC,KAAK,IAAI,IAAI;IAKb,aAAa,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;IASzC,WAAW,CAChB,IAAI,EAAE,WAAW,CAAC,eAAe,EAAE,WAAW,CAAC,EAG/C,UAAU,EAAE,oBAAoB,GAC9B,OAAO,CAAC,WAAW,CAAC;CAiCvB;AAED,eAAO,MAAM,wBAAwB,GAAU,QAAQ,WAAW,EAAE,OAAO,MAAM,CAAC,KAAK,EAAE,YAAY,MAAM,GAAG,IAAI,qCA+BjH,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAChC,QAAQ,WAAW,EACnB,aAAa,oCAAoC,KAC/C,OAAO,CAAC,WAAW,GAAG,IAAI,CAkG5B,CAAC"}

package/dist/modules/src/video-sample.js

@@ -81,6 +81,9 @@ class AvFrameVideoSampleResource extends mediabunny_1.VideoSampleResource {
     }
     constructor(frame) {
         super();
+        if (!(frame instanceof NodeAv.Frame)) {
+            throw new TypeError('frame must be a NodeAv.Frame.');
+        }
         if (frame.getMediaType() !== NodeAv.AVMEDIA_TYPE_VIDEO) {
             throw new Error('AvFrameVideoSampleResource must be initialized with a video frame.');
         }