@amazon/vinyl 1.1.1 → 2.0.0

package/dist/types/current/track/hls/HlsTrack.js

@@ -3,11 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { ErrorOrigin } from '@amazon/vinyl-util';
+import { trackLoadOptionsValidator, } from '../TrackFactory';
 import { MseTrack } from '../mse/MseTrack';
-import { func, isOneOf, object, string, } from '@amazon/vinyl-validation';
-import { trackBaseOptionsValidator } from '../TrackBase';
-const loadOptionsValidator = object({
-    config: trackBaseOptionsValidator.maybe().optional(),
+import { func, isOneOf, object, } from '@amazon/vinyl-validation';
+const loadOptionsValidator = trackLoadOptionsValidator.extend({
     manifestProvider: func().maybe().optional(),
     requestInit: object({}).cast().maybe().optional(),
     segmentRequestInit: object({})
@@ -15,7 +14,6 @@ const loadOptionsValidator = object({
         .maybe()
         .optional(),
     type: isOneOf('hls'),
-    uri: string().notEmpty(),
 });
 export function createHlsTrackFactory(deps) {
     return {

package/dist/types/current/track/hls/buildHlsMediaTimeline.d.ts

@@ -1,13 +1,20 @@
-import type { HlsManifestData } from '../../track/hls/HlsManifestProvider';
-import type { HlsMediaQualityMetadataResolver } from '../../track/hls/HlsMediaQualityMetadataResolver';
+import type { HlsManifestData } from './HlsManifestData';
+import type { HlsMediaQualityMetadataResolver } from './HlsMediaQualityMetadataResolver';
 import type { MediaTimeline } from '../../streaming/MediaTimeline';
-import { type CreateSegmentDataProviderDeps } from '../../track/createSegmentDataProvider';
+import { type CreateSegmentDataProviderDeps } from '../createSegmentDataProvider';
 export interface BuildHlsMediaTimelineDeps extends CreateSegmentDataProviderDeps {
     readonly mediaQualityMetadataResolver: HlsMediaQualityMetadataResolver;
 }
 /**
  * Builds a MediaTimeline from an HLS manifest.
  * HLS has a single implicit period spanning the full duration.
+ *
+ * Audio is modeled per source: a variant that carries muxed audio (no separate
+ * AUDIO rendition group) contributes an audio quality on its own playlist, while
+ * a variant with a demuxed audio group contributes video only — one audio
+ * quality is created per AUDIO rendition in the group, each carrying that
+ * rendition's language and playlist. Modeling every language as its own audio
+ * quality is what lets the timeline's language filter select among them.
  */
 export declare function buildHlsMediaTimeline(deps: BuildHlsMediaTimelineDeps, data: HlsManifestData): MediaTimeline;
 //# sourceMappingURL=buildHlsMediaTimeline.d.ts.map

package/dist/types/current/track/hls/buildHlsMediaTimeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildHlsMediaTimeline.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/buildHlsMediaTimeline.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACtE,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6CAA6C,CAAA;AAKlG,OAAO,KAAK,EAGR,aAAa,EAChB,MAAM,2BAA2B,CAAA;AAOlC,OAAO,EAEH,KAAK,6BAA6B,EACrC,MAAM,mCAAmC,CAAA;AAI1C,MAAM,WAAW,yBAA0B,SAAQ,6BAA6B;IAC5E,QAAQ,CAAC,4BAA4B,EAAE,+BAA+B,CAAA;CACzE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACjC,IAAI,EAAE,yBAAyB,EAC/B,IAAI,EAAE,eAAe,GACtB,aAAa,CAuJf"}
+{"version":3,"file":"buildHlsMediaTimeline.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/buildHlsMediaTimeline.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAA;AAKxF,OAAO,KAAK,EAGR,aAAa,EAChB,MAAM,+BAA+B,CAAA;AAOtC,OAAO,EAEH,KAAK,6BAA6B,EACrC,MAAM,8BAA8B,CAAA;AAMrC,MAAM,WAAW,yBAA0B,SAAQ,6BAA6B;IAC5E,QAAQ,CAAC,4BAA4B,EAAE,+BAA+B,CAAA;CACzE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACjC,IAAI,EAAE,yBAAyB,EAC/B,IAAI,EAAE,eAAe,GACtB,aAAa,CAsIf"}

package/dist/types/current/track/hls/buildHlsMediaTimeline.js

@@ -2,25 +2,34 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { buildSegmentTimeline } from '../../track/hls/util/hlsSegmentTime';
+import { buildSegmentTimeline } from './util/hlsSegmentTime';
 import { getSegmentAtTime } from '../../streaming/util/segment';
 import { resolveUrl } from '@amazon/vinyl-util';
-import { codecToContentType, contentTypeToMimeType } from '../../track/mse/codec';
-import { createSegmentDataProvider, } from '../../track/createSegmentDataProvider';
-import { hlsByteRangeToMediaRange } from '../../track/hls/util/hlsByteRangeToMediaRange';
+import { codecToContentType, contentTypeToMimeType } from '../mse/codec';
+import { createSegmentDataProvider, } from '../createSegmentDataProvider';
+import { hlsByteRangeToMediaRange } from './util/hlsByteRangeToMediaRange';
 import { createTransmuxer } from '@amazon/vinyl-transmux';
+import { discoverHlsInterstitials } from '../../ad/discoverHlsInterstitials';
 /**
  * Builds a MediaTimeline from an HLS manifest.
  * HLS has a single implicit period spanning the full duration.
+ *
+ * Audio is modeled per source: a variant that carries muxed audio (no separate
+ * AUDIO rendition group) contributes an audio quality on its own playlist, while
+ * a variant with a demuxed audio group contributes video only — one audio
+ * quality is created per AUDIO rendition in the group, each carrying that
+ * rendition's language and playlist. Modeling every language as its own audio
+ * quality is what lets the timeline's language filter select among them.
  */
 export function buildHlsMediaTimeline(deps, data) {
     const { mainPlaylist, baseUrl } = data;
     const renditions = mainPlaylist.alternativeRenditions;
+    const audioRenditions = renditions.filter((r) => r.type === 'AUDIO');
     // HLS duration requires fetching a media playlist, so compute it lazily.
     const DEFAULT_MIN_BUFFER_TIME = 10;
-    const qualities = mainPlaylist.variants.flatMap((variant) => {
+    const qualities = [];
+    for (const variant of mainPlaylist.variants) {
         const baseMetadata = deps.mediaQualityMetadataResolver(variant, renditions);
-        // Determine which content types this variant carries.
         const codecs = variant.codecs?.split(',') ?? [];
         const contentTypes = new Set(codecs
             .map((c) => codecToContentType(c))
@@ -28,77 +37,68 @@ export function buildHlsMediaTimeline(deps, data) {
         // If no codecs, default to audio (e.g. TS streams).
         if (contentTypes.size === 0)
             contentTypes.add('audio');
-        // Create one quality per content type, with narrowed mimeType.
-        return [...contentTypes].map((contentType) => {
+        const hasDemuxedAudio = variant.audioGroup != null &&
+            audioRenditions.some((r) => r.groupId === variant.audioGroup && r.uri != null);
+        // One quality per content type this variant delivers itself.
+        for (const contentType of contentTypes) {
+            // Demuxed audio is delivered by its rendition group (built below as
+            // one quality per language), not by the video variant's playlist.
+            if (contentType === 'audio' && hasDemuxedAudio)
+                continue;
             const codec = codecs.find((c) => codecToContentType(c) === contentType) ??
                 null;
-            const metadata = {
+            qualities.push(createHlsQualityData(deps, data, baseUrl, variant.uri, {
                 ...baseMetadata,
                 contentType,
                 mimeType: contentTypeToMimeType(contentType, codec),
                 codecs: codec,
-            };
-            const transmuxer = createTransmuxer();
-            return {
-                metadata,
-                async getSegment(time, affordance = 0) {
-                    // For an audio quality on a variant that also carries video,
-                    // the audio is delivered through a separate rendition group
-                    // (variant URI is video-only). Use the rendition URI in that
-                    // case. Otherwise the variant URI itself contains the audio.
-                    let playlistUri = variant.uri;
-                    if (metadata.contentType === 'audio' &&
-                        variant.audioGroup &&
-                        contentTypes.has('video')) {
-                        const rendition = renditions.find((r) => r.type === 'AUDIO' &&
-                            r.groupId === variant.audioGroup &&
-                            r.uri);
-                        if (rendition?.uri)
-                            playlistUri = rendition.uri;
-                    }
-                    const playlist = await data.getMediaPlaylist(playlistUri);
-                    const playlistBaseUrl = resolveUrl(playlistUri, baseUrl);
-                    const segments = buildSegmentTimeline(deps, playlistBaseUrl, playlist.segments);
-                    const segment = getSegmentAtTime(time, segments, affordance);
-                    if (!segment)
-                        return null;
-                    // fMP4: use #EXT-X-MAP init segment directly.
-                    const hlsMap = playlist.segments[0]?.map;
-                    if (hlsMap) {
-                        return {
-                            quality: metadata,
-                            ...segment,
-                            initData: createSegmentDataProvider(deps, {
-                                url: resolveUrl(hlsMap.uri, playlistBaseUrl),
-                                mediaRange: hlsMap.byteRange
-                                    ? hlsByteRangeToMediaRange(hlsMap.byteRange)
-                                    : undefined,
-                                reportDownlinkMetrics: false,
-                            }),
-                        };
-                    }
-                    // MPEG-TS/ADTS: transmux to fMP4.
-                    const transmuxedQuality = {
-                        ...metadata,
-                        mimeType: contentTypeToMimeType(metadata.contentType, metadata.codecs),
-                    };
-                    const rawDataProvider = segment.data;
-                    return {
-                        quality: transmuxedQuality,
-                        ...segment,
-                        data: async (abort) => {
-                            const raw = await rawDataProvider(abort);
-                            return transmuxer.transmux(raw).mediaSegment;
-                        },
-                        initData: async (abort) => {
-                            const raw = await rawDataProvider(abort);
-                            return transmuxer.transmux(raw).initSegment;
-                        },
-                    };
-                },
-            };
-        });
-    });
+            }));
+        }
+    }
+    // One audio quality per demuxed audio rendition (per language), so the
+    // media-timeline language filter can select among them.
+    const seenAudio = new Set();
+    for (const rendition of audioRenditions) {
+        const uri = rendition.uri;
+        if (uri == null || seenAudio.has(uri))
+            continue;
+        seenAudio.add(uri);
+        // Prefer the variant whose own playlist IS this rendition: its CODECS
+        // then describes this exact audio, the only reliable per-rendition codec
+        // for a mixed-codec group (one group referenced by variants of differing
+        // codecs). Fall back to any variant referencing the group for the common
+        // demuxed case where the variant playlist is video and every group
+        // variant shares one audio codec.
+        const variant = mainPlaylist.variants.find((v) => v.uri === uri) ??
+            mainPlaylist.variants.find((v) => v.audioGroup === rendition.groupId);
+        // A rendition neither self-described by a variant nor referenced by one
+        // has no codec to play with.
+        if (!variant)
+            continue;
+        const audioCodec = variant.codecs
+            ?.split(',')
+            .find((c) => codecToContentType(c) === 'audio') ?? null;
+        const baseMetadata = deps.mediaQualityMetadataResolver(variant, renditions);
+        // Disambiguate renditions that share a group and language (e.g. a main
+        // and an audio-description track) by their unique NAME, so their
+        // qualityIds don't collide.
+        const qualitySuffix = rendition.language
+            ? `${rendition.language}-${rendition.name}`
+            : rendition.name;
+        qualities.push(createHlsQualityData(deps, data, baseUrl, uri, {
+            ...baseMetadata,
+            qualityId: `audio-${rendition.groupId}-${qualitySuffix}`,
+            decoderId: uri,
+            contentType: 'audio',
+            codecs: audioCodec,
+            mimeType: contentTypeToMimeType('audio', audioCodec),
+            width: null,
+            height: null,
+            frameRate: null,
+            lang: rendition.language ?? null,
+            characteristics: rendition.characteristics ?? [],
+        }));
+    }
     const period = {
         startTime: 0,
         endTime: Infinity,
@@ -108,22 +108,91 @@ export function buildHlsMediaTimeline(deps, data) {
     return {
         periods: [period],
         minBufferTime: DEFAULT_MIN_BUFFER_TIME,
+        getAdBreaks: () => discoverAdsFromManifest(data),
         async getDuration() {
             if (cachedDuration != null)
                 return cachedDuration;
-            if (mainPlaylist.variants.length === 0)
-                return null;
-            try {
-                const playlist = await data.getMediaPlaylist(mainPlaylist.variants[0].uri);
-                let total = 0;
-                for (const seg of playlist.segments)
-                    total += seg.duration;
-                cachedDuration = total > 0 ? total : null;
+            if (mainPlaylist.variants.length === 0) {
+                throw new Error('Unable to determine HLS duration: no variants');
             }
-            catch {
-                return null;
+            const playlist = await data.getMediaPlaylist(mainPlaylist.variants[0].uri);
+            // Live playlists (no EXT-X-ENDLIST) have unbounded duration.
+            if (!playlist.ended)
+                return Infinity;
+            if (playlist.segments.length === 0) {
+                throw new Error('Unable to determine HLS duration: no segments in media playlist');
             }
+            let total = 0;
+            for (const seg of playlist.segments)
+                total += seg.duration;
+            cachedDuration = total;
             return cachedDuration;
         },
     };
 }
+/**
+ * Builds the {@link MediaQualityData} for one HLS quality: its metadata plus a
+ * getSegment that fetches from `playlistUri` (the variant playlist for video/
+ * muxed qualities, or a rendition playlist for demuxed audio) and either serves
+ * fMP4 directly (using its EXT-X-MAP init segment) or transmuxes MPEG-TS/ADTS.
+ */
+function createHlsQualityData(deps, data, baseUrl, playlistUri, metadata) {
+    const transmuxer = createTransmuxer();
+    return {
+        metadata,
+        async getSegment(time, affordance = 0) {
+            const playlist = await data.getMediaPlaylist(playlistUri);
+            const playlistBaseUrl = resolveUrl(playlistUri, baseUrl);
+            const segments = buildSegmentTimeline(deps, playlistBaseUrl, playlist.segments);
+            const segment = getSegmentAtTime(time, segments, affordance);
+            if (!segment)
+                return null;
+            // fMP4: use #EXT-X-MAP init segment directly.
+            const hlsMap = playlist.segments[0]?.map;
+            if (hlsMap) {
+                return {
+                    quality: metadata,
+                    ...segment,
+                    initData: createSegmentDataProvider(deps, {
+                        url: resolveUrl(hlsMap.uri, playlistBaseUrl),
+                        mediaRange: hlsMap.byteRange
+                            ? hlsByteRangeToMediaRange(hlsMap.byteRange)
+                            : undefined,
+                        reportDownlinkMetrics: false,
+                    }),
+                };
+            }
+            // MPEG-TS/ADTS: transmux to fMP4.
+            const transmuxedQuality = {
+                ...metadata,
+                mimeType: contentTypeToMimeType(metadata.contentType, metadata.codecs),
+            };
+            const rawDataProvider = segment.data;
+            return {
+                quality: transmuxedQuality,
+                ...segment,
+                data: async (abort) => {
+                    const raw = await rawDataProvider(abort);
+                    return transmuxer.transmux(raw).mediaSegment;
+                },
+                initData: async (abort) => {
+                    const raw = await rawDataProvider(abort);
+                    return transmuxer.transmux(raw).initSegment;
+                },
+            };
+        },
+    };
+}
+async function discoverAdsFromManifest(data) {
+    if (data.mainPlaylist.variants.length === 0)
+        return [];
+    // Use the first variant for the date range timeline
+    // https://gist.github.com/bkataru/1fb67181ddf0edfc60c04f6f02518e74?utm_source=chatgpt.com#file-hls-specification-txt-L3449
+    const variant = data.mainPlaylist.variants[0];
+    const media = await data.getMediaPlaylist(variant.uri);
+    const contentDuration = media.ended
+        ? media.segments.reduce((sum, s) => sum + s.duration, 0)
+        : null;
+    const playlistBaseUrl = resolveUrl(variant.uri, data.baseUrl);
+    return discoverHlsInterstitials(media, playlistBaseUrl, contentDuration);
+}

package/dist/types/current/track/hls/createDefaultHlsManifestTransformer.d.ts

@@ -1,5 +1,5 @@
 import type { ObservableValue } from '@amazon/vinyl-observable';
-import type { HlsManifestData } from '../../track/hls/HlsManifestProvider';
+import type { HlsManifestData } from './HlsManifestData';
 export interface HlsManifestTransformerDeps {
     readonly manifestController: ObservableValue<Promise<HlsManifestData>>;
 }

package/dist/types/current/track/hls/createDefaultHlsManifestTransformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDefaultHlsManifestTransformer.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createDefaultHlsManifestTransformer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAEtE,MAAM,WAAW,0BAA0B;IACvC,QAAQ,CAAC,kBAAkB,EAAE,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAA;CACzE;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CAC/C,IAAI,EAAE,0BAA0B,GACjC,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAc3C"}
+{"version":3,"file":"createDefaultHlsManifestTransformer.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createDefaultHlsManifestTransformer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAExD,MAAM,WAAW,0BAA0B;IACvC,QAAQ,CAAC,kBAAkB,EAAE,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAA;CACzE;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CAC/C,IAAI,EAAE,0BAA0B,GACjC,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAc3C"}

package/dist/types/current/track/hls/createHlsContentStreamFactories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createHlsContentStreamFactories.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createHlsContentStreamFactories.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACxF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EACH,0BAA0B,EAC1B,KAAK,8BAA8B,EACtC,MAAM,8CAA8C,CAAA;AACrD,OAAO,EACH,uBAAuB,EACvB,KAAK,2BAA2B,EACnC,MAAM,2CAA2C,CAAA;AAClD,OAAO,EACH,qBAAqB,EACrB,KAAK,yBAAyB,EACjC,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,oBAAoB,CAAA;AAMxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAA;AAClF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAE9D,MAAM,WAAW,yBAAyB;IACtC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAA;IACrD,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAA;IAC/C,QAAQ,CAAC,wBAAwB,EAAE,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA;IAC1E,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAA;CAC5C;AAED,wBAAgB,+BAA+B,CAC3C,OAAO,EAAE,KAAK,CAAC,uBAAuB,CAAC,IAE/B,MAAM,yBAAyB,oEAEjB,WAAW;0CAIN,8BAA8B;gCAEb,2BAA2B;8BAM7B,yBAAyB;;;;;IAUtE"}
+{"version":3,"file":"createHlsContentStreamFactories.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createHlsContentStreamFactories.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAA;AACvE,OAAO,EACH,0BAA0B,EAC1B,KAAK,8BAA8B,EACtC,MAAM,kDAAkD,CAAA;AACzD,OAAO,EACH,uBAAuB,EACvB,KAAK,2BAA2B,EACnC,MAAM,+CAA+C,CAAA;AACtD,OAAO,EACH,qBAAqB,EACrB,KAAK,yBAAyB,EACjC,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,oBAAoB,CAAA;AAMxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAA;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAElE,MAAM,WAAW,yBAAyB;IACtC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAA;IACrD,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAA;IAC/C,QAAQ,CAAC,wBAAwB,EAAE,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA;IAC1E,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAA;CAC5C;AAED,wBAAgB,+BAA+B,CAC3C,OAAO,EAAE,KAAK,CAAC,uBAAuB,CAAC,IAE/B,MAAM,yBAAyB,oEAEjB,WAAW;0CAIN,8BAA8B;gCAEb,2BAA2B;8BAM7B,yBAAyB;;;;;IAUtE"}

package/dist/types/current/track/hls/createHlsContentTypesValue.d.ts

@@ -1,6 +1,6 @@
 import type { ContentTypesValue } from '../../streaming/ContentTypesValue';
 import type { ObservableValue } from '@amazon/vinyl-observable';
-import type { HlsManifestData } from './HlsManifestProvider';
+import type { HlsManifestData } from './HlsManifestData';
 export interface HlsContentTypesValueDeps {
     readonly manifestTransformed: ObservableValue<Promise<HlsManifestData>>;
 }

package/dist/types/current/track/hls/createHlsContentTypesValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createHlsContentTypesValue.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createHlsContentTypesValue.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAI5D,MAAM,WAAW,wBAAwB;IACrC,QAAQ,CAAC,mBAAmB,EAAE,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAA;CAC1E;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACtC,IAAI,EAAE,wBAAwB,GAC/B,iBAAiB,CAInB"}
+{"version":3,"file":"createHlsContentTypesValue.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createHlsContentTypesValue.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAIxD,MAAM,WAAW,wBAAwB;IACrC,QAAQ,CAAC,mBAAmB,EAAE,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAA;CAC1E;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACtC,IAAI,EAAE,wBAAwB,GAC/B,iBAAiB,CAInB"}

package/dist/types/current/track/hls/createHlsFactories.d.ts

@@ -1,10 +1,11 @@
 import type { HlsTrackLoadOptions } from './HlsTrack';
 import type { Maybe, RequestInterceptor } from '@amazon/vinyl-util';
+import type { AdController } from '../../ad/AdController';
 import { createMediaSource } from '../../util/media/mediaSource';
 import { MediaSourceControllerImpl, type MediaSourceControllerImplDeps } from '../../streaming/buffering/MediaSourceController';
-import { HlsManifestControllerImpl } from './HlsManifestController';
 import type { ContentStreamingOptions } from '../../streaming/ContentStreamingOptions';
 import { createHlsContentTypesValue } from './createHlsContentTypesValue';
+import { createAllowedContentTypesValue } from '../../streaming/createAllowedContentTypesValue';
 import { createContentStreamFactory } from '../../streaming/ContentStream';
 import type { ObservableValue } from '@amazon/vinyl-observable';
 import type { PlaybackController } from '../../playback/PlaybackController';
@@ -12,31 +13,41 @@ import type { DrmKeySystemResolver } from '../../drm/DrmKeySystemResolver';
 import type { DrmController } from '../../drm/DrmController';
 import type { Capabilities } from '../../client/Capabilities';
 import type { PlaybackSource } from '../../playback/PlaybackSource';
-import type { QualitySelectorImplOptions } from '../../streaming/abr/QualitySelectorImpl';
 import { QualitySelectorImpl } from '../../streaming/abr/QualitySelectorImpl';
 import type { VinylOptions } from '../../vinyl/VinylOptions';
 import { createDefaultHlsManifestTransformer } from './createDefaultHlsManifestTransformer';
 import { type BuildHlsMediaTimelineDeps } from './buildHlsMediaTimeline';
 import { createDefaultMediaTimelineTransformer } from '../../streaming/createDefaultMediaTimelineTransformer';
-import type { HlsManifestData } from './HlsManifestProvider';
+import type { HlsManifestData } from './HlsManifestData';
+import { SidecarTextTrackController } from '../../text/SidecarTextTrackController';
+import { ManifestControllerImpl, type ManifestControllerImplDeps } from '../../streaming/ManifestControllerImpl';
 export interface HlsFactoryDeps {
-    readonly options: ObservableValue<{
-        readonly abr: QualitySelectorImplOptions;
-        readonly preferredAudioLanguage: string | null;
-    }>;
+    readonly options: ObservableValue<Pick<VinylOptions, 'abr' | 'preferredAudioLanguage' | 'allowedContentTypes' | 'preferDescriptiveAudio' | 'preferredTextLanguage' | 'textCueStyle'>>;
     readonly playbackController: PlaybackController;
     readonly playbackSource: PlaybackSource;
     readonly drmKeySystemResolver: DrmKeySystemResolver;
     readonly requestInterceptor: RequestInterceptor;
     readonly drmController: DrmController;
     readonly capabilities: Capabilities;
+    /**
+     * The HTML media element. Required to attach sidecar text tracks via
+     * `media.addTextTrack`.
+     */
+    readonly media: HTMLMediaElement;
+    /**
+     * The player-level ad controller. MseTrack sets discovered ad breaks on it
+     * when the media timeline resolves.
+     */
+    readonly adController: AdController;
 }
 export type HlsInitOptions = {
     readonly streaming?: Maybe<ContentStreamingOptions>;
 };
 export declare function createHlsFactories(options: Maybe<HlsInitOptions>): (deps: HlsFactoryDeps) => (loadOptions: HlsTrackLoadOptions) => NoInfer<{
-    contentTypesValue: typeof createHlsContentTypesValue;
-    manifestController: () => HlsManifestControllerImpl;
+    baseContentTypesValue: typeof createHlsContentTypesValue;
+    contentTypesValue: typeof createAllowedContentTypesValue;
+    manifestProvider: () => import("./createHlsManifestProvider").HlsManifestProvider;
+    manifestController: (deps: ManifestControllerImplDeps<HlsManifestData>) => ManifestControllerImpl<HlsManifestData>;
     manifestTransformed: typeof createDefaultHlsManifestTransformer;
     mediaQualityMetadataResolver: () => import("./HlsMediaQualityMetadataResolver").HlsMediaQualityMetadataResolver;
     mediaSourceFactory: () => typeof createMediaSource;
@@ -55,19 +66,35 @@ export declare function createHlsFactories(options: Maybe<HlsInitOptions>): (dep
     qualitySelector: (deps: {
         options: ObservableValue<Pick<VinylOptions, "abr">>;
     }) => 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<import("../..").QualitySelectorImplOptions>;
     mediaTimeline: (deps: BuildHlsMediaTimelineDeps & {
         readonly manifestTransformed: ObservableValue<Promise<HlsManifestData>>;
     }) => ObservableValue<Promise<import("../..").MediaTimeline>>;
     mediaTimelineTransformed: typeof createDefaultMediaTimelineTransformer;
-    options: import("@amazon/vinyl-di").Factory<ObservableValue<{
-        readonly abr: QualitySelectorImplOptions;
-        readonly preferredAudioLanguage: string | null;
-    }>>;
+    textTrackController: (deps: {
+        readonly media: HTMLMediaElement;
+        readonly manifestTransformed: ObservableValue<Promise<HlsManifestData>>;
+        readonly options: ObservableValue<Pick<VinylOptions, "preferredTextLanguage" | "textCueStyle">>;
+    }) => SidecarTextTrackController;
+    options: import("@amazon/vinyl-di").Factory<ObservableValue<Pick<VinylOptions, "abr" | "preferredAudioLanguage" | "preferredTextLanguage" | "preferDescriptiveAudio" | "allowedContentTypes" | "textCueStyle">>>;
     playbackController: import("@amazon/vinyl-di").Factory<PlaybackController>;
     playbackSource: import("@amazon/vinyl-di").Factory<PlaybackSource>;
     drmKeySystemResolver: import("@amazon/vinyl-di").Factory<DrmKeySystemResolver>;
     requestInterceptor: import("@amazon/vinyl-di").Factory<RequestInterceptor>;
     drmController: import("@amazon/vinyl-di").Factory<DrmController>;
     capabilities: import("@amazon/vinyl-di").Factory<Capabilities>;
+    media: import("@amazon/vinyl-di").Factory<HTMLMediaElement>;
+    adController: import("@amazon/vinyl-di").Factory<AdController>;
 }>;
 //# sourceMappingURL=createHlsFactories.d.ts.map

package/dist/types/current/track/hls/createHlsFactories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createHlsFactories.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createHlsFactories.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAgB,MAAM,YAAY,CAAA;AACnE,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAEhE,OAAO,EACH,yBAAyB,EACzB,KAAK,6BAA6B,EACrC,MAAM,iDAAiD,CAAA;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAOnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAA;AACtF,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;AAEzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAA;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAA;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,mCAAmC,EAAE,MAAM,uCAAuC,CAAA;AAC3F,OAAO,EAEH,KAAK,yBAAyB,EACjC,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,qCAAqC,EAAE,MAAM,uDAAuD,CAAA;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;QAC9B,QAAQ,CAAC,GAAG,EAAE,0BAA0B,CAAA;QACxC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAA;KACjD,CAAC,CAAA;IACF,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAA;IAC/C,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAA;IACvC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAA;IACnD,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAA;IAC/C,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAA;IACrC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;CACtC;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,uBAAuB,CAAC,CAAA;CACtD,CAAA;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,cAAc,CAAC,IACrD,MAAM,cAAc,MAChB,aAAa,mBAAmB;;;;;;kCAuBF,6BAA6B;;;;;;;;;;;;4BAUnC;QACpB,OAAO,EAAE,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAA;KACtD;0BAMS,yBAAyB,GAAG;QAC9B,QAAQ,CAAC,mBAAmB,EAAE,eAAe,CACzC,OAAO,CAAC,eAAe,CAAC,CAC3B,CAAA;KACJ;;;sBA9DC,0BAA0B;yCACP,MAAM,GAAG,IAAI;;;;;;;;GAuErD"}
+{"version":3,"file":"createHlsFactories.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createHlsFactories.ts"],"names":[],"mappings":"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"}

package/dist/types/current/track/hls/createHlsFactories.js

@@ -5,25 +5,31 @@
 import { createMediaSource } from '../../util/media/mediaSource';
 import { createDefaultHlsMediaQualityMetadataResolver } from './HlsMediaQualityMetadataResolver';
 import { MediaSourceControllerImpl, } from '../../streaming/buffering/MediaSourceController';
-import { HlsManifestControllerImpl } from './HlsManifestController';
 import { externalDependencies, validateFactories, } from '@amazon/vinyl-di';
-import { createUrlHlsManifestProvider } from './createUrlHlsManifestProvider';
 import { createHlsContentTypesValue } from './createHlsContentTypesValue';
+import { createAllowedContentTypesValue } from '../../streaming/createAllowedContentTypesValue';
 import { createHlsContentStreamFactories } from './createHlsContentStreamFactories';
 import { createContentStreamFactory } from '../../streaming/ContentStream';
 import { QualitySelectorImpl } from '../../streaming/abr/QualitySelectorImpl';
 import { createDefaultHlsManifestTransformer } from './createDefaultHlsManifestTransformer';
 import { buildHlsMediaTimeline, } from './buildHlsMediaTimeline';
 import { createDefaultMediaTimelineTransformer } from '../../streaming/createDefaultMediaTimelineTransformer';
+import { SidecarTextTrackController } from '../../text/SidecarTextTrackController';
+import { discoverHlsTextTracks } from '../../text/discoverHlsTextTracks';
+import { ManifestControllerImpl, } from '../../streaming/ManifestControllerImpl';
+import { createHlsManifestProvider } from './createHlsManifestProvider';
 export function createHlsFactories(options) {
     return (deps) => {
         return (loadOptions) => {
-            const manifestProvider = loadOptions.manifestProvider ||
-                createUrlHlsManifestProvider(loadOptions.uri, loadOptions.requestInit || undefined);
             return validateFactories({
+                // Spreads all player-level deps (including adController) as
+                // external, non-owned dependencies so disposing this track's
+                // container never disposes the shared player-level controllers.
                 ...externalDependencies(deps),
-                contentTypesValue: createHlsContentTypesValue,
-                manifestController: () => new HlsManifestControllerImpl(manifestProvider),
+                baseContentTypesValue: createHlsContentTypesValue,
+                contentTypesValue: createAllowedContentTypesValue,
+                manifestProvider: () => createHlsManifestProvider(loadOptions),
+                manifestController: (deps) => new ManifestControllerImpl(deps),
                 manifestTransformed: createDefaultHlsManifestTransformer,
                 mediaQualityMetadataResolver: () => createDefaultHlsMediaQualityMetadataResolver(),
                 mediaSourceFactory: () => createMediaSource,
@@ -34,11 +40,34 @@ export function createHlsFactories(options) {
                 qualitySelector: (deps) => new QualitySelectorImpl({
                     options: deps.options.pick('abr'),
                 }),
+                preferredAudioLanguage: (deps) => deps.options.pick('preferredAudioLanguage'),
+                allowedContentTypes: (deps) => deps.options.pick('allowedContentTypes'),
+                preferDescriptiveAudio: (deps) => deps.options.pick('preferDescriptiveAudio'),
+                abr: (deps) => deps.options.pick('abr'),
                 mediaTimeline: (deps) => deps.manifestTransformed.map(async (manifestPromise) => {
                     const data = await manifestPromise;
                     return buildHlsMediaTimeline(deps, data);
                 }),
                 mediaTimelineTransformed: createDefaultMediaTimelineTransformer,
+                textTrackController: (deps) => {
+                    const controller = new SidecarTextTrackController({
+                        media: deps.media,
+                        requestInit: loadOptions.requestInit ?? undefined,
+                        preferredTextLanguage: deps.options.pick('preferredTextLanguage'),
+                        cueStyle: deps.options.pick('textCueStyle'),
+                    });
+                    deps.manifestTransformed.onData((manifestPromise) => {
+                        manifestPromise
+                            .then((data) => {
+                            controller.setTextTracks(discoverHlsTextTracks(data.mainPlaylist, data.baseUrl));
+                        })
+                            .catch(() => {
+                            // Manifest errors are surfaced through the
+                            // manifest controller. Don't double-report.
+                        });
+                    });
+                    return controller;
+                },
             });
         };
     };

package/dist/types/current/track/hls/createHlsManifestProvider.d.ts

@@ -0,0 +1,6 @@
+import type { HlsTrackLoadOptions } from './HlsTrack';
+import type { ManifestProvider } from '../../streaming/ManifestController';
+import type { HlsManifestData } from './HlsManifestData';
+export declare function createHlsManifestProvider(loadOptions: HlsTrackLoadOptions): HlsManifestProvider;
+export type HlsManifestProvider = ManifestProvider<HlsManifestData>;
+//# sourceMappingURL=createHlsManifestProvider.d.ts.map

package/dist/types/current/track/hls/createHlsManifestProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createHlsManifestProvider.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createHlsManifestProvider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAA;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAExD,wBAAgB,yBAAyB,CACrC,WAAW,EAAE,mBAAmB,GACjC,mBAAmB,CAQrB;AAED,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAA"}

package/dist/types/current/track/hls/createHlsManifestProvider.js

@@ -0,0 +1,9 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { createUrlHlsManifestProvider } from './createUrlHlsManifestProvider';
+export function createHlsManifestProvider(loadOptions) {
+    return (loadOptions.manifestProvider ||
+        createUrlHlsManifestProvider(loadOptions.uri, loadOptions.requestInit || undefined));
+}

package/dist/types/current/track/hls/createUrlHlsManifestProvider.d.ts

@@ -1,6 +1,6 @@
-import type { MainPlaylist, MediaPlaylist } from '@amazon/vinyl-hls-parser';
+import type { HlsMainPlaylist, HlsMediaPlaylist } from '@amazon/vinyl-hls-parser';
 import type { Maybe, ReadonlyAbort, RequestInitOptions } from '@amazon/vinyl-util';
-import type { HlsManifestProvider } from './HlsManifestProvider';
+import type { HlsManifestProvider } from './createHlsManifestProvider';
 export declare function createUrlHlsManifestProvider(url: string, requestInit?: RequestInitOptions): HlsManifestProvider;
 export interface FetchMediaPlaylistOptions {
     /** The variant URI to resolve against the base URL. */
@@ -8,7 +8,7 @@ export interface FetchMediaPlaylistOptions {
     /** The base URL for resolving relative URIs. */
     readonly baseUrl: string;
     /** Variable definitions from the main playlist. */
-    readonly defines: MainPlaylist['defines'];
+    readonly defines: HlsMainPlaylist['defines'];
     /** Optional request configuration. */
     readonly requestInit?: Maybe<RequestInitOptions>;
     /** Optional abort signal. */
@@ -17,5 +17,5 @@ export interface FetchMediaPlaylistOptions {
 /**
  * Fetches and parses an HLS media playlist from a variant URI.
  */
-export declare function fetchMediaPlaylist(options: FetchMediaPlaylistOptions): Promise<MediaPlaylist>;
+export declare function fetchMediaPlaylist(options: FetchMediaPlaylistOptions): Promise<HlsMediaPlaylist>;
 //# sourceMappingURL=createUrlHlsManifestProvider.d.ts.map

package/dist/types/current/track/hls/createUrlHlsManifestProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createUrlHlsManifestProvider.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createUrlHlsManifestProvider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE3E,OAAO,KAAK,EACR,KAAK,EACL,aAAa,EACb,kBAAkB,EACrB,MAAM,oBAAoB,CAAA;AAE3B,OAAO,KAAK,EAER,mBAAmB,EACtB,MAAM,uBAAuB,CAAA;AAE9B,wBAAgB,4BAA4B,CACxC,GAAG,EAAE,MAAM,EACX,WAAW,CAAC,EAAE,kBAAkB,GACjC,mBAAmB,CA8BrB;AAED,MAAM,WAAW,yBAAyB;IACtC,uDAAuD;IACvD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,gDAAgD;IAChD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,mDAAmD;IACnD,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,CAAA;IACzC,sCAAsC;IACtC,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAChD,6BAA6B;IAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;CACxC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACpC,OAAO,EAAE,yBAAyB,GACnC,OAAO,CAAC,aAAa,CAAC,CAMxB"}
+{"version":3,"file":"createUrlHlsManifestProvider.d.ts","sourceRoot":"","sources":["../../../../../src/track/hls/createUrlHlsManifestProvider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACR,eAAe,EACf,gBAAgB,EACnB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,KAAK,EACR,KAAK,EACL,aAAa,EACb,kBAAkB,EACrB,MAAM,oBAAoB,CAAA;AAG3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAEtE,wBAAgB,4BAA4B,CACxC,GAAG,EAAE,MAAM,EACX,WAAW,CAAC,EAAE,kBAAkB,GACjC,mBAAmB,CAiCrB;AAED,MAAM,WAAW,yBAAyB;IACtC,uDAAuD;IACvD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,gDAAgD;IAChD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,mDAAmD;IACnD,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;IAC5C,sCAAsC;IACtC,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAChD,6BAA6B;IAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;CACxC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACpC,OAAO,EAAE,yBAAyB,GACnC,OAAO,CAAC,gBAAgB,CAAC,CAU3B"}