dasha 4.4.9 → 4.5.0

package/dist/index.d.mts

@@ -1,5 +1,4 @@
-import { AudioCodec as AudioCodec$1, DurationMetadataRequestOptions, EncodedPacket, FilePathSource, HLS, HLS_FORMATS, Input as Input$1, InputAudioTrack as InputAudioTrack$1, InputFormat, InputOptions, InputTrack as InputTrack$2, InputTrackQuery, InputTrackQuery as InputTrackQuery$1, InputVideoTrack as InputVideoTrack$1, MP3, MP4, MaybePromise, MaybePromise as MaybePromise$1, MediaCodec as MediaCodec$1, MetadataTags, PacketRetrievalOptions, PathedSource, Source, SourceRef, SubtitleCodec as SubtitleCodec$1, TrackDisposition, UrlSource, VideoCodec as VideoCodec$1, asc, desc, prefer } from "mediabunny";
-
+import { AudioCodec as AudioCodec$1, DurationMetadataRequestOptions, EncodedPacket, FilePathSource, HLS, HLS_FORMATS, Input as Input$1, InputAudioTrack as InputAudioTrack$1, InputFormat, InputOptions, InputTrack as InputTrack$2, InputTrackQuery, InputTrackQuery as InputTrackQuery$1, InputVideoTrack as InputVideoTrack$1, MP3, MP4, MaybePromise, MaybePromise as MaybePromise$1, MediaCodec as MediaCodec$1, MetadataTags, PacketRetrievalOptions, PathedSource, Source, SourceRef, SubtitleCodec as SubtitleCodec$1, TrackDisposition, TransformationMatrix, UrlSource, VideoCodec as VideoCodec$1, asc, desc, prefer } from "mediabunny";
 //#region src/mediabunny.d.ts
 type Segment$1 = {
   timestamp: number;
@@ -411,7 +410,7 @@ declare class DashInputVideoTrackBacking extends DashTrackBackingBase {
   getSquarePixelHeight(): number | Promise<any>;
   getMetadataDisplayWidth(): number | null;
   getMetadataDisplayHeight(): number | null;
-  getRotation(): number;
+  getTransformationMatrix(): TransformationMatrix;
   getColorSpace(): Promise<VideoColorSpaceInit>;
   canBeTransparent(): Promise<any>;
 }
@@ -435,13 +434,14 @@ declare class DashInputFormat extends InputFormat {
   _canReadInput(input: Input$1): Promise<boolean>;
   _createDemuxer(input: Input$1): DashDemuxer;
 }
-declare const DASH: DashInputFormat;
-declare const DASH_FORMATS: InputFormat[];
+export declare const DASH: DashInputFormat;
+export declare const DASH_FORMATS: InputFormat[];
 //#endregion
 //#region src/hls/hls-subtitles.d.ts
 type ReadResult = {
   bytes: Uint8Array;
-  view: DataView; /** The offset of the bytes in the file. */
+  view: DataView;
+  /** The offset of the bytes in the file. */
   offset: number;
 };
 type SourceWithRootPath = Source & {
@@ -600,6 +600,10 @@ type InputAudioTracksOptions = {
   formats?: readonly InputFormat[];
   pairWith?: InputAudioTrackPairing;
   sortBy?: InputTrackQuery$1<InputAudioTrack>['sortBy'];
+  /** Marks the imported tracks as audio description tracks. */
+  visuallyImpaired?: boolean;
+  /** Overrides the track name (e.g. "Audio Description" for tracks imported from a separate manifest). */
+  name?: string | null;
 };
 type SegmentableBacking = {
   getId(): number;
@@ -635,6 +639,8 @@ declare class ImportedAudioTrackBacking {
     id: number;
     number: number;
     source: Source;
+    visuallyImpaired?: boolean;
+    name?: string | null;
   });
   getType(): string;
   getId(): number;
@@ -645,7 +651,7 @@ declare class ImportedAudioTrackBacking {
   getLanguageCode(): string | Promise<string>;
   getTimeResolution(): number | Promise<number>;
   isRelativeToUnixEpoch(): boolean | Promise<boolean>;
-  getDisposition(): {};
+  getDisposition(): Record<string, boolean>;
   getPairingMask(): bigint;
   getSource(): Source;
   getBitrate(): number | Promise<number | null> | null;
@@ -664,7 +670,7 @@ declare class ImportedAudioTrackBacking {
   getNextKeyPacket(packet: EncodedPacket, options: unknown): Promise<EncodedPacket | null>;
   getSegmentedInput(): any;
 }
-declare const preserveSubtitleBackingsOnInput: (input: Input$1) => Input$1<Source>;
+export declare const preserveSubtitleBackingsOnInput: (input: Input$1) => Input$1<Source>;
 declare class SegmentedMediabunnyInput<S extends Source = Source> extends Input$1<S> {
   #private;
   _wrapBackingAsTrack(backing: TrackBacking): InputTrack$1;
@@ -684,12 +690,12 @@ declare class SegmentedMediabunnyInput<S extends Source = Source> extends Input$
 type DashaInputOptions<S extends Source = Source> = Omit<InputOptions<S>, 'formats'> & {
   formats: readonly InputFormat[];
 };
-type InputSegment = HlsSegment | DashSegment;
-type InputSegmentedInput = HlsSegmentedInput | DashSegmentedInput;
-declare class Input<S extends Source = Source> extends SegmentedMediabunnyInput<S> {
+export type InputSegment = HlsSegment | DashSegment;
+export type InputSegmentedInput = HlsSegmentedInput | DashSegmentedInput;
+export declare class Input<S extends Source = Source> extends SegmentedMediabunnyInput<S> {
   constructor(options: DashaInputOptions<S>);
 }
-declare const isInput: (value: unknown) => value is Input;
+export declare const isInput: (value: unknown) => value is Input;
 declare const ALL_FORMATS: InputFormat[];
 //#endregion
-export { ALL_FORMATS, type AudioCodec, DASH, DASH_FORMATS, type DashSegment, type DashSegmentedInput, FilePathSource, HLS, HLS_FORMATS, type HlsSegment, type HlsSegmentedInput, Input, type InputAudioSource, type InputAudioTrack, type InputAudioTrackPairing, type InputAudioTracksOptions, InputSegment, InputSegmentedInput, type InputSubtitleSource, type InputSubtitleTrack, type InputSubtitleTrackMetadata, type InputTrack$1 as InputTrack, type InputTrackQuery, type InputTrackWithBacking, type InputVideoTrack, MP3, MP4, type MaybePromise, type MediaCodec, type SubtitleCodec, UrlSource, type VideoCodec, type VideoDynamicRange, asc, desc, isInput, prefer, preserveSubtitleBackingsOnInput };
+export { ALL_FORMATS, type AudioCodec, type DashSegment, type DashSegmentedInput, FilePathSource, HLS, HLS_FORMATS, type HlsSegment, type HlsSegmentedInput, type InputAudioSource, type InputAudioTrack, type InputAudioTrackPairing, type InputAudioTracksOptions, type InputSubtitleSource, type InputSubtitleTrack, type InputSubtitleTrackMetadata, type InputTrack$1 as InputTrack, type InputTrackQuery, type InputTrackWithBacking, type InputVideoTrack, MP3, MP4, type MaybePromise, type MediaCodec, type SubtitleCodec, UrlSource, type VideoCodec, type VideoDynamicRange, asc, desc, prefer };

package/dist/index.mjs

@@ -164,20 +164,20 @@ const DOLBY_VISION_CODECS = [
 	"dvhe",
 	"dvh1"
 ];
-const COLOR_PRIMARIES_MAP = new Map([
+const COLOR_PRIMARIES_MAP = /* @__PURE__ */ new Map([
 	[PRIMARIES.BT_709, "bt709"],
 	[PRIMARIES.BT_601_625, "bt470bg"],
 	[PRIMARIES.BT_601_525, "smpte170m"],
 	[PRIMARIES.BT_2020_and_2100, "bt2020"],
 	[PRIMARIES.SMPTE_ST_2113_and_EG_4321, "smpte432"]
 ]);
-const TRANSFER_CHARACTERISTICS_MAP = new Map([
+const TRANSFER_CHARACTERISTICS_MAP = /* @__PURE__ */ new Map([
 	[TRANSFER.BT_709, "bt709"],
 	[TRANSFER.BT_601, "smpte170m"],
 	[TRANSFER.BT_2100_PQ, "pq"],
 	[TRANSFER.BT_2100_HLG, "hlg"]
 ]);
-const MATRIX_COEFFICIENTS_MAP = new Map([
+const MATRIX_COEFFICIENTS_MAP = /* @__PURE__ */ new Map([
 	[MATRIX.RGB, "rgb"],
 	[MATRIX.YCbCr_BT_709, "bt709"],
 	[MATRIX.YCbCr_BT_601_625, "bt470bg"],
@@ -339,7 +339,8 @@ const normalizeHeaders$1 = (headers) => {
 };
 const getSourceHeaders$1 = (source) => {
 	const requestHeaders = "_url" in source && source._url instanceof Request ? normalizeHeaders$1(source._url.headers) : {};
-	const optionHeaders = normalizeHeaders$1(("_options" in source && source._options && typeof source._options === "object" ? source._options : void 0)?.requestInit?.headers);
+	const options = "_options" in source && source._options && typeof source._options === "object" ? source._options : void 0;
+	const optionHeaders = normalizeHeaders$1(options?.requestInit?.headers);
 	return {
 		...requestHeaders,
 		...optionHeaders
@@ -373,7 +374,8 @@ const loadDashManifest = async (source) => {
 			};
 		}
 		if (resolvedManifestPath.startsWith("file:")) {
-			const text = await readFile(new URL(resolvedManifestPath), "utf8");
+			const filePath = new URL(resolvedManifestPath);
+			const text = await readFile(filePath, "utf8");
 			return {
 				text,
 				url: parseOriginalUrlFromManifest(text) ?? resolvedManifestPath
@@ -690,7 +692,8 @@ const detectSubtitleCodecFromUri = async (source, uri) => {
 			const segmentUri = joinHlsPath(loaded.path, line);
 			const fromSegmentPath = parseDetectedSubtitleCodec(inferSubtitleCodecStringFromPath(segmentUri));
 			if (fromSegmentPath) return fromSegmentPath;
-			const fromSegmentText = parseDetectedSubtitleCodec(sniffSubtitleCodecFromText((await loadPlaylistText(source, segmentUri)).text));
+			const loadedSegment = await loadPlaylistText(source, segmentUri);
+			const fromSegmentText = parseDetectedSubtitleCodec(sniffSubtitleCodecFromText(loadedSegment.text));
 			if (fromSegmentText) return fromSegmentText;
 			continue;
 		}
@@ -719,7 +722,7 @@ const parseMediaRange = (value) => {
 const parseHexIv = (value) => {
 	if (!IV_STRING_REGEX.test(value)) throw new Error(`Unsupported IV format '${value}'.`);
 	let hex = value.slice(2);
-	hex = hex.padStart(AES_128_BLOCK_SIZE * 2, "0");
+	hex = hex.padStart(32, "0");
 	const iv = new Uint8Array(AES_128_BLOCK_SIZE);
 	for (let index = 0; index < AES_128_BLOCK_SIZE; index++) {
 		const startIndex = index * 2;
@@ -1429,7 +1432,8 @@ const BASE_INPUT_PATCHED = Symbol.for("dasha.base-mediabunny-input-patched");
 const PRESERVE_SUBTITLE_BACKINGS = Symbol.for("dasha.preserve-subtitle-backings");
 const resolvedHlsSegmentLocations = /* @__PURE__ */ new WeakSet();
 const getDefaultAudioTrackFormats = (source) => {
-	return isLikelyDashPath(source instanceof SourceRef ? source.source : source) ? [DASH, ...ALL_FORMATS$1] : [...ALL_FORMATS$1, DASH];
+	const rawSource = source instanceof SourceRef ? source.source : source;
+	return isLikelyDashPath(rawSource) ? [DASH, ...ALL_FORMATS$1] : [...ALL_FORMATS$1, DASH];
 };
 var WholeResourceAudioSegmentedInput = class {
 	segments = [];
@@ -1465,12 +1469,16 @@ var ImportedAudioTrackBacking = class {
 	#id;
 	#number;
 	#source;
+	#visuallyImpaired;
+	#name;
 	#wholeResourceSegmentedInput;
 	constructor(params) {
 		this.#backing = params.backing;
 		this.#id = params.id;
 		this.#number = params.number;
 		this.#source = params.source;
+		this.#visuallyImpaired = params.visuallyImpaired;
+		this.#name = params.name;
 		this.#wholeResourceSegmentedInput = new WholeResourceAudioSegmentedInput(params.source);
 	}
 	getType() {
@@ -1489,7 +1497,7 @@ var ImportedAudioTrackBacking = class {
 		return this.#backing.getInternalCodecId?.() ?? null;
 	}
 	getName() {
-		return this.#backing.getName?.() ?? null;
+		return this.#name ?? this.#backing.getName?.() ?? null;
 	}
 	getLanguageCode() {
 		return this.#backing.getLanguageCode?.() ?? "und";
@@ -1501,7 +1509,12 @@ var ImportedAudioTrackBacking = class {
 		return this.#backing.isRelativeToUnixEpoch?.() ?? false;
 	}
 	getDisposition() {
-		return this.#backing.getDisposition?.() ?? {};
+		const disposition = this.#backing.getDisposition?.() ?? {};
+		if (this.#visuallyImpaired === void 0) return disposition;
+		return {
+			...disposition,
+			visuallyImpaired: this.#visuallyImpaired
+		};
 	}
 	getPairingMask() {
 		return 0n;
@@ -1561,7 +1574,8 @@ var ImportedAudioTrackBacking = class {
 };
 const getBackingType = (backing) => backing.getType?.();
 const queryWrappedTracks = (input, backings, query) => {
-	return queryTracks(backings.map((backing) => input._wrapBackingAsTrack(backing)), query);
+	const tracks = backings.map((backing) => input._wrapBackingAsTrack(backing));
+	return queryTracks(tracks, query);
 };
 const getTrackBackingsByType = async (input, type) => {
 	const nativeBackings = await input._getTrackBackings();
@@ -1615,7 +1629,8 @@ const getTrackMetadataOverrides = (backing) => backing[TRACK_METADATA_OVERRIDES]
 const ensureLanguageCodeOverridePatch = (backing) => {
 	const patchedBacking = backing;
 	if (patchedBacking[ORIGINAL_GET_LANGUAGE_CODE]) return patchedBacking;
-	patchedBacking[ORIGINAL_GET_LANGUAGE_CODE] = backing.getLanguageCode?.bind(backing) ?? (() => "und");
+	const originalGetLanguageCode = backing.getLanguageCode?.bind(backing) ?? (() => "und");
+	patchedBacking[ORIGINAL_GET_LANGUAGE_CODE] = originalGetLanguageCode;
 	Object.assign(backing, { getLanguageCode: () => getTrackMetadataOverrides(patchedBacking).languageCode ?? patchedBacking[ORIGINAL_GET_LANGUAGE_CODE]?.() ?? "und" });
 	return patchedBacking;
 };
@@ -1693,7 +1708,8 @@ var SegmentedMediabunnyInput = class SegmentedMediabunnyInput extends Input$1 {
 	#nextPairingBitIndex = null;
 	async #queryTracks(query, type) {
 		const internalInput = this;
-		return queryWrappedTracks(internalInput, await getTrackBackingsByType(internalInput, type), query);
+		const backings = await getTrackBackingsByType(internalInput, type);
+		return queryWrappedTracks(internalInput, backings, query);
 	}
 	_wrapBackingAsTrack(backing) {
 		const track = backing.getType?.() === "subtitle" ? this.#wrapSubtitleBacking(backing) : super._wrapBackingAsTrack(backing);
@@ -1783,7 +1799,9 @@ var SegmentedMediabunnyInput = class SegmentedMediabunnyInput extends Input$1 {
 				id: this.#nextCustomAudioTrackId++,
 				number: this.#nextCustomAudioTrackNumber++,
 				backing: getTrackBacking(audioTrack),
-				source: audioInput.source
+				source: audioInput.source,
+				visuallyImpaired: options.visuallyImpaired,
+				name: options.name
 			});
 			this.#pairAudioBacking(backing, pairWith);
 			this.#customAudioBackings.push(backing);
@@ -1856,7 +1874,8 @@ var SegmentedMediabunnyInput = class SegmentedMediabunnyInput extends Input$1 {
 		const patchedBacking = backing;
 		patchedBacking[EXTRA_PAIRING_MASK] = (patchedBacking[EXTRA_PAIRING_MASK] ?? 0n) | mask;
 		if (patchedBacking[ORIGINAL_GET_PAIRING_MASK]) return;
-		patchedBacking[ORIGINAL_GET_PAIRING_MASK] = backing.getPairingMask?.bind(backing) ?? (() => 0n);
+		const originalGetPairingMask = backing.getPairingMask?.bind(backing) ?? (() => 0n);
+		patchedBacking[ORIGINAL_GET_PAIRING_MASK] = originalGetPairingMask;
 		Object.assign(backing, { getPairingMask: () => (patchedBacking[ORIGINAL_GET_PAIRING_MASK]?.() ?? 0n) | (patchedBacking[EXTRA_PAIRING_MASK] ?? 0n) });
 	}
 	dispose() {
@@ -1869,6 +1888,7 @@ var SegmentedMediabunnyInput = class SegmentedMediabunnyInput extends Input$1 {
 //#endregion
 //#region src/dash/dash-segmented-input.ts
 const roundToDivisor = (value, multiple) => Math.round(value * multiple) / multiple;
+const isEncryptedSamplesError = (error) => error instanceof Error && error.message.startsWith("Encrypted media samples encountered");
 const binarySearchLessOrEqual = (array, value, getValue) => {
 	let left = 0;
 	let right = array.length - 1;
@@ -2133,7 +2153,12 @@ var DashSegmentedInput = class {
 		if (!firstSegment) return null;
 		const track = await this.getTrackForSegment(firstSegment);
 		if (!track) return null;
-		const packet = await track._backing.getFirstPacket(options);
+		let packet = null;
+		try {
+			packet = await track._backing.getFirstPacket(options);
+		} catch (error) {
+			if (!isEncryptedSamplesError(error)) throw error;
+		}
 		if (!packet) return null;
 		return this.createAdjustedPacket(packet, firstSegment, track);
 	}
@@ -2182,7 +2207,12 @@ var DashSegmentedInput = class {
 			}
 			const input = track.input;
 			const offsetTimestamp = timestamp - await this.getMediaOffset(currentSegment, input, track);
-			const packet = keyframesOnly ? await track._backing.getKeyPacket(offsetTimestamp, options) : await track._backing.getPacket(offsetTimestamp, options);
+			let packet = null;
+			try {
+				packet = keyframesOnly ? await track._backing.getKeyPacket(offsetTimestamp, options) : await track._backing.getPacket(offsetTimestamp, options);
+			} catch (error) {
+				if (!keyframesOnly || !isEncryptedSamplesError(error)) throw error;
+			}
 			if (!packet) {
 				currentSegment = await this.getPreviousSegment(currentSegment);
 				continue;
@@ -2198,7 +2228,7 @@ var DashSegmentedInput = class {
 };
 //#endregion
 //#region src/dash/dash-demuxer.ts
-const DASH_NAMESPACE_MAP = new Map([
+const DASH_NAMESPACE_MAP = /* @__PURE__ */ new Map([
 	["cenc", "urn:mpeg:cenc:2013"],
 	["mspr", "urn:microsoft:playready"],
 	["mas", "urn:marlin:mas:1-0:services:schemas:mpd"]
@@ -2222,7 +2252,8 @@ const replaceFirst = (source, oldValue, newValue) => {
 const processDashContent = (mpdContent) => {
 	const missingNamespaceKeys = Array.from(DASH_NAMESPACE_MAP.keys().filter((key) => isMissingNamespace(mpdContent, key)));
 	if (!missingNamespaceKeys.length) return mpdContent;
-	return replaceFirst(mpdContent, "<MPD ", `<MPD ${missingNamespaceKeys.map((key) => `xmlns:${key}="${DASH_NAMESPACE_MAP.get(key)}"`).join(" ")} `);
+	const missingNamespaceDefinitions = missingNamespaceKeys.map((key) => `xmlns:${key}="${DASH_NAMESPACE_MAP.get(key)}"`);
+	return replaceFirst(mpdContent, "<MPD ", `<MPD ${missingNamespaceDefinitions.join(" ")} `);
 };
 const getDashRefreshIntervalMs = (timeShiftBufferDepth) => Temporal.Duration.from(timeShiftBufferDepth).total("milliseconds") / 2;
 const getDisposition = (track) => ({
@@ -2335,7 +2366,8 @@ const getSegmentTimelineEntries = (timeline, timescale, limit) => {
 };
 const getRoleType = (roleValue) => {
 	const capitalize = (word) => word.charAt(0).toUpperCase() + word.slice(1);
-	return ROLE_TYPE[roleValue.split("-").map(capitalize).join("")];
+	const roleTypeKey = roleValue.split("-").map(capitalize).join("");
+	return ROLE_TYPE[roleTypeKey];
 };
 const getDashTrackName = (representation, adaptationSet) => representation.getAttribute("label") || representation.getAttribute("bitmovin:label") || adaptationSet.getAttribute("label") || adaptationSet.getAttribute("bitmovin:label");
 const createDashTrack = (params) => {
@@ -2981,8 +3013,18 @@ var DashInputVideoTrackBacking = class extends DashTrackBackingBase {
 	getMetadataDisplayHeight() {
 		return this.internalTrack.info.height;
 	}
-	getRotation() {
-		return 0;
+	getTransformationMatrix() {
+		return [
+			1,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			1
+		];
 	}
 	async getColorSpace() {
 		return this.internalTrack.track.colorSpace ?? this.delegate((track) => track.getColorSpace());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "4.4.9",
+  "version": "4.5.0",
   "description": "Streaming manifest parser",
   "files": [
     "dist"
@@ -48,19 +48,19 @@
     "node": ">=22.19"
   },
   "dependencies": {
-    "@xmldom/xmldom": "^0.9.10",
-    "temporal-polyfill": "^0.3.2"
+    "@xmldom/xmldom": "^0.9.12",
+    "temporal-polyfill": "^1.0.5"
   },
   "peerDependencies": {
-    "mediabunny": "^1.48.0"
+    "mediabunny": "^1.58.0"
   },
   "devDependencies": {
     "@types/node": "^22.19.21",
-    "oxfmt": "^0.55.0",
-    "oxlint": "^1.70.0",
-    "tsdown": "^0.22.3",
+    "oxfmt": "^0.68.0",
+    "oxlint": "^1.83.0",
+    "tsdown": "^0.23.0",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.9"
+    "vitest": "^5.0.1"
   },
   "scripts": {
     "test": "vitest",