shaka-player 4.4.2 → 4.5.0

package/test/player_unit.js

@@ -92,7 +92,7 @@ describe('Player', () => {
         variant.addVideo(2);
       });
       manifest.addVariant(1, (variant) => {
-        variant.addAudio(3);
+        variant.addAudio(1);
         variant.addVideo(4);
       });
     });
@@ -128,8 +128,8 @@ describe('Player', () => {
         getUseEmbeddedText: jasmine.createSpy('getUseEmbeddedText'),
         setSegmentRelativeVttTiming:
             jasmine.createSpy('setSegmentRelativeVttTiming'),
-        updateLcevcDil:
-            jasmine.createSpy('updateLcevcDil'),
+        updateLcevcDec:
+            jasmine.createSpy('updateLcevcDec'),
         getTextDisplayer: () => textDisplayer,
         getBufferedInfo: () => bufferedInfo,
         ended: jasmine.createSpy('ended').and.returnValue(false),
@@ -184,6 +184,7 @@ describe('Player', () => {
   describe('destroy', () => {
     it('cleans up all dependencies', async () => {
       goog.asserts.assert(manifest, 'Manifest should be non-null');
+      await player.load(fakeManifestUri, 0, fakeMimeType);
       const segmentIndexes = [];
       for (const variant of manifest.variants) {
         if (variant.audio) {
@@ -340,15 +341,12 @@ describe('Player', () => {
     });
 
     describe('disableStream', () => {
-      /** @type {function(function(), number)} */
-      let realSetTimeout;
       /** @type {number} */
       let disableTimeInSeconds;
       /** @type {?jasmine.Spy} */
       let getBufferedInfoSpy;
 
       beforeAll(() => {
-        realSetTimeout = window.setTimeout;
         jasmine.clock().install();
         jasmine.clock().mockDate();
       });
@@ -381,15 +379,21 @@ describe('Player', () => {
               stream.mime('audio/mp4', 'mp4a.40.2');
               stream.language = 'en';
             });
-            variant.addVideo(2);
+            variant.addVideo(2, (stream) => {
+              stream.size(10, 10);
+            });
           });
           manifest.addVariant(1, (variant) => {
             variant.addExistingStream(1);
-            variant.addVideo(3);
+            variant.addVideo(3, (stream) => {
+              stream.size(20, 20);
+            });
           });
           manifest.addVariant(2, (variant) => {
             variant.addExistingStream(1);
-            variant.addVideo(4);
+            variant.addVideo(4, (stream) => {
+              stream.size(30, 30);
+            });
           });
         });
       }
@@ -498,102 +502,6 @@ describe('Player', () => {
         expect(fromAdaptation).toBeFalsy();
       });
 
-      it('disables all variants containing stream', async () => {
-        manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-          manifest.addVariant(0, (variant) => {
-            variant.addAudio(1, (stream) => {
-              stream.mime('audio/mp4', 'mp4a.40.2');
-              stream.language = 'en';
-              stream.bandwidth = 100;
-            });
-            variant.addVideo(2);
-          });
-          manifest.addVariant(1, (variant) => {
-            variant.addExistingStream(1);
-            variant.addVideo(3);
-          });
-
-          manifest.addVariant(2, (variant) => {
-            variant.addAudio(4, (stream) => {
-              stream.mime('audio/mp4', 'mp4a.40.2');
-              stream.language = 'en';
-              stream.bandwidth = 200;
-            });
-            variant.addExistingStream(2);
-          });
-          manifest.addVariant(3, (variant) => {
-            variant.addExistingStream(4);
-            variant.addExistingStream(3);
-          });
-        });
-
-        await player.load(fakeManifestUri, 0, fakeMimeType);
-
-        const variantCount = manifest.variants.length;
-        const variantAffected = 2;
-        const audioStream =
-        /** @type {shaka.extern.Stream} */ (manifest.variants[0].audio);
-
-        player.disableStream(audioStream, disableTimeInSeconds);
-
-        await shaka.test.Util.shortDelay(realSetTimeout);
-
-        expect(abrManager.setVariants).toHaveBeenCalled();
-
-        const updatedVariants =
-            abrManager.setVariants.calls.mostRecent().args[0];
-
-        expect(updatedVariants.length).toBe(variantCount - variantAffected);
-
-        for (const variant of updatedVariants) {
-          expect(variant.audio).not.toEqual(audioStream);
-        }
-      });
-
-      it('does not disable streams if abr is disabled', async () => {
-        await player.load(fakeManifestUri, 0, fakeMimeType);
-
-        player.configure({abr: {enabled: true}});
-
-        const videoStream =
-        /** @type {shaka.extern.Stream} */ (manifest.variants[0].video);
-        let status = player.disableStream(videoStream, 10);
-        expect(status).toBe(true);
-
-        player.configure({abr: {enabled: false}});
-
-        status = player.disableStream(videoStream, 10);
-        expect(status).toBe(false);
-      });
-
-      it('disables stream if have alternate stream', async () => {
-        // Run test with the default manifest
-        await runTest(0, 'video', true);
-
-        manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-          manifest.addVariant(0, (variant) => {
-            variant.addAudio(1, (stream) => {
-              stream.mime('audio/mp4', 'mp4a.40.2');
-              stream.language = 'en';
-              stream.bandwidth = 10;
-            });
-            variant.addVideo(2);
-          });
-          manifest.addVariant(1, (variant) => {
-            variant.addAudio(3, (stream) => {
-              stream.mime('audio/mp4', 'mp4a.40.2');
-              stream.language = 'en';
-              stream.bandwidth = 20;
-            });
-            variant.addExistingStream(2);
-          });
-        });
-
-        player.configure({abr: {enabled: true}});
-
-        await runTest(0, 'audio', true);
-      });
-
       describe('does not disable stream if there not alternate stream', () => {
         it('single audio multiple videos', async () => {
           manifest = shaka.test.ManifestGenerator.generate((manifest) => {
@@ -2711,15 +2619,15 @@ describe('Player', () => {
         });
         manifest.addVariant(2, (variant) => {
           variant.bandwidth = 300;
-          variant.addAudio(4, (stream) => {
+          variant.addAudio(1, (stream) => {
             stream.bandwidth = 200;
           });
           variant.addExistingStream(2);  // video
         });
         manifest.addVariant(3, (variant) => {
           variant.bandwidth = 400;
-          variant.addExistingStream(4);  // audio
-          variant.addExistingStream(3);  // video
+          variant.addExistingStream(1);  // audio
+          variant.addExistingStream(2);  // video
         });
       });
 
@@ -3028,11 +2936,15 @@ describe('Player', () => {
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(0, (variant) => {
           variant.bandwidth = 500;
-          variant.addVideo(1);
+          variant.addVideo(1, (stream) => {
+            stream.size(10, 10);
+          });
         });
         manifest.addVariant(1, (variant) => {
           variant.bandwidth = 100;
-          variant.addVideo(2);
+          variant.addVideo(2, (stream) => {
+            stream.size(30, 30);
+          });
         });
       });
 
@@ -3067,11 +2979,15 @@ describe('Player', () => {
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(1, (variant) => {
           variant.bandwidth = 500;
-          variant.addVideo(10);
+          variant.addVideo(10, (stream) => {
+            stream.size(10, 10);
+          });
         });
         manifest.addVariant(2, (variant) => {
           variant.bandwidth = 100;
-          variant.addVideo(20);
+          variant.addVideo(20, (stream) => {
+            stream.size(30, 30);
+          });
         });
       });
 
@@ -3101,10 +3017,13 @@ describe('Player', () => {
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1, (stream) => {
             stream.keyIds = new Set(['abc']);
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(1, (variant) => {
-          variant.addVideo(2);
+          variant.addVideo(2, (stream) => {
+            stream.size(20, 20);
+          });
         });
       });
 
@@ -3133,10 +3052,13 @@ describe('Player', () => {
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1, (stream) => {
             stream.keyIds = new Set(['abc']);
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(1, (variant) => {
-          variant.addVideo(2);
+          variant.addVideo(2, (stream) => {
+            stream.size(20, 20);
+          });
         });
       });
 
@@ -3232,10 +3154,13 @@ describe('Player', () => {
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1, (stream) => {
             stream.keyIds = new Set(['abc']);
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(1, (variant) => {
-          variant.addVideo(2);
+          variant.addVideo(2, (stream) => {
+            stream.size(20, 20);
+          });
         });
       });
 
@@ -3254,10 +3179,13 @@ describe('Player', () => {
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1, (stream) => {
             stream.keyIds = new Set(['abc']);
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(1, (variant) => {
-          variant.addVideo(2);
+          variant.addVideo(2, (stream) => {
+            stream.size(20, 20);
+          });
         });
       });
 
@@ -3276,10 +3204,13 @@ describe('Player', () => {
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1, (stream) => {
             stream.keyIds = new Set(['abc']);
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(2, (variant) => {
-          variant.addVideo(3);
+          variant.addVideo(3, (stream) => {
+            stream.size(20, 20);
+          });
         });
       });
 
@@ -3299,16 +3230,19 @@ describe('Player', () => {
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1, (stream) => {
             stream.keyIds = new Set(['abc']);
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(2, (variant) => {
           variant.addVideo(3, (stream) => {
             stream.keyIds = new Set(['def']);
+            stream.size(20, 20);
           });
         });
         manifest.addVariant(4, (variant) => {
           variant.addVideo(5, (stream) => {
             stream.keyIds = new Set(['abc', 'def']);
+            stream.size(30, 30);
           });
         });
       });
@@ -3326,10 +3260,13 @@ describe('Player', () => {
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1, (stream) => {
             stream.keyIds = new Set(['abc']);
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(2, (variant) => {
-          variant.addVideo(3);
+          variant.addVideo(3, (stream) => {
+            stream.size(20, 20);
+          });
         });
       });
 
@@ -3349,10 +3286,13 @@ describe('Player', () => {
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1, (stream) => {
             stream.keyIds = new Set(['abc']);
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(2, (variant) => {
-          variant.addVideo(3);
+          variant.addVideo(3, (stream) => {
+            stream.size(20, 20);
+          });
         });
       });
 
@@ -3371,15 +3311,19 @@ describe('Player', () => {
             manifest.addVariant(0, (variant) => {
               variant.addVideo(1, (stream) => {
                 stream.keyIds = new Set(['abc']);
+                stream.size(10, 10);
               });
             });
             manifest.addVariant(2, (variant) => {
               variant.addVideo(3, (stream) => {
                 stream.keyIds = new Set(['xyz']);
+                stream.size(20, 20);
               });
             });
             manifest.addVariant(4, (variant) => {
-              variant.addVideo(5);
+              variant.addVideo(5, (stream) => {
+                stream.size(30, 30);
+              });
             });
           });
 
@@ -3433,15 +3377,21 @@ describe('Player', () => {
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(0, (variant) => {
           variant.bandwidth = 10;
-          variant.addVideo(1);
+          variant.addVideo(1, (stream) => {
+            stream.size(10, 10);
+          });
         });
         manifest.addVariant(1, (variant) => {
           variant.bandwidth = 1500;
-          variant.addVideo(2);
+          variant.addVideo(2, (stream) => {
+            stream.size(20, 20);
+          });
         });
         manifest.addVariant(2, (variant) => {
           variant.bandwidth = 500;
-          variant.addVideo(3);
+          variant.addVideo(3, (stream) => {
+            stream.size(30, 30);
+          });
         });
       });
 
@@ -3557,7 +3507,7 @@ describe('Player', () => {
           variant.addVideo(3, (stream) => {
             stream.size(190, 190);
           });
-          variant.addAudio(4);
+          variant.addAudio(2);
         });
       });
 
@@ -3620,18 +3570,21 @@ describe('Player', () => {
           variant.bandwidth = 100;
           variant.addVideo(0, (stream) => {
             stream.codecs = 'good';
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(1, (variant) => {
           variant.bandwidth = 200;
           variant.addVideo(1, (stream) => {
             stream.codecs = 'good';
+            stream.size(20, 20);
           });
         });
         manifest.addVariant(2, (variant) => {
           variant.bandwidth = 300;
           variant.addVideo(2, (stream) => {
             stream.codecs = 'good';
+            stream.size(30, 30);
           });
         });
 
@@ -3640,18 +3593,21 @@ describe('Player', () => {
           variant.bandwidth = 10000;
           variant.addVideo(3, (stream) => {
             stream.codecs = 'bad';
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(4, (variant) => {
           variant.bandwidth = 20000;
           variant.addVideo(4, (stream) => {
             stream.codecs = 'bad';
+            stream.size(20, 20);
           });
         });
         manifest.addVariant(5, (variant) => {
           variant.bandwidth = 30000;
           variant.addVideo(5, (stream) => {
             stream.codecs = 'bad';
+            stream.size(30, 30);
           });
         });
       });
@@ -3672,10 +3628,13 @@ describe('Player', () => {
         manifest.addVariant(0, (variant) => {
           variant.addVideo(1, (stream) => {
             stream.keyIds = new Set(['abc']);
+            stream.size(10, 10);
           });
         });
         manifest.addVariant(2, (variant) => {
-          variant.addVideo(3);
+          variant.addVideo(3, (stream) => {
+            stream.size(20, 20);
+          });
         });
       });
 
@@ -3778,19 +3737,25 @@ describe('Player', () => {
     manifest = shaka.test.ManifestGenerator.generate((manifest) => {
       manifest.addVariant(0, (variant) => {
         variant.bandwidth = 100;
-        variant.addVideo(0);
+        variant.addVideo(0, (stream) => {
+          stream.size(10, 10);
+        });
         variant.addAudio(9);
       });
 
       manifest.addVariant(1, (variant) => {
         variant.bandwidth = 200;
-        variant.addVideo(1);
+        variant.addVideo(1, (stream) => {
+          stream.size(20, 20);
+        });
         variant.addExistingStream(9);  // audio
       });
 
       manifest.addVariant(2, (variant) => {
         variant.bandwidth = 300;
-        variant.addVideo(2);
+        variant.addVideo(2, (stream) => {
+          stream.size(30, 30);
+        });
         variant.addExistingStream(9);  // audio
       });
     });
@@ -3859,15 +3824,21 @@ describe('Player', () => {
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(0, (variant) => {
           variant.bandwidth = /** @type {?} */(undefined);
-          variant.addVideo(0);
+          variant.addVideo(0, (stream) => {
+            stream.size(10, 10);
+          });
         });
         manifest.addVariant(1, (variant) => {
           variant.bandwidth = NaN;
-          variant.addVideo(1);
+          variant.addVideo(1, (stream) => {
+            stream.size(20, 20);
+          });
         });
         manifest.addVariant(2, (variant) => {
           variant.bandwidth = 0;
-          variant.addVideo(2);
+          variant.addVideo(2, (stream) => {
+            stream.size(30, 30);
+          });
         });
       });
 

package/test/routing/walker_unit.js

@@ -16,6 +16,7 @@ describe('Walker', () => {
     startTime: null,
     startTimeOfLoad: NaN,
     uri: null,
+    keepAdManager: false,
   };
 
   // The graph topology that we will be using for our tests.

package/test/test/assets/dash-aes-128/dash.mpd

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MPD mediaPresentationDuration="PT0M8.000S" minBufferTime="PT1S" profiles="urn:mpeg:dash:profile:isoff-live:2011" type="static" xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:sea="urn:mpeg:dash:schema:sea:2012" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Period>
+    <AdaptationSet bitstreamSwitching="false" codecs="avc1.64000D" contentType="video" group="1" id="1" maxHeight="136" maxWidth="320" mimeType="video/mp4" profiles="ccff" segmentAlignment="true" startWithSAP="1">
+      <ContentProtection schemeIdUri="urn:mpeg:dash:sea:2012">
+        <sea:SegmentEncryption schemeIdUri="urn:mpeg:dash:sea:aes128-cbc:2013"/>
+        <sea:KeySystem keySystemUri="urn:mpeg:dash:sea:keysys:http:2013"/>
+        <sea:CryptoPeriod IV="0x3782A2D74219AE78CFADF642ABC5E68D" keyUriTemplate="license"/>
+      </ContentProtection>
+      <SegmentTemplate initialization="Fragments(video=i,format=mpd-time-csf)" media="Fragments(video=$Time$,format=mpd-time-csf)" timescale="10000000">
+        <SegmentTimeline>
+          <S d="20000000" r="4"/>
+        </SegmentTimeline>
+      </SegmentTemplate>
+      <Representation bandwidth="395367" codecs="avc1.64000D" height="136" id="1_V_video_8" width="320"/>
+    </AdaptationSet>
+  </Period>
+</MPD>

package/test/test/assets/dash-aes-128/license

@@ -0,0 +1 @@
+�W祽Vv՛���:$�

package/test/test/assets/dash-multi-codec/dash.mpd

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/google/shaka-packager version v2.4.1-c731217-release-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT60S">
+  <Period id="0">
+    <AdaptationSet id="6" contentType="video" maxWidth="180" maxHeight="144" frameRate="12800/512" par="5:4">
+      <Representation id="12" bandwidth="162364" codecs="avc1.4d400c" mimeType="video/mp4" sar="1:1" width="180" height="144">
+        <BaseURL>video_144p_108k_h264.mp4</BaseURL>
+        <SegmentBase indexRange="860-1071" timescale="12800">
+          <Initialization range="0-859"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="8" contentType="audio" lang="en" subsegmentAlignment="true">
+      <Representation id="13" bandwidth="130803" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="48000">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
+        <BaseURL>audio_en_2c_128k_aac.mp4</BaseURL>
+        <SegmentBase indexRange="786-1009" timescale="48000">
+          <Initialization range="0-785"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="10" contentType="audio" lang="es" subsegmentAlignment="true">
+      <Representation id="17" bandwidth="75654" codecs="opus" mimeType="audio/webm" audioSamplingRate="48000">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
+        <BaseURL>audio_es_2c_64k_opus.webm</BaseURL>
+        <SegmentBase indexRange="326-584" timescale="48000">
+          <Initialization range="0-325"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>

package/test/test/assets/hls-ts-h265/hevc.m3u8

@@ -0,0 +1,6 @@
+#EXTM3U
+#EXT-X-VERSION:6
+#EXT-X-INDEPENDENT-SEGMENTS
+
+#EXT-X-STREAM-INF:AVERAGE-BANDWIDTH=829339,BANDWIDTH=901770,CODECS="hvc1.2.4.L123.B0",RESOLUTION=640x360,FRAME-RATE=30.000
+index.m3u8

package/test/test/assets/hls-ts-h265/index.m3u8

@@ -0,0 +1,7 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:12
+#EXT-X-MEDIA-SEQUENCE:0
+#EXTINF:12.000000,
+0.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-muxed-aac-h265/media.m3u8

@@ -0,0 +1,9 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:5
+#EXT-X-MEDIA-SEQUENCE:0
+#EXTINF:5.000000,
+0.ts
+#EXTINF:5.000000,
+1.ts
+#EXT-X-ENDLIST

package/test/test/assets/hls-ts-muxed-ac3-h264/media.m3u8

@@ -0,0 +1,24 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-INDEPENDENT-SEGMENTS
+#EXT-X-TARGETDURATION:4
+#EXT-X-MEDIA-SEQUENCE:0
+#EXTINF:3.000000,
+s_00000.ts
+
+#EXTINF:3.000000,
+s_00001.ts
+
+#EXTINF:3.000000,
+s_00002.ts
+
+#EXTINF:3.000000,
+s_00003.ts
+
+#EXTINF:3.000000,
+s_00004.ts
+
+#EXTINF:3.000000,
+s_00005.ts
+
+#EXT-X-ENDLIST