@amazon/vinyl 1.1.1 → 2.0.0

package/dist/types/current/vinyl/VinylPlayer.js

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { createDisposer, emptyRanges, equalDeep, EventHostImpl, logDebug, logInfo, redispatchEvents, } from '@amazon/vinyl-util';
+import { createDisposer, emptyRanges, equalDeep, EventHostImpl, logDebug, logInfo, logWarn, redispatchEvents, } from '@amazon/vinyl-util';
 import { createContainer, } from '@amazon/vinyl-di';
 import { playerRegistryRef } from '../global/PlayerRegistry';
 import { ALL_PLAYBACK_STATE_EVENTS, } from '../playback/ReadonlyPlaybackController';
@@ -11,6 +11,8 @@ import { createVinylFactories } from './createVinylFactories';
 import { initializeVinylGlobal } from '../global/initializeVinylGlobal';
 import { ALL_CONTENT_TYPES, } from '../streaming/MediaQualityMetadata';
 import { ALL_STREAMING_EVENTS, } from '../streaming/StreamingEventMap';
+import { ALL_TEXT_TRACK_EVENTS, } from '../text/TextTrack';
+import { ALL_AD_EVENTS } from '../ad/AdController';
 /**
  * A Vinyl Media Player.
  *
@@ -31,6 +33,9 @@ export class VinylPlayer extends EventHostImpl {
     get trackController() {
         return this.deps.trackController;
     }
+    get autoResetController() {
+        return this.deps.autoResetController;
+    }
     /**
      * Provides information about the client, such as device and browser capabilities.
      */
@@ -56,61 +61,131 @@ export class VinylPlayer extends EventHostImpl {
         this.redispatchSubControllerEvents();
         this.redispatchCurrentTrackEvents();
         this.initializeAutoResetHandling();
-        this.initializePreferredLanguageHandling();
     }
     redispatchSubControllerEvents() {
         const add = this.disposer.add;
         add(redispatchEvents(this, this.playbackController, ALL_PLAYBACK_STATE_EVENTS.filter(notResetEvent)));
         add(redispatchEvents(this, this.trackController, ALL_TRACK_CONTROLLER_EVENTS));
         add(redispatchEvents(this, this.drmController, ['error']));
+        // The shared DRM controller serves multiple tracks (active + preloaded),
+        // so it stamps each license span with the initiating track at the source
+        // (via its key session). Republish using that carried uri; drop spans
+        // whose track is unknown rather than misattribute them to whatever track
+        // happens to be current when the exchange resolves.
+        add(this.drmController.on('loadSpanMeasured', (measurement) => {
+            const trackUri = measurement.trackUri;
+            if (trackUri != null) {
+                this.dispatch('loadSpan', { ...measurement, trackUri });
+            }
+        }));
+        add(redispatchEvents(this, this.deps.adController, ALL_AD_EVENTS));
         this.on('error', (event) => {
             this._error = event.error;
         });
+        // A codec decode/append failure poisons the media pipeline; the track
+        // must be rebuilt (not merely reset) to recover. The failing codec has
+        // already been denylisted, so the reload selects a codec that decodes.
+        add(this.on('codecUnsupported', (event) => {
+            // While an ad is playing, the ad track owns the media pipeline;
+            // do not rebuild the content track out from under it.
+            if (this.deps.adController.currentAdBreak)
+                return;
+            logWarn(this, 'codec unsupported, reloading track:', event.mimeType);
+            this.trackController.reset(/* hard */ true);
+        }));
     }
     /**
      * Certain track events are redispatched on the player for the current track.
      */
     redispatchCurrentTrackEvents() {
         let sub = null;
+        let textSub = null;
+        let metricSub = null;
+        // Track currently redispatched, driven by trackActivated/Deactivated.
+        let activeTrack = null;
         const add = this.disposer.add;
-        add(this.trackController.on('currentTrackChange', (event) => {
+        // Re-wires redispatch previous→current and emits the state changes
+        // (text, seek range, qualities).
+        const transition = (current) => {
+            const previous = activeTrack;
+            if (previous === current)
+                return;
+            activeTrack = current;
+            // Clear the previous track's caption selection (it may stay cached),
+            // before tearing down subs so activeTextTrackChange flows through.
+            // Skip during an ad break: the content will resume, and its caption
+            // selection must survive for resume() (deactivation only suspends
+            // it). Tracks expose ReadonlyTrack; the controller is a full one.
+            const prevTextController = previous?.textTrackController;
+            if (!this.deps.adController.currentAdBreak) {
+                prevTextController?.setActiveTextTrack(null);
+            }
             sub?.();
             sub = null;
-            if (event.current) {
-                sub = redispatchEvents(this, event.current, ALL_STREAMING_EVENTS.filter(notResetEvent));
+            textSub?.();
+            textSub = null;
+            metricSub?.();
+            metricSub = null;
+            if (current) {
+                sub = redispatchEvents(this, current, ALL_STREAMING_EVENTS.filter(notResetEvent).filter(notLoadSpanMeasuredEvent));
+                metricSub = current.on('loadSpanMeasured', (measurement) => this.dispatch('loadSpan', {
+                    ...measurement,
+                    // The track stamps its own uri at the source; fall
+                    // back to the current track for any span that has
+                    // not been attributed upstream.
+                    trackUri: measurement.trackUri ?? current.uri,
+                }));
+                if (current.textTrackController) {
+                    textSub = redispatchEvents(this, current.textTrackController, ALL_TEXT_TRACK_EVENTS);
+                }
             }
+            this.emitTextTrackChangeEventsFor(previous, current);
             this.dispatch('fetchedRangesChange', {});
+            this.dispatch('seekRangeChange', {
+                previous: previous?.seekRange ?? null,
+                current: current?.seekRange ?? null,
+            });
             // Emit a quality change event for every stream that has changed
             // for streaming, buffering, and playback
             for (const contentType of ALL_CONTENT_TYPES) {
-                for (const [eventType, getterName,] of qualityEventsAndGetters) {
-                    const previous = event.previous?.[getterName](contentType) ?? null;
-                    const current = event.current?.[getterName](contentType) ?? null;
-                    if (previous !== current) {
+                for (const [eventType, getterName] of qualityEventsAndGetters) {
+                    const previousQuality = previous?.[getterName](contentType) ?? null;
+                    const currentQuality = current?.[getterName](contentType) ?? null;
+                    if (previousQuality !== currentQuality) {
                         this.dispatch(eventType, {
-                            previous,
-                            current,
+                            previous: previousQuality,
+                            current: currentQuality,
                         });
                     }
                 }
             }
             // Emit qualities change events on track switch
-            const prevQualities = event.previous?.qualities ?? null;
-            const curQualities = event.current?.qualities ?? null;
+            const prevQualities = previous?.qualities ?? null;
+            const curQualities = current?.qualities ?? null;
             if (prevQualities !== curQualities && curQualities) {
                 this.dispatch('qualitiesChange', {
                     previous: prevQualities ?? [],
                     current: curQualities,
                 });
             }
-            const prevUnfiltered = event.previous?.qualitiesUnfiltered ?? null;
-            const curUnfiltered = event.current?.qualitiesUnfiltered ?? null;
+            const prevUnfiltered = previous?.qualitiesUnfiltered ?? null;
+            const curUnfiltered = current?.qualitiesUnfiltered ?? null;
             if (prevUnfiltered !== curUnfiltered && curUnfiltered) {
                 this.dispatch('qualitiesUnfilteredChange', {
                     previous: prevUnfiltered ?? [],
                     current: curUnfiltered,
                 });
             }
+        };
+        add(this.trackController.on('trackActivated', ({ track }) => transition(track)));
+        add(this.trackController.on('trackDeactivated', ({ track }) => {
+            // Clear to no-active-track only on a real teardown (unload). In
+            // an ad-swap the ad's trackActivated drives the transition, so
+            // skip to avoid an intermediate clear and preserve captions.
+            if (track === activeTrack &&
+                !this.deps.adController.currentAdBreak) {
+                transition(null);
+            }
         }));
     }
     initializeAutoResetHandling() {
@@ -118,21 +193,11 @@ export class VinylPlayer extends EventHostImpl {
         // On an error, notify the auto reset controller which will
         // monitor network changes and periodically request a reset.
         const { add } = this.disposer;
-        const { autoResetController } = this.deps;
         this.on('error', (event) => {
-            autoResetController.setError(event.error);
+            this.autoResetController.setError(event.error);
         });
-        add(autoResetController.on('reset', () => this.reset()));
-    }
-    initializePreferredLanguageHandling() {
-        const { add } = this.disposer;
-        // When the preferred language changes, clear the prefetch to immediately switch.
-        add(this.deps.options
-            .pick('preferredAudioLanguage')
-            .onData((_value, previous) => {
-            if (previous !== undefined)
-                this.clearPrefetch();
-        }));
+        add(this.autoResetController.on('reset', () => this.reset()));
+        add(this.autoResetController.on('resetPendingChange', (event) => this.dispatch('resetPendingChange', event)));
     }
     /**
      * Returns the current player options.
@@ -195,6 +260,17 @@ export class VinylPlayer extends EventHostImpl {
     get error() {
         return this._error;
     }
+    /**
+     * True when an error has interrupted playback and an automatic reset
+     * is scheduled. This distinguishes transient, potentially recoverable
+     * errors (such as a brief network outage) from terminal errors that
+     * will not trigger a reset on their own.
+     *
+     * Listen to `resetPendingChange` events for changes.
+     */
+    get resetPending() {
+        return this.autoResetController.resetPending;
+    }
     get hasMetadata() {
         return this.playbackController.hasMetadata;
     }
@@ -240,6 +316,13 @@ export class VinylPlayer extends EventHostImpl {
     get seekable() {
         return this.playbackController.seekable;
     }
+    /**
+     * The seekable range on the media timeline for the current track, or null
+     * when no track is loaded or the timeline is not yet resolved.
+     */
+    get seekRange() {
+        return this.activeTrack?.seekRange ?? null;
+    }
     get seeking() {
         return this.playbackController.seeking;
     }
@@ -261,7 +344,7 @@ export class VinylPlayer extends EventHostImpl {
     seekTo(time, tolerance) {
         return this.playbackController.seekTo(time, tolerance);
     }
-    reset() {
+    reset(hard = false) {
         if (!this._error) {
             logDebug(this, 'reset no-op');
             return;
@@ -270,14 +353,15 @@ export class VinylPlayer extends EventHostImpl {
         this._error = null;
         this.drmController.reset();
         this.playbackController.reset();
-        this.trackController.reset();
+        this.trackController.reset(hard);
+        this.autoResetController.clear();
         this.dispatch('reset', {});
     }
     //----------------------------------------------------
     // TrackController delegate methods
     //----------------------------------------------------
-    get currentTrack() {
-        return this.trackController.currentTrack;
+    get activeTrack() {
+        return this.trackController.activeTrack;
     }
     get queue() {
         return this.trackController.queue;
@@ -328,7 +412,7 @@ export class VinylPlayer extends EventHostImpl {
      * Listen to {@link VinylPlayerEventMap.fetchedRangesChange} for changes.
      */
     get fetchedRanges() {
-        return this.currentTrack?.fetchedRanges ?? emptyRanges;
+        return this.activeTrack?.fetchedRanges ?? emptyRanges;
     }
     /**
      * Returns the time of the prefetch end.
@@ -356,21 +440,21 @@ export class VinylPlayer extends EventHostImpl {
      * Returns the current content types for active streams.
      */
     get contentTypes() {
-        return this.currentTrack?.contentTypes ?? emptyContentTypes;
+        return this.activeTrack?.contentTypes ?? emptyContentTypes;
     }
     /**
      * The available qualities for the current period of the current track, after filtering.
      * Null if no track is active or the timeline is not yet available.
      */
     get qualities() {
-        return this.currentTrack?.qualities ?? null;
+        return this.activeTrack?.qualities ?? null;
     }
     /**
      * The available unfiltered qualities for the current period of the current track.
      * Null if no track is active or the timeline is not yet available.
      */
     get qualitiesUnfiltered() {
-        return this.currentTrack?.qualitiesUnfiltered ?? null;
+        return this.activeTrack?.qualitiesUnfiltered ?? null;
     }
     /**
      * @deprecated Use `getStreamingQuality('audio')`
@@ -395,19 +479,122 @@ export class VinylPlayer extends EventHostImpl {
      * Note that this does not represent the quality of inactive preloading tracks.
      */
     getStreamingQuality(contentType) {
-        return this.currentTrack?.getStreamingQuality(contentType) ?? null;
+        return this.activeTrack?.getStreamingQuality(contentType) ?? null;
     }
     /**
      * The currently buffering quality, or null if no data is buffered.
      */
     getBufferingQuality(contentType) {
-        return this.currentTrack?.getBufferingQuality(contentType) ?? null;
+        return this.activeTrack?.getBufferingQuality(contentType) ?? null;
     }
     /**
      * The currently playing quality, or null if no media is playing.
      */
     getPlaybackQuality(contentType) {
-        return this.currentTrack?.getPlaybackQuality(contentType) ?? null;
+        return this.activeTrack?.getPlaybackQuality(contentType) ?? null;
+    }
+    //----------------------------------------------------
+    // Text track delegate methods
+    //----------------------------------------------------
+    /**
+     * The list of currently discovered sidecar text tracks for the active
+     * media. Empty when there is no current track or the current track
+     * carries no text.
+     */
+    get textTracks() {
+        return this.activeTrack?.textTrackController?.textTracks ?? [];
+    }
+    /**
+     * The currently active text track, or null if no track is selected.
+     */
+    get activeTextTrack() {
+        return this.activeTrack?.textTrackController?.activeTextTrack ?? null;
+    }
+    /**
+     * Selects the text track with the given id, or clears the active text
+     * track when called with null. No-op when the current track does not
+     * surface text tracks or the id is unknown.
+     */
+    setActiveTextTrack(id) {
+        // activeTrack exposes ReadonlyTrack, but the concrete controller is a
+        // full TextTrackController.
+        const controller = this.deps.trackController.activeTrack
+            ?.textTrackController;
+        controller?.setActiveTextTrack(id);
+    }
+    emitTextTrackChangeEventsFor(previous, current) {
+        // Bridge signals that lack their own redispatched event at track
+        // boundaries. The current track's controller only emits
+        // activeTextTrackChange when a selection is *made*; on becoming current
+        // it never re-announces an already-active selection. That gap surfaces
+        // after an ad break: the content track's caption selection is preserved
+        // and re-rendered by resume() (silently), while the outgoing ad
+        // controller emits a clearing activeTextTrackChange(null) — leaving
+        // consumers that track state via events believing captions are off even
+        // though the (forced or user-selected) content caption is showing. Emit
+        // the current track's active selection so that final state is correct.
+        const prevList = previous?.textTrackController?.textTracks;
+        const curList = current?.textTrackController?.textTracks;
+        if (prevList !== curList) {
+            this.dispatch('textTracksChange', {
+                previous: prevList ?? [],
+                current: curList ?? [],
+            });
+        }
+        const prevActive = previous?.textTrackController?.activeTextTrack ?? null;
+        const curActive = current?.textTrackController?.activeTextTrack ?? null;
+        if (prevActive?.id !== curActive?.id) {
+            this.dispatch('activeTextTrackChange', {
+                previous: prevActive,
+                current: curActive,
+            });
+        }
+    }
+    //----------------------------------------------------
+    // Ad break delegate methods
+    //----------------------------------------------------
+    /**
+     * The current track's ad breaks.
+     *
+     * Listen to {@link AdEventMap.currentTrackAdsChange} for changes.
+     */
+    get currentTrackAds() {
+        return this.deps.adController.currentTrackAds;
+    }
+    /**
+     * The ad break currently containing the playhead, or null when the
+     * playhead is in primary content.
+     *
+     * Listen to {@link AdEventMap.adBreakEntered} and
+     * {@link AdEventMap.adBreakCompleted} for transitions.
+     */
+    get currentAdBreak() {
+        return this.deps.adController.currentAdBreak;
+    }
+    /**
+     * The ad currently playing within the active break, or null when the
+     * playhead is in primary content.
+     *
+     * Listen to {@link AdEventMap.adEntered} and {@link AdEventMap.adCompleted} for transitions.
+     */
+    get currentAd() {
+        return this.deps.adController.currentAd;
+    }
+    /**
+     * Skips the currently playing ad. If there are more ads in the break,
+     * the next ad begins; otherwise the break ends and content resumes.
+     * No-op when no ad break is active.
+     */
+    skipAd() {
+        this.deps.adController.skipAd();
+    }
+    /**
+     * Skips the entire active ad break, advancing past all remaining ads
+     * and resuming content playback.
+     * No-op when no ad break is active.
+     */
+    skipAdBreak() {
+        this.deps.adController.skipAdBreak();
     }
     //----------------------------------------------------
     /**
@@ -447,6 +634,14 @@ export function createVinylPlayer(options, factoryOverrides) {
 function notResetEvent(type) {
     return type !== 'reset';
 }
+/**
+ * The player republishes `loadSpanMeasured` as the attributed `loadSpan`
+ * event rather than redispatching the raw, unattributed measurement.
+ * @param type
+ */
+function notLoadSpanMeasuredEvent(type) {
+    return type !== 'loadSpanMeasured';
+}
 const qualityEventsAndGetters = [
     ['streamingQualityChange', 'getStreamingQuality'],
     ['bufferingQualityChange', 'getBufferingQuality'],

package/dist/types/current/vinyl/createVinylFactories.d.ts

@@ -11,6 +11,7 @@ import type { TrackControllerImplDeps, TrackControllerImplOptions } from '../tra
 import { TrackControllerImpl } from '../track/TrackController';
 import type { VinylPatchOptions } from './VinylPatchOptions';
 import { type QualitySelectorImplOptions } from '../streaming/abr/QualitySelectorImpl';
+import { AdControllerImpl, type AdControllerImplDeps, type AdControllerImplOptions } from '../ad/AdControllerImpl';
 import { type DrmOptions } from '../drm/DrmOptions';
 import { commonEmeFactory } from '../drm/commonEme/CommonEmeFactory';
 import { DrmControllerImpl, type DrmControllerImplDeps } from '../drm/DrmControllerImpl';
@@ -18,8 +19,9 @@ import { LoudnessNormalizationControllerImpl } from '../playback/loudness/Loudne
 import { AutoResetControllerImpl, type AutoResetControllerImplDeps, type AutoResetControllerImplOptions } from '../track/AutoResetController';
 import type { Dependencies, Factories } from '@amazon/vinyl-di';
 import type { ContentStreamingOptions } from '../streaming/ContentStreamingOptions';
-import { type VinylOptions } from '../vinyl/VinylOptions';
+import { type VinylOptions } from './VinylOptions';
 import type { ObservableValue } from '@amazon/vinyl-observable';
+import { defaultAdLoadOptionsResolver } from '../ad/defaultAdLoadOptionsResolver';
 /**
  * Configuration used by the default dependency factories for Vinyl.
  *
@@ -60,6 +62,10 @@ export interface VinylDependencyOptions {
      * Configuration for auto-reset behavior.
      */
     readonly autoReset?: Partial<AutoResetControllerImplOptions>;
+    /**
+     * Configuration for the ad controller.
+     */
+    readonly adController?: Partial<AdControllerImplOptions>;
 }
 /**
  * Creates the dependency factories for a standard player.
@@ -81,22 +87,23 @@ export declare function createVinylFactories(options: VinylDependencyOptions): N
     }) => LoudnessNormalizationControllerImpl;
     capabilities: (deps: CapabilitiesImplDeps) => CapabilitiesImpl;
     requestInterceptor: () => typeof noop;
-    trackFactory: (deps: VinylTrackFactoryDeps) => import("../track/TrackFactory").TrackFactory<import("..").SourceObjectTrackLoadOptions | import("..").SourceTrackLoadOptions | import("..").DashTrackLoadOptions | import("..").HlsTrackLoadOptions>;
+    trackFactory: (deps: VinylTrackFactoryDeps) => import("..").TrackFactory<import("..").SourceObjectTrackLoadOptions | import("..").SourceTrackLoadOptions | import("..").DashTrackLoadOptions | import("..").HlsTrackLoadOptions>;
+    adTrackLoadOptionsProvider: () => typeof defaultAdLoadOptionsResolver;
     trackController: (deps: TrackControllerImplDeps<any>) => TrackControllerImpl<any>;
-    drmKeySystemResolver: () => import("../drm/DrmKeySystemResolver").DrmKeySystemResolver;
+    drmKeySystemResolver: () => import("..").DrmKeySystemResolver;
     drmController: (deps: DrmControllerImplDeps) => DrmControllerImpl;
     commonEme: typeof commonEmeFactory;
     autoResetController: (deps: AutoResetControllerImplDeps) => AutoResetControllerImpl;
-    createDashFactories: (deps: import("../track/dash/createDashFactories").DashFactoryDeps) => (/**
-     * Configuration for segmented streaming tracks (hls / dash).
-     */ loadOptions: import("..").DashTrackLoadOptions) => NoInfer<{
-        contentTypesValue: typeof import("..").createDashContentTypesValue;
+    adController: (deps: AdControllerImplDeps) => AdControllerImpl;
+    createDashFactories: (deps: import("..").DashFactoryDeps) => (loadOptions: import("..").DashTrackLoadOptions) => NoInfer<{
+        baseContentTypesValue: typeof import("..").createDashContentTypesValue;
+        contentTypesValue: typeof import("..").createAllowedContentTypesValue;
         baseUrlSelector: () => import("..").BaseUrlSelector;
         segmentRequestInit: () => import("@amazon/vinyl-util").Maybe<Readonly<Omit<RequestInit, "signal">>>;
         manifestProvider: (deps: {
             readonly requestInterceptor: import("@amazon/vinyl-util").RequestInterceptor;
         }) => import("..").DashManifestProvider;
-        manifestController: (deps: import("..").DashManifestControllerImplDeps) => import("..").DashManifestController;
+        manifestController: (deps: import("..").ManifestControllerImplDeps<import("..").DashManifestData>) => import("..").ManifestControllerImpl<import("..").DashManifestData>;
         mediaSourceFactory: () => typeof import("..").createMediaSource;
         mediaQualityMetadataResolver: (deps: import("..").DashMediaQualityMetadataResolverDeps) => import("..").DashMediaQualityMetadataResolver;
         mediaSourceController: (deps: import("..").MediaSourceControllerImplDeps) => import("..").MediaSourceControllerImpl;
@@ -112,26 +119,44 @@ export declare function createVinylFactories(options: VinylDependencyOptions): N
         contentStreamFactory: typeof import("..").createContentStreamFactory;
         qualitySelector: (deps: {
             options: ObservableValue<Pick<VinylOptions, "abr">>;
-        }) => import("../streaming/abr/QualitySelectorImpl").QualitySelectorImpl;
+        }) => import("..").QualitySelectorImpl;
+        preferredAudioLanguage: (deps: {
+            options: ObservableValue<Pick<VinylOptions, "preferredAudioLanguage">>;
+        }) => ObservableValue<string | readonly string[] | null>;
+        allowedContentTypes: (deps: {
+            options: ObservableValue<Pick<VinylOptions, "allowedContentTypes">>;
+        }) => ObservableValue<readonly import("..").RestrictableContentType[] | null>;
+        preferDescriptiveAudio: (deps: {
+            options: ObservableValue<Pick<VinylOptions, "preferDescriptiveAudio">>;
+        }) => ObservableValue<boolean>;
+        abr: (deps: {
+            options: ObservableValue<Pick<VinylOptions, "abr">>;
+        }) => ObservableValue<QualitySelectorImplOptions>;
         manifestTransformed: typeof import("..").createDefaultDashManifestTransformer;
         mediaTimeline: (deps: import("..").BuildDashMediaTimelineDeps & {
             readonly manifestTransformed: ObservableValue<Promise<import("..").DashManifestData>>;
         }) => ObservableValue<Promise<import("..").MediaTimeline>>;
         mediaTimelineTransformed: typeof import("..").createDefaultMediaTimelineTransformer;
-        options: import("@amazon/vinyl-di").Factory<ObservableValue<{
-            readonly abr: QualitySelectorImplOptions;
-            readonly preferredAudioLanguage: string | null;
-        }>>;
+        textTrackController: (deps: {
+            readonly media: HTMLMediaElement;
+            readonly manifestTransformed: ObservableValue<Promise<import("..").DashManifestData>>;
+            readonly options: ObservableValue<Pick<VinylOptions, "preferredTextLanguage" | "textCueStyle">>;
+        }) => import("..").SidecarTextTrackController;
+        options: import("@amazon/vinyl-di").Factory<ObservableValue<Pick<VinylOptions, "abr" | "preferredAudioLanguage" | "preferredTextLanguage" | "preferDescriptiveAudio" | "allowedContentTypes" | "textCueStyle">>>;
         playbackController: import("@amazon/vinyl-di").Factory<import("..").PlaybackController>;
         playbackSource: import("@amazon/vinyl-di").Factory<import("..").PlaybackSource>;
-        drmKeySystemResolver: import("@amazon/vinyl-di").Factory<import("../drm/DrmKeySystemResolver").DrmKeySystemResolver>;
+        drmKeySystemResolver: import("@amazon/vinyl-di").Factory<import("..").DrmKeySystemResolver>;
         requestInterceptor: import("@amazon/vinyl-di").Factory<import("@amazon/vinyl-util").RequestInterceptor>;
         drmController: import("@amazon/vinyl-di").Factory<import("..").DrmController>;
         capabilities: import("@amazon/vinyl-di").Factory<import("..").Capabilities>;
+        media: import("@amazon/vinyl-di").Factory<HTMLMediaElement>;
+        adController: import("@amazon/vinyl-di").Factory<import("..").AdController>;
     }>;
-    createHlsFactories: (deps: import("../track/hls/createHlsFactories").HlsFactoryDeps) => (loadOptions: import("..").HlsTrackLoadOptions) => NoInfer<{
-        contentTypesValue: typeof import("..").createHlsContentTypesValue;
-        manifestController: () => import("..").HlsManifestControllerImpl;
+    createHlsFactories: (deps: import("..").HlsFactoryDeps) => (loadOptions: import("..").HlsTrackLoadOptions) => NoInfer<{
+        baseContentTypesValue: typeof import("..").createHlsContentTypesValue;
+        contentTypesValue: typeof import("..").createAllowedContentTypesValue;
+        manifestProvider: () => import("..").HlsManifestProvider;
+        manifestController: (deps: import("..").ManifestControllerImplDeps<import("..").HlsManifestData>) => import("..").ManifestControllerImpl<import("..").HlsManifestData>;
         manifestTransformed: typeof import("..").createDefaultHlsManifestTransformer;
         mediaQualityMetadataResolver: () => import("..").HlsMediaQualityMetadataResolver;
         mediaSourceFactory: () => typeof import("..").createMediaSource;
@@ -149,21 +174,37 @@ export declare function createVinylFactories(options: VinylDependencyOptions): N
         contentStreamFactory: typeof import("..").createContentStreamFactory;
         qualitySelector: (deps: {
             options: ObservableValue<Pick<VinylOptions, "abr">>;
-        }) => import("../streaming/abr/QualitySelectorImpl").QualitySelectorImpl;
+        }) => import("..").QualitySelectorImpl;
+        preferredAudioLanguage: (deps: {
+            options: ObservableValue<Pick<VinylOptions, "preferredAudioLanguage">>;
+        }) => ObservableValue<string | readonly string[] | null>;
+        allowedContentTypes: (deps: {
+            options: ObservableValue<Pick<VinylOptions, "allowedContentTypes">>;
+        }) => ObservableValue<readonly import("..").RestrictableContentType[] | null>;
+        preferDescriptiveAudio: (deps: {
+            options: ObservableValue<Pick<VinylOptions, "preferDescriptiveAudio">>;
+        }) => ObservableValue<boolean>;
+        abr: (deps: {
+            options: ObservableValue<Pick<VinylOptions, "abr">>;
+        }) => ObservableValue<QualitySelectorImplOptions>;
         mediaTimeline: (deps: import("..").BuildHlsMediaTimelineDeps & {
             readonly manifestTransformed: ObservableValue<Promise<import("..").HlsManifestData>>;
         }) => ObservableValue<Promise<import("..").MediaTimeline>>;
         mediaTimelineTransformed: typeof import("..").createDefaultMediaTimelineTransformer;
-        options: import("@amazon/vinyl-di").Factory<ObservableValue<{
-            readonly abr: QualitySelectorImplOptions;
-            readonly preferredAudioLanguage: string | null;
-        }>>;
+        textTrackController: (deps: {
+            readonly media: HTMLMediaElement;
+            readonly manifestTransformed: ObservableValue<Promise<import("..").HlsManifestData>>;
+            readonly options: ObservableValue<Pick<VinylOptions, "preferredTextLanguage" | "textCueStyle">>;
+        }) => import("..").SidecarTextTrackController;
+        options: import("@amazon/vinyl-di").Factory<ObservableValue<Pick<VinylOptions, "abr" | "preferredAudioLanguage" | "preferredTextLanguage" | "preferDescriptiveAudio" | "allowedContentTypes" | "textCueStyle">>>;
         playbackController: import("@amazon/vinyl-di").Factory<import("..").PlaybackController>;
         playbackSource: import("@amazon/vinyl-di").Factory<import("..").PlaybackSource>;
-        drmKeySystemResolver: import("@amazon/vinyl-di").Factory<import("../drm/DrmKeySystemResolver").DrmKeySystemResolver>;
+        drmKeySystemResolver: import("@amazon/vinyl-di").Factory<import("..").DrmKeySystemResolver>;
         requestInterceptor: import("@amazon/vinyl-di").Factory<import("@amazon/vinyl-util").RequestInterceptor>;
         drmController: import("@amazon/vinyl-di").Factory<import("..").DrmController>;
         capabilities: import("@amazon/vinyl-di").Factory<import("..").Capabilities>;
+        media: import("@amazon/vinyl-di").Factory<HTMLMediaElement>;
+        adController: import("@amazon/vinyl-di").Factory<import("..").AdController>;
     }>;
 }>;
 /**

package/dist/types/current/vinyl/createVinylFactories.d.ts.map

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

package/dist/types/current/vinyl/createVinylFactories.js

@@ -11,6 +11,7 @@ import { createVinylTrackFactories, } from '../track/createVinylTrackFactories';
 import { TrackControllerImpl } from '../track/TrackController';
 import { createTrackFactory } from '../track/TrackFactory';
 import { defaultPatchOptions } from './VinylPatchOptions';
+import { AdControllerImpl, } from '../ad/AdControllerImpl';
 import { createDashFactories } from '../track/dash/createDashFactories';
 import { createHlsFactories } from '../track/hls/createHlsFactories';
 import { commonEmeFactory } from '../drm/commonEme/CommonEmeFactory';
@@ -19,8 +20,9 @@ import { defaultDrmKeySystemResolver } from '../drm/DrmKeySystemResolver';
 import { LoudnessNormalizationControllerImpl } from '../playback/loudness/LoudnessNormalizationControllerImpl';
 import { AutoResetControllerImpl, } from '../track/AutoResetController';
 import { validateFactories } from '@amazon/vinyl-di';
-import { defaultVinylOptions, vinylOptionsValidator, } from '../vinyl/VinylOptions';
-import { playerConfigFactory } from '../vinyl/playerConfigFactory';
+import { defaultVinylOptions, vinylOptionsValidator, } from './VinylOptions';
+import { playerConfigFactory } from './playerConfigFactory';
+import { defaultAdLoadOptionsResolver } from '../ad/defaultAdLoadOptionsResolver';
 /**
  * Creates the dependency factories for a standard player.
  *
@@ -46,11 +48,13 @@ export function createVinylFactories(options) {
         capabilities: (deps) => new CapabilitiesImpl(deps),
         requestInterceptor: () => noop,
         trackFactory: (deps) => createTrackFactory(createVinylTrackFactories(deps)),
+        adTrackLoadOptionsProvider: () => defaultAdLoadOptionsResolver,
         trackController: (deps) => new TrackControllerImpl(deps, options.trackController),
         drmKeySystemResolver: () => defaultDrmKeySystemResolver,
         drmController: (deps) => new DrmControllerImpl(deps, options.drm),
         commonEme: commonEmeFactory,
         autoResetController: (deps) => new AutoResetControllerImpl(deps, options.autoReset),
+        adController: (deps) => new AdControllerImpl(deps, options.adController),
         createDashFactories: createDashFactories(options),
         createHlsFactories: createHlsFactories(options),
     });