@mediabunny/server 1.54.0 → 1.55.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mediabunny/server",
   "author": "Vanilagy",
-  "version": "1.54.0",
+  "version": "1.55.2",
   "description": "Adds full video and audio decoder and encoder support to Mediabunny for use in server-side environments (Node, Bun, Deno). Based on NodeAV.",
   "main": "./dist/bundles/mediabunny-server.cjs",
   "module": "./dist/bundles/mediabunny-server.mjs",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "node-av": "^6.0.0",
-    "@mediabunny/prores": "^1.54.0"
+    "@mediabunny/prores": "^1.55.2"
   },
   "peerDependencies": {
     "mediabunny": "^1.45.0"

package/src/audio-decoder.ts

@@ -25,7 +25,8 @@ export class NodeAvAudioDecoder extends CustomAudioDecoder {
 			|| codec === 'vorbis'
 			|| codec === 'flac'
 			|| codec === 'ac3'
-			|| codec === 'eac3';
+			|| codec === 'eac3'
+			|| codec === 'dts';
 	}
 
 	async init(): Promise<void> {

package/src/audio-encoder.ts

@@ -15,7 +15,7 @@ import {
 	EncodedPacket,
 } from 'mediabunny';
 import * as NodeAv from 'node-av';
-import { CODEC_TO_CODEC_ID, getChannelLayout } from './misc';
+import { CODEC_TO_CODEC_ID, getChannelLayout, getDtsChannelLayout } from './misc';
 import { assert, toUint8Array } from '../../../src/misc';
 import { copyAudioSampleToAvFrame, AvFrameAudioSampleResource } from './audio-sample';
 import {
@@ -23,6 +23,7 @@ import {
 	buildAdtsHeaderTemplate,
 	parseAacAudioSpecificConfig,
 } from '../../../shared/aac-misc';
+import { DTS_CHANNEL_COUNTS, DTS_SAMPLE_RATES, dtsBitrateFits } from '../../../shared/dts-misc';
 
 const AAC_SAMPLE_RATES
 	= [96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350];
@@ -72,6 +73,10 @@ export class NodeAvAudioEncoder extends CustomAudioEncoder {
 		) || (
 			codec === 'eac3' && numberOfChannels >= 1 && numberOfChannels <= 16
 			&& AC3_SAMPLE_RATES.includes(sampleRate)
+		) || (
+			codec === 'dts' && DTS_CHANNEL_COUNTS.includes(numberOfChannels)
+			&& DTS_SAMPLE_RATES.includes(sampleRate)
+			&& dtsBitrateFits(resolveBitrate(config, codec), sampleRate, numberOfChannels)
 		);
 	}
 
@@ -107,21 +112,26 @@ export class NodeAvAudioEncoder extends CustomAudioEncoder {
 		}
 
 		codecContext.sampleRate = this.config.sampleRate;
-		codecContext.channelLayout = getChannelLayout(this.config.numberOfChannels);
+		codecContext.channelLayout = this.codec === 'dts'
+			? getDtsChannelLayout(this.config.numberOfChannels)
+			: getChannelLayout(this.config.numberOfChannels);
 		codecContext.codecType = NodeAv.AVMEDIA_TYPE_AUDIO;
 		codecContext.codecId = CODEC_TO_CODEC_ID[this.codec]!;
 		codecContext.sampleFormat = sampleFormat;
 		codecContext.timeBase = new NodeAv.Rational(1, this.config.sampleRate);
-		codecContext.bitRate = BigInt(
-			this.config.bitrate ?? new Quality('medium')._toAudioBitrate(this.codec) ?? 0,
-		);
+		codecContext.bitRate = BigInt(resolveBitrate(this.config, this.codec));
 
 		if (this.config.bitrateMode === 'constant') {
 			codecContext.rcMinRate = codecContext.bitRate;
 			codecContext.rcMaxRate = codecContext.bitRate;
 		}
 
-		const ret = await codecContext.open2();
+		// libav's DTS encoder is marked experimental, so it refuses to open at the default compliance level
+		const options = this.codec === 'dts'
+			? NodeAv.Dictionary.fromObject({ strict: -2 })
+			: null;
+
+		const ret = await codecContext.open2(this.avCodec, options);
 		NodeAv.FFmpegError.throwIfError(ret, 'Open codec context');
 
 		this.codecContext = codecContext;
@@ -172,7 +182,9 @@ export class NodeAvAudioEncoder extends CustomAudioEncoder {
 				this.resampler = new NodeAv.SoftwareResampleContext();
 				this.resamplerInputSampleRate = this.frame.sampleRate;
 
-				const outLayout = getChannelLayout(this.codecContext.channels);
+				// Resample straight to whatever layout the encoder was opened with, since not every codec accepts
+				// the layout that getChannelLayout hands out for a given channel count
+				const outLayout = this.codecContext.channelLayout;
 				const inLayout = getChannelLayout(this.frame.channels);
 
 				const ret = this.resampler.allocSetOpts2(
@@ -400,3 +412,7 @@ export class NodeAvAudioEncoder extends CustomAudioEncoder {
 		this.resampler?.free();
 	}
 }
+
+const resolveBitrate = (config: AudioEncoderConfig, codec: AudioCodec) => {
+	return config.bitrate ?? new Quality('medium')._toAudioBitrate(codec) ?? 0;
+};

package/src/misc.ts

@@ -25,6 +25,7 @@ export const CODEC_TO_CODEC_ID: Partial<Record<MediaCodec, NodeAv.AVCodecID>> =
 	flac: NodeAv.AV_CODEC_ID_FLAC,
 	ac3: NodeAv.AV_CODEC_ID_AC3,
 	eac3: NodeAv.AV_CODEC_ID_EAC3,
+	dts: NodeAv.AV_CODEC_ID_DTS,
 };
 
 let cachedHardwareContext: NodeAv.HardwareContext | null | undefined = undefined;
@@ -267,3 +268,21 @@ export const getChannelLayout = (numChannels: number): NodeAv.ChannelLayout => {
 		default: return { nbChannels: numChannels, order: NodeAv.AV_CHANNEL_ORDER_UNSPEC, mask: 0n };
 	}
 };
+
+/** FL + FR + SL + SR, which libav has no constant for. */
+const QUAD_SIDE_MASK = 0x603n;
+
+/**
+ * DTS insists on the side-based surround layouts and rejects the back-based ones that {@link getChannelLayout}
+ * hands out, so it gets its own mapping.
+ */
+export const getDtsChannelLayout = (numChannels: number): NodeAv.ChannelLayout => {
+	switch (numChannels) {
+		case 1: return NodeAv.AV_CHANNEL_LAYOUT_MONO;
+		case 2: return NodeAv.AV_CHANNEL_LAYOUT_STEREO;
+		case 4: return { nbChannels: 4, order: NodeAv.AV_CHANNEL_ORDER_NATIVE, mask: QUAD_SIDE_MASK };
+		case 5: return NodeAv.AV_CHANNEL_LAYOUT_5POINT0;
+		case 6: return NodeAv.AV_CHANNEL_LAYOUT_5POINT1;
+		default: return { nbChannels: numChannels, order: NodeAv.AV_CHANNEL_ORDER_UNSPEC, mask: 0n };
+	}
+};