@amazon/vinyl 3.1.0 → 3.2.1

package/dist/types/current/ad/AdControllerImpl.d.ts

@@ -7,6 +7,15 @@ import type { AdsProvider } from './AdsProvider';
  * The % playhead start tolerance for playback progress when emitting ad progress events.
  */
 export declare const AD_START_TOLERANCE = 0.05;
+/**
+ * When a break's X-PLAYOUT-LIMIT budget is reached, an ad whose real media end is
+ * within this many seconds is allowed to finish on its own `ended` rather than
+ * being cut. The limit is a coarse, often whole-second budget while the media's
+ * true length is fractional, so without this grace an ad effectively as long as
+ * its budget would be clipped a fraction short. The tolerance is measured against
+ * the playback-reported (media) duration, not the ad's declared duration.
+ */
+export declare const PLAYOUT_LIMIT_TOLERANCE = 1;
 export interface AdControllerImplDeps {
     readonly playbackController: ReadonlyPlaybackController;
 }
@@ -129,8 +138,15 @@ export declare class AdControllerImpl extends EventHostImpl<AdEventMap> implemen
     private emitAdProgressEvents;
     private emitTimeUpdate;
     /**
-     * Ads breaks can have a playout limit that may cut off ad playback.
-     * End the ad if that limit is reached.
+     * Enforces the break-level playout limit (X-PLAYOUT-LIMIT): a budget shared
+     * across all of the break's ads. When cumulative playout reaches it, the
+     * whole break ends, dropping any ads that have not started.
+     *
+     * This is deliberately NOT a per-ad cap. Each ad asset is its own source and
+     * ends on its media `ended` (see the 'ended' handler), which is what advances
+     * a multi-ad break. Ending an ad at its declared per-ad DURATION instead would
+     * truncate the real asset whenever a packager under-declares it — e.g. rounds
+     * a 6.732s asset down to a whole-second 6 — cutting off the fractional tail.
      */
     private enforcePlayoutLimits;
     private setPendingBreaks;

package/dist/types/current/ad/AdControllerImpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdControllerImpl.d.ts","sourceRoot":"","sources":["../../../../src/ad/AdControllerImpl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AdControllerImpl.d.ts","sourceRoot":"","sources":["../../../../src/ad/AdControllerImpl.ts"],"names":[],"mappings":"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"}

package/dist/types/current/ad/AdControllerImpl.js

@@ -8,6 +8,15 @@ import { AdError } from './AdError';
  * The % playhead start tolerance for playback progress when emitting ad progress events.
  */
 export const AD_START_TOLERANCE = 0.05;
+/**
+ * When a break's X-PLAYOUT-LIMIT budget is reached, an ad whose real media end is
+ * within this many seconds is allowed to finish on its own `ended` rather than
+ * being cut. The limit is a coarse, often whole-second budget while the media's
+ * true length is fractional, so without this grace an ad effectively as long as
+ * its budget would be clipped a fraction short. The tolerance is measured against
+ * the playback-reported (media) duration, not the ad's declared duration.
+ */
+export const PLAYOUT_LIMIT_TOLERANCE = 1;
 export const defaultAdControllerImplOptions = {
     adLoadTimeout: 15,
     preloadAheadTime: 10,
@@ -560,30 +569,43 @@ export class AdControllerImpl extends EventHostImpl {
         });
     }
     /**
-     * Ads breaks can have a playout limit that may cut off ad playback.
-     * End the ad if that limit is reached.
+     * Enforces the break-level playout limit (X-PLAYOUT-LIMIT): a budget shared
+     * across all of the break's ads. When cumulative playout reaches it, the
+     * whole break ends, dropping any ads that have not started.
+     *
+     * This is deliberately NOT a per-ad cap. Each ad asset is its own source and
+     * ends on its media `ended` (see the 'ended' handler), which is what advances
+     * a multi-ad break. Ending an ad at its declared per-ad DURATION instead would
+     * truncate the real asset whenever a packager under-declares it — e.g. rounds
+     * a 6.732s asset down to a whole-second 6 — cutting off the fractional tail.
      */
     enforcePlayoutLimits(adState) {
+        if (!adState.started)
+            return;
+        const { parentBreak } = adState;
+        // Enforce independent of a finite content duration so live ads with a
+        // declared playout limit are still bounded.
+        const limit = parentBreak.adBreak.playoutLimit;
+        if (limit == null)
+            return;
         const pC = this.deps.playbackController;
-        const { ad, parentBreak } = adState;
-        // Enforce playout limits independent of a finite content duration so
-        // live ads with a declared playout limit are still bounded.
-        if (adState.started) {
-            const elapsed = Math.max(0, pC.currentTime - adState.timeStart);
-            const adBreak = parentBreak.adBreak;
-            const limit = adBreak.playoutLimit;
-            if (limit != null &&
-                parentBreak.playoutElapsed + elapsed >= limit) {
-                // The break's total playout limit is reached: end the whole
-                // break, dropping any ads that have not started.
-                parentBreak.clear();
-                this.endAd(adState);
-            }
-            else if (ad.duration != null && elapsed >= ad.duration) {
-                // This ad reached its declared duration: advance to the next.
-                this.endAd(adState);
-            }
+        const elapsed = Math.max(0, pC.currentTime - adState.timeStart);
+        if (parentBreak.playoutElapsed + elapsed < limit)
+            return;
+        // Budget reached — but if the current ad is essentially at its natural
+        // media end (within PLAYOUT_LIMIT_TOLERANCE of the playback-reported
+        // duration), let it finish on its own `ended` rather than clipping the
+        // tail. A known finite, positive duration is required; an unknown (0) or
+        // non-finite duration (e.g. live) enforces the limit strictly.
+        if (isFinite(pC.duration) &&
+            pC.duration > 0 &&
+            pC.duration - pC.currentTime <= PLAYOUT_LIMIT_TOLERANCE) {
+            return;
         }
+        // The break's total playout limit is reached: end the whole break,
+        // dropping any ads that have not started.
+        parentBreak.clear();
+        this.endAd(adState);
     }
     setPendingBreaks(newPending) {
         this.pendingAdBreaks = newPending.filter((adBreak) => !this.isBreakSuppressed(adBreak));

package/dist/types/current/drm/DrmControllerImpl.d.ts

@@ -2,7 +2,7 @@ import { EventHostImpl, type Maybe } from '@amazon/vinyl-util';
 import { type DrmOptions } from './DrmOptions';
 import type { DrmController, DrmControllerEventMap, DrmKeySystemSupport, DrmPlaybackOptions } from './DrmController';
 import type { CommonEme, CommonMediaKeyMessageEvent, CommonMediaKeys, CommonMediaKeySession } from './commonEme/CommonEme';
-import type { MediaFormatMetadata } from '../streaming/MediaQualityMetadata';
+import type { ContentType, MediaFormatMetadata } from '../streaming/MediaQualityMetadata';
 import type { TrackUri } from '../track/Track';
 /**
  * The number of seconds a license request will be allowed before timing out.
@@ -30,6 +30,13 @@ export interface DrmControllerMessageProps {
      * to their own track.
      */
     readonly trackUri: TrackUri | null;
+    /**
+     * The MIME and content type of the session's content, captured at creation
+     * so the license span can distinguish the certificate exchange from the
+     * per-content-type license exchanges.
+     */
+    readonly mimeType: string;
+    readonly contentType: ContentType | null;
 }
 export declare class DrmControllerImpl extends EventHostImpl<DrmControllerEventMap> implements DrmController {
     private readonly deps;
@@ -44,6 +51,8 @@ export declare class DrmControllerImpl extends EventHostImpl<DrmControllerEventM
     private bufferingTrackUri;
     private sessionAbort;
     private pendingMessageProps;
+    private keySetupSpanArmed;
+    private keySetupSpanStart;
     private readonly disposer;
     constructor(deps: DrmControllerImplDeps, options?: Maybe<Partial<DrmOptions>>);
     configure(options: Maybe<Partial<DrmOptions>>): void;
@@ -64,6 +73,13 @@ export declare class DrmControllerImpl extends EventHostImpl<DrmControllerEventM
      * The new session will be added to the current sessions list.
      */
     private maybeCreateSession;
+    /**
+     * Captures the key-setup span start at the top of the session-creation path
+     * (before media keys are attached), latching so only the first session of
+     * the current track load is measured.
+     */
+    private markKeySetupStart;
+    private dispatchLoadSpan;
     initializeForPlayback(drmInfo: MediaFormatMetadata | null, options?: DrmPlaybackOptions): void;
     /** True when the manifest carried pssh (sessions come from it, not events). */
     private manifestProvidesInitData;

package/dist/types/current/drm/DrmControllerImpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DrmControllerImpl.d.ts","sourceRoot":"","sources":["../../../../src/drm/DrmControllerImpl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DrmControllerImpl.d.ts","sourceRoot":"","sources":["../../../../src/drm/DrmControllerImpl.ts"],"names":[],"mappings":"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"}

package/dist/types/current/drm/DrmControllerImpl.js

@@ -35,6 +35,10 @@ export class DrmControllerImpl extends EventHostImpl {
     bufferingTrackUri = null;
     sessionAbort = null;
     pendingMessageProps = null;
+    // Armed per track load; latches on the first session so only the
+    // critical-path session's EME/CDM setup is measured.
+    keySetupSpanArmed = true;
+    keySetupSpanStart = null;
     disposer = createDisposer();
     constructor(deps, options) {
         super();
@@ -160,6 +164,7 @@ export class DrmControllerImpl extends EventHostImpl {
         if (!hasMimeType(drmInfo)) {
             throw new DrmError('Encrypted content must have a mimeType.');
         }
+        this.markKeySetupStart();
         const mediaKeys = await this.attachMediaKeys(drmInfo);
         this.abortIfDisposed();
         // Resolve server certificate from configuration
@@ -204,6 +209,33 @@ export class DrmControllerImpl extends EventHostImpl {
         });
         return newSession;
     }
+    /**
+     * Captures the key-setup span start at the top of the session-creation path
+     * (before media keys are attached), latching so only the first session of
+     * the current track load is measured.
+     */
+    markKeySetupStart() {
+        if (!this.keySetupSpanArmed)
+            return;
+        this.keySetupSpanArmed = false;
+        this.keySetupSpanStart = Date.now();
+    }
+    dispatchLoadSpan(kind, startTime, endTime, messageProps) {
+        this.dispatch('loadSpanMeasured', {
+            kind,
+            startTime,
+            endTime,
+            mimeType: messageProps.mimeType,
+            // Attributed at the source to the session's track; omitted (not set
+            // to undefined) when unknown, per exactOptionalPropertyTypes.
+            ...(messageProps.trackUri != null && {
+                trackUri: messageProps.trackUri,
+            }),
+            ...(messageProps.contentType != null && {
+                contentType: messageProps.contentType,
+            }),
+        });
+    }
     initializeForPlayback(drmInfo, options) {
         logDebug(this, 'initializeForPlayback', drmInfo);
         if (drmInfo?.contentProtections.length) {
@@ -222,6 +254,9 @@ export class DrmControllerImpl extends EventHostImpl {
         this.drmInfo = drmInfo;
         this.bufferingTrackUri = options?.trackUri ?? null;
         this.sessionAbort = options?.abort ?? null;
+        // Re-arm so the new track load's first session is measured.
+        this.keySetupSpanArmed = true;
+        this.keySetupSpanStart = null;
     }
     /**
      * If the drm metadata contains initialization data for the current key system, create a new session.
@@ -232,6 +267,7 @@ export class DrmControllerImpl extends EventHostImpl {
             this.handleError(new DrmError('DRM not supported.'));
             return;
         }
+        this.markKeySetupStart();
         const mediaKeys = await this.attachMediaKeys(drmInfo);
         const drmProtection = drmInfo.contentProtections.find((cP) => {
             return cP.keySystem === mediaKeys.keySystem;
@@ -355,6 +391,8 @@ export class DrmControllerImpl extends EventHostImpl {
                 // Captured per session, so a concurrent preloaded track's
                 // license exchange keeps its own attribution.
                 trackUri: trackUri,
+                mimeType: drmInfo.mimeType,
+                contentType: drmInfo.contentType,
             }), LICENSE_TIMEOUT, { message: LICENSE_TIMEOUT_MESSAGE }).catch(this.handleError);
         });
         session.on('error', (event) => {
@@ -372,6 +410,12 @@ export class DrmControllerImpl extends EventHostImpl {
         this.pendingMessageProps = messageProps;
         const keySystem = mediaKeys.keySystem;
         logDebug(this, 'message', keySystem, event.message.byteLength);
+        // The CDM's first message ends the setup span; it is contiguous with the
+        // license round-trip measured below.
+        if (this.keySetupSpanStart != null) {
+            this.dispatchLoadSpan('keySetup', this.keySetupSpanStart, Date.now(), messageProps);
+            this.keySetupSpanStart = null;
+        }
         const keySystemOptions = this.options.keySystems[keySystem] ?? this.options.keySystems['*'];
         const licenseServerOptionsProvider = keySystemOptions?.licenseServer;
         // Get the license server configuration for the current key system.
@@ -393,16 +437,7 @@ export class DrmControllerImpl extends EventHostImpl {
         const key = await this.licenseProvider(keySystem, licenseServerOptions, challenge);
         if (this.disposed)
             return;
-        this.dispatch('loadSpanMeasured', {
-            kind: 'license',
-            startTime: licenseSpanStart,
-            endTime: Date.now(),
-            // Attributed at the source to the session's track; omitted (not set
-            // to undefined) when unknown, per exactOptionalPropertyTypes.
-            ...(messageProps.trackUri != null && {
-                trackUri: messageProps.trackUri,
-            }),
-        });
+        this.dispatchLoadSpan('license', licenseSpanStart, Date.now(), messageProps);
         this.pendingMessageProps = null;
         if (session.disposed)
             return;

package/dist/types/current/playback/createStallMonitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createStallMonitor.d.ts","sourceRoot":"","sources":["../../../../src/playback/createStallMonitor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAE/D,MAAM,WAAW,mBAAmB;IAChC;;;OAGG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CACjC;AAED,MAAM,WAAW,cAAc;IAC3B,yEAAyE;IACzE,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAA;IAC3B,4BAA4B;IAC5B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;IACzB,8CAA8C;IAC9C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,2BAA2B;IAC3B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;CACpC;AAED,MAAM,WAAW,qBAAqB;IAClC,6CAA6C;IAC7C,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAA;IACnC,yCAAyC;IACzC,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAA;CACxD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAC9B,UAAU,EAAE,0BAA0B,EACtC,SAAS,EAAE,qBAAqB,EAChC,OAAO,GAAE,mBAAwB,GAClC,MAAM,IAAI,CA8EZ"}
+{"version":3,"file":"createStallMonitor.d.ts","sourceRoot":"","sources":["../../../../src/playback/createStallMonitor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAE/D,MAAM,WAAW,mBAAmB;IAChC;;;OAGG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CACjC;AAED,MAAM,WAAW,cAAc;IAC3B,yEAAyE;IACzE,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAA;IAC3B,4BAA4B;IAC5B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;IACzB,8CAA8C;IAC9C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,2BAA2B;IAC3B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;CACpC;AAED,MAAM,WAAW,qBAAqB;IAClC,6CAA6C;IAC7C,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAA;IACnC,yCAAyC;IACzC,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAA;CACxD;AASD;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAC9B,UAAU,EAAE,0BAA0B,EACtC,SAAS,EAAE,qBAAqB,EAChC,OAAO,GAAE,mBAAwB,GAClC,MAAM,IAAI,CA+EZ"}

package/dist/types/current/playback/createStallMonitor.js

@@ -4,6 +4,12 @@
  */
 import { createDisposer } from '@amazon/vinyl-util';
 import { StallEndedReason } from './ReadonlyPlaybackController';
+/**
+ * Minimum forward `currentTime` change (seconds) that counts as real progress. Guards the
+ * progress check against floating-point jitter so a negligible advance isn't mistaken for the
+ * play head moving.
+ */
+const PROGRESS_EPSILON = 1e-6;
 /**
  * Watches a {@link ReadonlyPlaybackController} for stalls while playing: the play head freezing
  * (no `timeUpdate`) for longer than {@link StallMonitorOptions.stallThreshold} seconds.
@@ -26,6 +32,7 @@ export function createStallMonitor(controller, callbacks, options = {}) {
     let lastProgressAt = Date.now();
     let inStall = false;
     let pollId = null;
+    const { add, dispose } = createDisposer();
     const endStall = (reason) => {
         if (!inStall)
             return;
@@ -44,6 +51,7 @@ export function createStallMonitor(controller, callbacks, options = {}) {
         clearInterval(pollId);
         pollId = null;
     };
+    add(stopPoll);
     const startPoll = () => {
         if (pollId != null)
             return;
@@ -63,18 +71,22 @@ export function createStallMonitor(controller, callbacks, options = {}) {
         observedPlaying = false;
         stopPoll();
     };
-    const { add, dispose } = createDisposer();
     add(controller.on('playing', () => {
-        // Resuming from a stall closes it; otherwise this is a fresh start of playback, so
-        // begin the freeze clock now (no `timeUpdate` has necessarily arrived yet).
+        // Resuming from a stall closes it (using the pre-resume freeze start for its duration).
         if (inStall)
             endStall(StallEndedReason.PLAYING);
-        else
-            lastProgressAt = Date.now();
+        // Whether resuming or freshly starting, the play head is advancing again, so restart the
+        // freeze clock. Without this the poll could immediately re-detect a stall from the stale
+        // pre-freeze timestamp before the first post-resume `timeUpdate` resets it.
+        lastProgressAt = Date.now();
         observedPlaying = true;
         startPoll();
     }));
-    add(controller.on('timeUpdate', () => {
+    add(controller.on('timeUpdate', ({ previous, current }) => {
+        // Browsers emit `timeUpdate` while frozen (unchanged/backward `currentTime`); only a
+        // forward advance is progress, else a stall is ended and re-detected, doubling events.
+        if (previous != null && current - previous <= PROGRESS_EPSILON)
+            return;
         // The play head advanced: close any open stall, then reset the freeze clock.
         if (inStall)
             endStall(StallEndedReason.PLAYING);
@@ -83,12 +95,5 @@ export function createStallMonitor(controller, callbacks, options = {}) {
     add(controller.on('pause', () => suspend(StallEndedReason.PAUSE)));
     add(controller.on('seeking', () => suspend(StallEndedReason.SEEKING)));
     add(controller.on('emptied', () => suspend(StallEndedReason.EMPTIED)));
-    let stopped = false;
-    return () => {
-        if (stopped)
-            return;
-        stopped = true;
-        stopPoll();
-        dispose();
-    };
+    return dispose;
 }

package/dist/types/current/streaming/LoadMetric.d.ts

@@ -1,14 +1,17 @@
 import type { Timestamp } from '@amazon/vinyl-util';
 import type { TrackUri } from '../track/Track';
+import type { ContentType } from './MediaQualityMetadata';
 /**
  * The stage of the track-load journey a {@link LoadSpanMeasurement} describes.
  *
  * - `manifest`: fetching and parsing the DASH/HLS manifest.
+ * - `keySetup`: the EME/CDM setup, from session creation to the CDM's first
+ *   license message. Precedes and is contiguous with `license`.
  * - `license`: the DRM license request/response exchange.
  * - `initSegment`: fetching the initialization segment.
  * - `firstSegment`: fetching the first media segment.
  */
-export type LoadSpanKind = 'manifest' | 'license' | 'initSegment' | 'firstSegment';
+export type LoadSpanKind = 'manifest' | 'keySetup' | 'license' | 'initSegment' | 'firstSegment';
 /**
  * A timed span for one stage of a track load.
  *
@@ -35,6 +38,17 @@ export interface LoadSpanMeasurement {
      * buffering DRM info is set).
      */
     readonly trackUri?: TrackUri;
+    /**
+     * The MIME type of the content this span was measured for, when known. Set
+     * for DRM `license` spans so a certificate exchange and the per-content-type
+     * license exchanges are distinguishable.
+     */
+    readonly mimeType?: string;
+    /**
+     * The content type this span was measured for, when known. Set alongside
+     * {@link mimeType} for DRM `license` spans.
+     */
+    readonly contentType?: ContentType;
 }
 /**
  * A {@link LoadSpanMeasurement} attributed to the track it was measured for.

package/dist/types/current/streaming/LoadMetric.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoadMetric.d.ts","sourceRoot":"","sources":["../../../../src/streaming/LoadMetric.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAE9C;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GACpB,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,cAAc,CAAA;AAE3D;;;;;;;;GAQG;AACH,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;IAE3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;IAE7B;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAA;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAC/B;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IACtD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAA;CACnC"}
+{"version":3,"file":"LoadMetric.d.ts","sourceRoot":"","sources":["../../../../src/streaming/LoadMetric.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAEzD;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,GACpB,UAAU,GAAG,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,cAAc,CAAA;AAExE;;;;;;;;GAQG;AACH,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;IAE3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;IAE7B;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAA;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAA;IAE5B;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAE1B;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAA;CACrC;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IACtD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAA;CACnC"}

package/dist/types/current/streaming/mediaTimelineFilter.d.ts

@@ -3,12 +3,14 @@ import type { MediaQualityMetadata } from './MediaQualityMetadata';
 import type { FilterPredicate, FilterPredicateAsync, Maybe } from '@amazon/vinyl-util';
 /**
  * Filters qualities in a MediaTimeline using a synchronous predicate.
- * If filtering would remove all qualities from any period, throws via `throwError`.
+ * If filtering drops an audio or video stream to zero in any period, throws via
+ * `throwError`.
  */
 export declare function filterTimelineQualities(filter: Maybe<FilterPredicate<MediaQualityMetadata>>, throwError: () => never, timeline: MediaTimeline): MediaTimeline;
 /**
  * Filters qualities in a MediaTimeline using an asynchronous predicate.
- * If filtering would remove all qualities from any period, throws via `throwError`.
+ * If filtering drops an audio or video stream to zero in any period, throws via
+ * `throwError`.
  */
 export declare function filterTimelineQualitiesAsync(filter: FilterPredicateAsync<MediaQualityMetadata>, throwError: () => never, timeline: MediaTimeline): Promise<MediaTimeline>;
 /**

package/dist/types/current/streaming/mediaTimelineFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mediaTimelineFilter.d.ts","sourceRoot":"","sources":["../../../../src/streaming/mediaTimelineFilter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAGR,aAAa,EAChB,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,KAAK,EACR,eAAe,EACf,oBAAoB,EACpB,KAAK,EACR,MAAM,oBAAoB,CAAA;AAG3B;;;GAGG;AACH,wBAAgB,uBAAuB,CACnC,MAAM,EAAE,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC,EACpD,UAAU,EAAE,MAAM,KAAK,EACvB,QAAQ,EAAE,aAAa,GACxB,aAAa,CAqBf;AAED;;;GAGG;AACH,wBAAsB,4BAA4B,CAC9C,MAAM,EAAE,oBAAoB,CAAC,oBAAoB,CAAC,EAClD,UAAU,EAAE,MAAM,KAAK,EACvB,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,aAAa,CAAC,CAyBxB;AAED;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA"}
+{"version":3,"file":"mediaTimelineFilter.d.ts","sourceRoot":"","sources":["../../../../src/streaming/mediaTimelineFilter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAGR,aAAa,EAChB,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAElE,OAAO,KAAK,EACR,eAAe,EACf,oBAAoB,EACpB,KAAK,EACR,MAAM,oBAAoB,CAAA;AA0B3B;;;;GAIG;AACH,wBAAgB,uBAAuB,CACnC,MAAM,EAAE,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC,EACpD,UAAU,EAAE,MAAM,KAAK,EACvB,QAAQ,EAAE,aAAa,GACxB,aAAa,CAkBf;AAED;;;;GAIG;AACH,wBAAsB,4BAA4B,CAC9C,MAAM,EAAE,oBAAoB,CAAC,oBAAoB,CAAC,EAClD,UAAU,EAAE,MAAM,KAAK,EACvB,QAAQ,EAAE,aAAa,GACxB,OAAO,CAAC,aAAa,CAAC,CAsBxB;AAED;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA"}

package/dist/types/current/streaming/mediaTimelineFilter.js

@@ -2,10 +2,28 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import { RESTRICTABLE_CONTENT_TYPES } from './MediaQualityMetadata';
 import { map, memoize } from '@amazon/vinyl-util';
+/**
+ * Throws via `throwError` when filtering drops every rendition of an audio or
+ * video stream the period originally carried. Each surviving media stream needs
+ * a source buffer to append to; a stream filtered to zero can never create one,
+ * stalling playback on an unfulfilled `readyToAppend`, so a whole-stream drop is
+ * treated as unsupported media rather than a silent stall. Text is excluded —
+ * captions are an optional sidecar pipeline, not an MSE source buffer.
+ */
+function assertMediaStreamsRetained(original, filtered, throwError) {
+    for (const contentType of RESTRICTABLE_CONTENT_TYPES) {
+        if (original.some((q) => q.metadata.contentType === contentType) &&
+            !filtered.some((q) => q.metadata.contentType === contentType)) {
+            throwError();
+        }
+    }
+}
 /**
  * Filters qualities in a MediaTimeline using a synchronous predicate.
- * If filtering would remove all qualities from any period, throws via `throwError`.
+ * If filtering drops an audio or video stream to zero in any period, throws via
+ * `throwError`.
  */
 export function filterTimelineQualities(filter, throwError, timeline) {
     if (!filter)
@@ -13,16 +31,15 @@ export function filterTimelineQualities(filter, throwError, timeline) {
     const mapMetadataArray = memoize((qualities) => map(qualities, (q) => q.metadata), (qualities) => qualities, 1);
     const periods = timeline.periods.map((period) => {
         const filtered = period.qualities.filter((q, index) => filter(q.metadata, index, mapMetadataArray(period.qualities)));
+        assertMediaStreamsRetained(period.qualities, filtered, throwError);
         return { ...period, qualities: filtered };
     });
-    if (periods.some((p) => p.qualities.length === 0)) {
-        throwError();
-    }
     return { ...timeline, periods };
 }
 /**
  * Filters qualities in a MediaTimeline using an asynchronous predicate.
- * If filtering would remove all qualities from any period, throws via `throwError`.
+ * If filtering drops an audio or video stream to zero in any period, throws via
+ * `throwError`.
  */
 export async function filterTimelineQualitiesAsync(filter, throwError, timeline) {
     const mapMetadataArray = memoize((qualities) => map(qualities, (q) => q.metadata), (qualities) => qualities, 1);
@@ -35,11 +52,9 @@ export async function filterTimelineQualitiesAsync(filter, throwError, timeline)
                 filtered.push(period.qualities[i]);
             }
         }
+        assertMediaStreamsRetained(period.qualities, filtered, throwError);
         periods.push({ ...period, qualities: filtered });
     }
-    if (periods.some((p) => p.qualities.length === 0)) {
-        throwError();
-    }
     return { ...timeline, periods };
 }
 /**

package/dist/types/current/track/filters/sampleRateFilter.d.ts

@@ -18,10 +18,14 @@ export interface AudioSampleRateRangeOptions {
  * The upper bound is `maxSampleRate` when set, otherwise the platform's
  * `AudioContext`-reported output rate (Firefox is hard-capped at 48kHz, which it
  * cannot decode beyond via MSE). The optional lower bound is `minSampleRate`.
- * Both bounds are soft: if every audio rendition is above the max the lowest is
- * kept, and if every audio rendition is below the min the highest is kept, so
- * playback is never stranded. Only audio renditions count toward those
- * fallbacks — a co-present video quality (no audio rate) never influences them.
+ * Both bounds are soft, and soft *together*: when no audio rendition sits in the
+ * acceptable `[minSampleRate, maxSampleRate]` band, a single fallback is kept so
+ * playback is never stranded — the highest rate the ceiling can decode, or, when
+ * every rate is above the ceiling, the lowest. This holds even when renditions
+ * straddle an empty band (some below the floor, some above the ceiling). Only
+ * audio renditions count toward the fallback — a co-present video quality (no
+ * audio rate) never influences it. Firefox is the exception: its 48kHz cap is
+ * hard, with no fallback.
  */
 export declare function withinAudioSampleRateRange(options: AudioSampleRateRangeOptions, metadata: MediaQualityMetadata, _index: number, array: ArrayLike<MediaQualityMetadata>): boolean;
 //# sourceMappingURL=sampleRateFilter.d.ts.map

package/dist/types/current/track/filters/sampleRateFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampleRateFilter.d.ts","sourceRoot":"","sources":["../../../../../src/track/filters/sampleRateFilter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAA;AAWhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE7D,wBAAgB,6BAA6B,IAAI,KAAK,CAErD;AAED,MAAM,WAAW,2BAA2B;IACxC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;IACnC;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACtC,+CAA+C;IAC/C,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACzC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CACtC,OAAO,EAAE,2BAA2B,EACpC,QAAQ,EAAE,oBAAoB,EAC9B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,SAAS,CAAC,oBAAoB,CAAC,GACvC,OAAO,CA+CT"}
+{"version":3,"file":"sampleRateFilter.d.ts","sourceRoot":"","sources":["../../../../../src/track/filters/sampleRateFilter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAA;AAUhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE7D,wBAAgB,6BAA6B,IAAI,KAAK,CAErD;AAED,MAAM,WAAW,2BAA2B;IACxC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;IACnC;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACtC,+CAA+C;IAC/C,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACzC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,0BAA0B,CACtC,OAAO,EAAE,2BAA2B,EACpC,QAAQ,EAAE,oBAAoB,EAC9B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,SAAS,CAAC,oBAAoB,CAAC,GACvC,OAAO,CAmDT"}

package/dist/types/current/track/filters/sampleRateFilter.js

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { hasBrowser, Browser, last, MediaUnsupportedError, every, map, max, min, } from '@amazon/vinyl-util';
+import { hasBrowser, Browser, last, MediaUnsupportedError, map, max, min, } from '@amazon/vinyl-util';
 export function throwSamplingRatesUnsupported() {
     throw new MediaUnsupportedError('No supported sample rate', 'sampling-rate');
 }
@@ -13,34 +13,46 @@ export function throwSamplingRatesUnsupported() {
  * The upper bound is `maxSampleRate` when set, otherwise the platform's
  * `AudioContext`-reported output rate (Firefox is hard-capped at 48kHz, which it
  * cannot decode beyond via MSE). The optional lower bound is `minSampleRate`.
- * Both bounds are soft: if every audio rendition is above the max the lowest is
- * kept, and if every audio rendition is below the min the highest is kept, so
- * playback is never stranded. Only audio renditions count toward those
- * fallbacks — a co-present video quality (no audio rate) never influences them.
+ * Both bounds are soft, and soft *together*: when no audio rendition sits in the
+ * acceptable `[minSampleRate, maxSampleRate]` band, a single fallback is kept so
+ * playback is never stranded — the highest rate the ceiling can decode, or, when
+ * every rate is above the ceiling, the lowest. This holds even when renditions
+ * straddle an empty band (some below the floor, some above the ceiling). Only
+ * audio renditions count toward the fallback — a co-present video quality (no
+ * audio rate) never influences it. Firefox is the exception: its 48kHz cap is
+ * hard, with no fallback.
  */
 export function withinAudioSampleRateRange(options, metadata, _index, array) {
-    // Only audio renditions are gated on sampling rate; video and any other
-    // content type (including muxed video that happens to carry an audio rate)
-    // pass through untouched.
+    // Muxed video carrying an audio rate, and every non-audio type, pass through.
     if (metadata.contentType !== 'audio')
         return true;
     const samplingRate = last(metadata.audioSamplingRate);
     if (!samplingRate)
         return true; // sampling rate not set
+    const { minSampleRate } = options;
+    // An explicit maxSampleRate takes precedence over the AudioContext rate.
+    const maxSampleRate = options.maxSampleRate ?? options.capabilities.sampleRate;
     const audioRates = () => map(array, (item) => item.contentType === 'audio'
         ? last(item.audioSamplingRate)
         : undefined).filter((rate) => rate != null);
-    // Lower bound (soft floor), independent of the platform max: below it, keep
-    // only the highest when every audio rendition is below the floor.
-    const { minSampleRate } = options;
-    if (minSampleRate != null && samplingRate < minSampleRate) {
+    // The single rate to keep when this rendition is out of band — or undefined
+    // when some rendition IS in band, so out-of-band renditions are dropped.
+    // Evaluating both bounds together is what stops a straddle from stranding.
+    const outOfBandFallback = () => {
         const rates = audioRates();
-        return (every(rates, (rate) => rate < minSampleRate) &&
-            samplingRate === max(rates));
+        const inBand = (rate) => (minSampleRate == null || rate >= minSampleRate) &&
+            (!maxSampleRate || rate <= maxSampleRate);
+        if (rates.some(inBand))
+            return undefined;
+        const decodable = maxSampleRate
+            ? rates.filter((rate) => rate <= maxSampleRate)
+            : rates;
+        return decodable.length ? max(decodable) : min(rates);
+    };
+    // Lower bound (soft floor), independent of the platform max.
+    if (minSampleRate != null && samplingRate < minSampleRate) {
+        return samplingRate === outOfBandFallback();
     }
-    // Upper bound. An explicit maxSampleRate takes precedence over the
-    // AudioContext-reported output rate.
-    const maxSampleRate = options.maxSampleRate ?? options.capabilities.sampleRate;
     // No platform max to gauge support: keep. This also lets >48kHz through on
     // Firefox (its cap below is skipped) — accepted.
     if (!maxSampleRate)
@@ -51,8 +63,6 @@ export function withinAudioSampleRateRange(options, metadata, _index, array) {
     }
     if (samplingRate <= maxSampleRate)
         return true;
-    // Above the max: keep only the lowest when every audio rendition exceeds it.
-    const rates = audioRates();
-    return (every(rates, (rate) => rate > maxSampleRate) &&
-        samplingRate === min(rates));
+    // Above the ceiling (soft): keep only the fallback when no rate is in band.
+    return samplingRate === outOfBandFallback();
 }