dasha 4.5.0 → 4.5.2

package/dist/index.d.mts

@@ -1,4 +1,5 @@
 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";
+import { Temporal } from "temporal-polyfill";
 //#region src/mediabunny.d.ts
 type Segment$1 = {
   timestamp: number;

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { ADTS, ALL_FORMATS as ALL_FORMATS$1, CustomPathedSource, FilePathSource, HLS, HLS as HLS$1, HLS_FORMATS, Input as Input$1, InputFormat, InputTrack, InputVideoTrack, MATROSKA, MP3, MP3 as MP3$1, MP4, MP4 as MP4$1, QTFF, SourceRef, UrlSource, WEBM, asc, desc, prefer } from "mediabunny";
 import { DOMParser } from "@xmldom/xmldom";
-import { Temporal } from "temporal-polyfill";
 import { readFile } from "node:fs/promises";
+import { Temporal } from "temporal-polyfill";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { pathToFileURL } from "node:url";
 //#region src/util.ts
@@ -514,6 +514,13 @@ const parseDashRange = (range) => {
 	const [startRange, end] = range.split("-").map(Number);
 	return [startRange, end - startRange + 1];
 };
+const OVERPRECISE_SECONDS_PATTERN = /(\d+)\.(\d{10,})S/;
+const normalizeDashDuration = (duration) => duration.replace(OVERPRECISE_SECONDS_PATTERN, (_, seconds, fraction) => {
+	const nanos = Math.round(Number(`0.${fraction}`) * 1e9);
+	if (nanos >= 1e9) return `${Number(seconds) + 1}.000000000S`;
+	return `${seconds}.${String(nanos).padStart(9, "0")}S`;
+});
+const parseDashDuration = (duration) => Temporal.Duration.from(normalizeDashDuration(duration));
 //#endregion
 //#region src/hls/hls-subtitles.ts
 const TAG_STREAM_INF = "#EXT-X-STREAM-INF:";
@@ -1888,7 +1895,6 @@ 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;
@@ -2153,12 +2159,7 @@ var DashSegmentedInput = class {
 		if (!firstSegment) return null;
 		const track = await this.getTrackForSegment(firstSegment);
 		if (!track) return null;
-		let packet = null;
-		try {
-			packet = await track._backing.getFirstPacket(options);
-		} catch (error) {
-			if (!isEncryptedSamplesError(error)) throw error;
-		}
+		const packet = await track._backing.getFirstPacket(options);
 		if (!packet) return null;
 		return this.createAdjustedPacket(packet, firstSegment, track);
 	}
@@ -2207,12 +2208,7 @@ var DashSegmentedInput = class {
 			}
 			const input = track.input;
 			const offsetTimestamp = timestamp - await this.getMediaOffset(currentSegment, input, track);
-			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;
-			}
+			const packet = keyframesOnly ? await track._backing.getKeyPacket(offsetTimestamp, options) : await track._backing.getPacket(offsetTimestamp, options);
 			if (!packet) {
 				currentSegment = await this.getPreviousSegment(currentSegment);
 				continue;
@@ -2255,7 +2251,7 @@ const processDashContent = (mpdContent) => {
 	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 getDashRefreshIntervalMs = (timeShiftBufferDepth) => parseDashDuration(timeShiftBufferDepth).total("milliseconds") / 2;
 const getDisposition = (track) => ({
 	...DEFAULT_TRACK_DISPOSITION,
 	commentary: track.role === ROLE_TYPE.Commentary,
@@ -2533,7 +2529,7 @@ const applyFixedDurationTemplate = (params) => {
 		const offsetMs = Number(presentationTimeOffset) / 1e3;
 		availableTime.setUTCMilliseconds(availableTime.getUTCMilliseconds() + offsetMs);
 		const elapsedSeconds = (now - availableTime.getTime()) / 1e3;
-		const updateWindowSeconds = Temporal.Duration.from(timeShiftBufferDepth).total("seconds");
+		const updateWindowSeconds = parseDashDuration(timeShiftBufferDepth).total("seconds");
 		startNumber += (elapsedSeconds - updateWindowSeconds) * timescale / duration;
 		totalNumber = updateWindowSeconds * timescale / duration;
 	}
@@ -2750,7 +2746,7 @@ var DashDemuxer = class {
 		return manifest;
 	}
 	appendPeriodTracks(tracks, manifest, period) {
-		const periodDurationSeconds = Temporal.Duration.from(period.getAttribute("duration") || manifest.mediaPresentationDuration || "PT0S").total("seconds");
+		const periodDurationSeconds = parseDashDuration(period.getAttribute("duration") || manifest.mediaPresentationDuration || "PT0S").total("seconds");
 		const periodBaseUrl = extendDashBaseUrl(period, this.baseUrl);
 		for (const adaptationSet of getDirectDashChildren(period, "AdaptationSet")) this.appendAdaptationSetTracks({
 			tracks,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "description": "Streaming manifest parser",
   "files": [
     "dist"