@amazon/vinyl 1.1.1 → 2.0.0

package/dist/unit/types/current/track/TrackFactory.test.js

@@ -13,32 +13,21 @@ describe('createTrackFactory', () => {
     class MockTrack3 extends MockTrack {
     }
     let trackFactory;
+    function factory(Ctor) {
+        return {
+            validate() { },
+            createTrack(options) {
+                const track = new Ctor();
+                track.uri = options.uri;
+                return track;
+            },
+        };
+    }
     beforeEach(() => {
         trackFactory = createTrackFactory({
-            key1: {
-                validate() { },
-                createTrack(options) {
-                    const track = new MockTrack1();
-                    track.uri = options.uri;
-                    return track;
-                },
-            },
-            key2: {
-                validate() { },
-                createTrack(options) {
-                    const track = new MockTrack2();
-                    track.uri = options.uri;
-                    return track;
-                },
-            },
-            key3: {
-                validate() { },
-                createTrack(options) {
-                    const track = new MockTrack3();
-                    track.uri = options.uri;
-                    return track;
-                },
-            },
+            key1: factory(MockTrack1),
+            key2: factory(MockTrack2),
+            key3: factory(MockTrack3),
         });
     });
     it('maps track type keys to their respective factories', () => {
@@ -60,7 +49,6 @@ describe('createTrackFactory', () => {
         createTrackFactory({
             key1: {
                 validate() { },
-                // valid, key1 is assignable to key1
                 createTrack(_options) {
                     return new MockTrack1();
                 },

package/dist/unit/types/current/track/dash/createDashContentStreamFactories.test.js

@@ -12,7 +12,12 @@ describe('createDashContentStreamFactories', () => {
     let mediaSourceController;
     let playbackController;
     let qualitySelector;
-    const emptyTimeline = { periods: [], minBufferTime: 0 };
+    const emptyTimeline = {
+        periods: [],
+        minBufferTime: 0,
+        getAdBreaks: () => Promise.resolve([]),
+        getDuration: () => Promise.resolve(Infinity),
+    };
     beforeEach(() => {
         mediaSourceController = new MockMediaSourceController();
         playbackController = new MockPlaybackController();

package/dist/unit/types/current/track/dash/createDashFactories.test.js

@@ -2,8 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { createDashFactories, DashManifestControllerImpl, MediaSourceControllerImpl, pickFirstBaseUrlSelector, QualitySelectorImpl, } from '@amazon/vinyl';
+import { createDashFactories, ManifestControllerImpl, MediaSourceControllerImpl, pickFirstBaseUrlSelector, QualitySelectorImpl, } from '@amazon/vinyl';
 import { createMockVinylDependencies, mockDashManifest, } from '@amazon/vinyl/vinylTestUtil';
+import { parseDashManifest } from '@amazon/vinyl-mpd-parser';
 import { createContainer } from '@amazon/vinyl-di';
 import { MockMediaSource, MockMediaSourceGlobal, } from '@amazon/vinyl-util/browserTestUtil';
 import { clone } from '@amazon/vinyl-util';
@@ -50,7 +51,7 @@ describe('createDashFactories', () => {
             baseUrlSelector: pickFirstBaseUrlSelector,
             segmentRequestInit: undefined,
             manifestProvider: any(Function),
-            manifestController: any(DashManifestControllerImpl),
+            manifestController: any(ManifestControllerImpl),
             mediaSourceFactory: any(Function),
             mediaQualityMetadataResolver: any(Function),
             mediaSourceController: any(MediaSourceControllerImpl),
@@ -59,6 +60,20 @@ describe('createDashFactories', () => {
             qualitySelector: any(QualitySelectorImpl),
         }));
     });
+    it('wires per-track option observables from the player options', () => {
+        const factoryCreator = createDashFactories(null);
+        const factories = factoryCreator(dashFactoryDeps)({
+            uri: 'test://manifest.mpd',
+            type: 'dash',
+            manifestProvider,
+        });
+        const deps = createContainer(factories).dependencies;
+        const options = dashFactoryDeps.options.value;
+        expect(deps.preferredAudioLanguage.value).toBe(options.preferredAudioLanguage);
+        expect(deps.allowedContentTypes.value).toBe(options.allowedContentTypes);
+        expect(deps.preferDescriptiveAudio.value).toBe(options.preferDescriptiveAudio);
+        expect(deps.abr.value).toBe(options.abr);
+    });
     it('provides streaming options to createContentStreamFactories', () => {
         const factoryCreator = createDashFactories({
             streaming: {
@@ -75,4 +90,50 @@ describe('createDashFactories', () => {
         const deps = createContainer(factories).dependencies;
         expect(deps.contentStreamFactory('audio')).toEqual(any(Object));
     });
+    it('creates a sidecar text track controller and populates from manifest', async () => {
+        const factoryCreator = createDashFactories(null);
+        const subtitleManifestXml = `<?xml version="1.0" encoding="UTF-8"?>
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" type="static" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" mediaPresentationDuration="PT60S" minBufferTime="PT2S">
+  <Period>
+    <AdaptationSet contentType="audio" mimeType="audio/mp4" codecs="mp4a.40.2">
+      <Representation id="aud" bandwidth="128000"/>
+    </AdaptationSet>
+    <AdaptationSet contentType="text" mimeType="text/vtt" lang="en">
+      <Representation id="en-sub" bandwidth="100">
+        <BaseURL>subs/en.vtt</BaseURL>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>`;
+        const manifest = parseDashManifest(subtitleManifestXml);
+        const provider = createSpy('subtitleProvider').and.resolveTo({
+            manifest,
+            baseUrl: 'https://example.com/dash/',
+        });
+        const factories = factoryCreator(dashFactoryDeps)({
+            uri: 'test://manifest.mpd',
+            type: 'dash',
+            manifestProvider: provider,
+        });
+        const deps = createContainer(factories).dependencies;
+        const ttc = deps.textTrackController;
+        await deps.manifestTransformed.value;
+        await new Promise((r) => setTimeout(r, 0));
+        expect(ttc).toBeDefined();
+        expect(ttc.textTracks.length).toBeGreaterThan(0);
+    });
+    it('text track controller swallows manifest fetch errors', async () => {
+        const factoryCreator = createDashFactories(null);
+        const provider = createSpy('failing').and.rejectWith(new Error('manifest down'));
+        const factories = factoryCreator(dashFactoryDeps)({
+            uri: 'test://manifest.mpd',
+            type: 'dash',
+            manifestProvider: provider,
+        });
+        const deps = createContainer(factories).dependencies;
+        const controller = deps.textTrackController;
+        await deps.manifestTransformed.value.catch(() => undefined);
+        await new Promise((r) => setTimeout(r, 0));
+        expect(controller.textTracks).toEqual([]);
+    });
 });

package/dist/unit/types/current/track/dash/createSegmentControllerFactory.test.js

@@ -9,7 +9,12 @@ var objectContaining = jasmine.objectContaining;
 describe('createSegmentControllerFactory', () => {
     it('creates SegmentControllerImpl with merged dependencies', () => {
         const playbackController = new MockPlaybackController();
-        const emptyTimeline = { periods: [], minBufferTime: 0 };
+        const emptyTimeline = {
+            periods: [],
+            minBufferTime: 0,
+            getAdBreaks: () => Promise.resolve([]),
+            getDuration: () => Promise.resolve(Infinity),
+        };
         const factory = createSegmentControllerFactory({ playbackController }, 'audio', { prefetchActive: 100 });
         const controller = factory({
             mediaTimelineTransformed: data(Promise.resolve(emptyTimeline)),

package/dist/unit/types/current/track/dash/util/mpd.test.js

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { calculateDuration, calculatePeriodEnd, calculatePeriodStart, calculatePeriodTimeRange, flattenRepresentations, getPeriodAtTime, getRepresentationAncestry, getSegmentBase, getSegmentList, getSegmentTemplate, sampleToMpdTime, } from '@amazon/vinyl';
+import { calculateDuration, calculatePeriodEnd, calculatePeriodStart, calculatePeriodTimeRange, flattenMediaRepresentations, flattenRepresentations, getPeriodAtTime, getRepresentationAncestry, getSegmentBase, getSegmentList, getSegmentTemplate, sampleToMpdTime, } from '@amazon/vinyl';
 import { clone, toJson } from '@amazon/vinyl-util';
 import { parseDashManifest } from '@amazon/vinyl-mpd-parser';
 import { mockDashManifest } from '@amazon/vinyl/vinylTestUtil';
@@ -288,6 +288,29 @@ describe('mpd utils', () => {
             ]));
         });
     });
+    describe('flattenMediaRepresentations', () => {
+        it('excludes text adaptation sets, keeping audio and video', () => {
+            // language=XML
+            const manifest = parseDashManifest(`<?xml version="1.0" ?>
+                <MPD minBufferTime="PT0S" profiles="" xmlns="urn:mpeg:dash:schema:mpd:2011">
+                    <Period>
+                        <AdaptationSet contentType="video" mimeType="video/mp4">
+                            <Representation bandwidth="3285092" codecs="avc1.640028" id="v0"/>
+                        </AdaptationSet>
+                        <AdaptationSet contentType="audio" mimeType="audio/mp4">
+                            <Representation bandwidth="128000" codecs="mp4a.40.2" id="a0"/>
+                        </AdaptationSet>
+                        <AdaptationSet contentType="text" mimeType="text/vtt" lang="en">
+                            <Representation bandwidth="100" id="text-en">
+                                <BaseURL>subs/en.vtt</BaseURL>
+                            </Representation>
+                        </AdaptationSet>
+                    </Period>
+                </MPD>`);
+            const ids = flattenMediaRepresentations(manifest.MPD.Period[0]).map((r) => r.id);
+            expect(ids).toEqual(['v0', 'a0']);
+        });
+    });
     describe('calculateDuration', () => {
         describe('when MPD.mediaPresentationDuration is set', () => {
             it('resolves to MPD.mediaPresentationDuration', () => {
@@ -308,5 +331,34 @@ describe('mpd utils', () => {
                 expect(calculateDuration(manifest)).toBe(50);
             });
         });
+        describe('when MPD type is dynamic', () => {
+            it('returns Infinity for live presentations', () => {
+                // language=XML
+                const manifest = parseDashManifest(`<?xml version="1.0" ?>
+<MPD type="dynamic" minBufferTime="PT0.0S" profiles="urn:mpeg:dash:profile:isoff-live:2011" xmlns="urn:mpeg:dash:schema:mpd:2011">
+  <Period/>
+</MPD>`);
+                expect(calculateDuration(manifest)).toBe(Infinity);
+            });
+        });
+        describe('when there are no periods', () => {
+            it('throws', () => {
+                const manifest = clone(mockDashManifest);
+                delete manifest.MPD
+                    .mediaPresentationDuration;
+                manifest.MPD.Period = [];
+                expect(() => calculateDuration(manifest)).toThrowError(/no periods/i);
+            });
+        });
+        describe('when the last period has no determinable end', () => {
+            it('throws', () => {
+                // language=XML
+                const manifest = parseDashManifest(`<?xml version="1.0" ?>
+<MPD minBufferTime="PT0.0S" profiles="urn:mpeg:dash:profile:isoff-live:2011" xmlns="urn:mpeg:dash:schema:mpd:2011">
+  <Period/>
+</MPD>`);
+                expect(() => calculateDuration(manifest)).toThrowError(/Unable to determine/);
+            });
+        });
     });
 });

package/dist/unit/types/current/track/hls/HlsManifestController.test.js

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Deferred } from '@amazon/vinyl-util';
-import { HlsManifestControllerImpl } from '@amazon/vinyl';
+import { ManifestControllerImpl } from '@amazon/vinyl';
 import { mockHlsManifestData } from '@amazon/vinyl/vinylTestUtil';
 import { expectNothing, flushPromises, } from '@amazon/vinyl-util/browserTestUtil';
 var createSpy = jasmine.createSpy;
@@ -14,15 +14,15 @@ describe('HlsManifestController', () => {
         manifestProvider.and.resolveTo(mockHlsManifestData);
     });
     function createManifestController() {
-        return new HlsManifestControllerImpl(manifestProvider);
+        return new ManifestControllerImpl({ manifestProvider });
     }
     it('has a toStringTag', () => {
         const controller = createManifestController();
-        expect(String(controller)).toContain('HlsManifestControllerImpl');
+        expect(String(controller)).toContain('ManifestControllerImpl');
     });
     it('has a logPrefix', () => {
         const controller = createManifestController();
-        expect(controller.logPrefix).toBe('HlsManifestControllerImpl');
+        expect(controller.logPrefix).toBe('ManifestControllerImpl');
     });
     describe('refresh', () => {
         it('reloads the manifest', () => {

package/dist/unit/types/current/track/hls/HlsMediaQualityMetadataResolver.test.js

@@ -88,11 +88,13 @@ describe('HlsMediaQualityMetadataResolver', () => {
         const quality = resolver(variant({ frameRate: undefined }), []);
         expect(quality.frameRate).toBeNull();
     });
-    it('sets lang from matching audio rendition', () => {
+    it('does not set a language (audio language is resolved per rendition)', () => {
+        // The variant metadata is language-agnostic; buildHlsMediaTimeline
+        // creates one audio quality per rendition carrying its own language.
         const quality = resolver(variant({ audioGroup: 'aud1' }), [
             audioRendition({ groupId: 'aud1', language: 'fr' }),
         ]);
-        expect(quality.lang).toBe('fr');
+        expect(quality.lang).toBeNull();
     });
     it('sets lang to null when no matching rendition', () => {
         const quality = resolver(variant({ audioGroup: 'aud1' }), [