shaka-player 2.5.1 → 2.5.5

package/demo/common/assets.js

@@ -42,6 +42,8 @@ shakaAssets.Source = {
   AZURE_MEDIA_SERVICES: 'Azure Media Services',
   GPAC: 'GPAC',
   UPLYNK: 'Verizon Digital Media Services',
+  APPLE: 'Apple',
+  IRT: 'IRT',
 };
 
 
@@ -584,6 +586,17 @@ shakaAssets.testAssets = [
     .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
     .addFeature(shakaAssets.Feature.MP4)
     .addFeature(shakaAssets.Feature.OFFLINE),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Tears of Steel (HLS, Subtitles)',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/tears_of_steel.png',
+      /* manifestUri= */ 'https://demo.unified-streaming.com/video/tears-of-steel/tears-of-steel-multiple-subtitles.ism/.m3u8',
+      /* source= */ shakaAssets.Source.UNIFIED_STREAMING)
+      .addFeature(shakaAssets.Feature.HLS)
+      .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.SUBTITLES)
+      .addFeature(shakaAssets.Feature.WEBVTT)
+      .addFeature(shakaAssets.Feature.OFFLINE),
   new ShakaDemoAssetInfo(
       /* name= */ 'Tears of Steel (Widevine)',
       /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/tears_of_steel.png',
@@ -948,19 +961,64 @@ shakaAssets.testAssets = [
       /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/sintel.png',
       /* manifestUri= */ 'https://content.uplynk.com/1eb40d8e64234f5c9879db7045c3d48c.mpd?ad=cleardash&rays=cdefg',
       /* source= */ shakaAssets.Source.UPLYNK)
-    // Disabled until we figure out the CORS errors and PlayReady status.
-    .markAsDisabled()
-    .addKeySystem(shakaAssets.KeySystem.WIDEVINE)
-    .addFeature(shakaAssets.Feature.DASH)
-    .addFeature(shakaAssets.Feature.MP4)
-    .addFeature(shakaAssets.Feature.MULTIPLE_LANGUAGES)
-    .addFeature(shakaAssets.Feature.MULTIPERIOD)
-    .addFeature(shakaAssets.Feature.MULTIKEY)
-    .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
-    .addFeature(shakaAssets.Feature.AESCTR_16_BYTE_IV)
-    .addFeature(shakaAssets.Feature.ENCRYPTED_WITH_CLEAR)
-    .addLicenseServer('com.widevine.alpha', 'https://content.uplynk.com/wv')
-    .setRequestFilter(shakaAssets.UplynkRequestFilter)
-    .setResponseFilter(shakaAssets.UplynkResponseFilter),
+  // Disabled until we figure out the CORS errors and PlayReady status.
+      .markAsDisabled()
+      .addKeySystem(shakaAssets.KeySystem.WIDEVINE)
+      .addFeature(shakaAssets.Feature.DASH)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.MULTIPLE_LANGUAGES)
+      .addFeature(shakaAssets.Feature.MULTIPERIOD)
+      .addFeature(shakaAssets.Feature.MULTIKEY)
+      .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
+      .addFeature(shakaAssets.Feature.AESCTR_16_BYTE_IV)
+      .addFeature(shakaAssets.Feature.ENCRYPTED_WITH_CLEAR)
+      .addLicenseServer('com.widevine.alpha', 'https://content.uplynk.com/wv')
+      .setRequestFilter(shakaAssets.UplynkRequestFilter)
+      .setResponseFilter(shakaAssets.UplynkResponseFilter),
+  // End Verizon Digital Media Services (VDMS) assets }}}
+
+  // Apple assets {{{
+  // Src: https://developer.apple.com/streaming/examples/
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Apple Advanced HLS Stream (fMP4)',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/apple_test_pattern.png',
+      /* manifestUri= */ 'https://storage.googleapis.com/shaka-demo-assets/apple-advanced-stream-fmp4/master.m3u8',
+      /* source= */ shakaAssets.Source.APPLE)
+      .addFeature(shakaAssets.Feature.HLS)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.CAPTIONS)
+      .addFeature(shakaAssets.Feature.WEBVTT)
+      .addFeature(shakaAssets.Feature.OFFLINE),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Apple Advanced HLS Stream (TS)',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/apple_test_pattern.png',
+      /* manifestUri= */ 'https://storage.googleapis.com/shaka-demo-assets/apple-advanced-stream-ts/master.m3u8',
+      /* source= */ shakaAssets.Source.APPLE)
+      .addFeature(shakaAssets.Feature.HLS)
+      .addFeature(shakaAssets.Feature.MP2TS)
+      .addFeature(shakaAssets.Feature.CAPTIONS)
+      .addFeature(shakaAssets.Feature.WEBVTT)
+      .addFeature(shakaAssets.Feature.OFFLINE),
+  // }}}
+
+  // IRT assets {{{
+  // Src: http://subtitling.irt.de/cmaf/#urls
+  // Note: According to the website, these assets may not be available 24/7.
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Bayerischer Rundfunk Recorded Loop (DASH)',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/bayerischer_rundfunk.png',
+      /* manifestUri= */ 'https://irtdashreference-i.akamaihd.net/dash/live/901161/keepixo1/manifestBR2.mpd',
+      /* source= */ shakaAssets.Source.IRT)
+      .addFeature(shakaAssets.Feature.DASH)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.LIVE),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Bayerischer Rundfunk Recorded Loop (HLS)',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/bayerischer_rundfunk.png',
+      /* manifestUri= */ 'https://irtdashreference-i.akamaihd.net/dash/live/901161/keepixo1/playlistBR2.m3u8',
+      /* source= */ shakaAssets.Source.IRT)
+      .addFeature(shakaAssets.Feature.HLS)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.LIVE),
   // }}}
 ];

package/demo/config.js

@@ -16,20 +16,23 @@
  */
 
 
-/** @type {?ShakaDemoConfig} */
+goog.provide('shakaDemo.Config');
+
+
+/** @type {?shakaDemo.Config} */
 let shakaDemoConfig;
 
 
 /**
  * Shaka Player demo, configuration page layout.
  */
-class ShakaDemoConfig {
+shakaDemo.Config = class {
   /**
    * Register the page configuration.
    */
   static init() {
     const container = shakaDemoMain.getHamburgerMenu();
-    shakaDemoConfig = new ShakaDemoConfig(container);
+    shakaDemoConfig = new shakaDemo.Config(container);
   }
 
   /** @param {!Element} container */
@@ -39,13 +42,13 @@ class ShakaDemoConfig {
 
     /**
      * A list of all sections.
-     * @private {!Array.<!ShakaDemoInputContainer>}
+     * @private {!Array.<!shakaDemo.InputContainer>}
      */
     this.sections_ = [];
 
     /**
      * The input object for the control currently being constructed.
-     * @private {?ShakaDemoInput}
+     * @private {?shakaDemo.Input}
      */
     this.latestInput_ = null;
 
@@ -133,7 +136,7 @@ class ShakaDemoConfig {
       // All robustness fields of a given type are set at once.
       this.addDatalistInput_(name, robustnessSuggestions, (input) => {
         // Add in any common drmSystem not currently in advanced.
-        for (const drmSystem of ShakaDemoMain.commonDrmSystems) {
+        for (const drmSystem of shakaDemo.Main.commonDrmSystems) {
           if (!(drmSystem in advanced)) {
             advanced[drmSystem] = {
               distinctiveIdentifierRequired: false,
@@ -393,14 +396,14 @@ class ShakaDemoConfig {
   /**
    * @param {string} name
    * @param {?string} docLink
-   * @return {!ShakaDemoConfig}
+   * @return {!shakaDemo.Config}
    * @private
    */
   addSection_(name, docLink) {
     const style = name ?
-                  ShakaDemoInputContainer.Style.ACCORDION :
-                  ShakaDemoInputContainer.Style.VERTICAL;
-    this.sections_.push(new ShakaDemoInputContainer(
+                  shakaDemo.InputContainer.Style.ACCORDION :
+                  shakaDemo.InputContainer.Style.VERTICAL;
+    this.sections_.push(new shakaDemo.InputContainer(
         this.container_, name, style, docLink));
 
     return this;
@@ -410,7 +413,7 @@ class ShakaDemoConfig {
    * @param {string} name
    * @param {string} valueName
    * @param {string=} tooltipMessage
-   * @return {!ShakaDemoConfig}
+   * @return {!shakaDemo.Config}
    * @private
    */
   addBoolInput_(name, valueName, tooltipMessage) {
@@ -430,12 +433,12 @@ class ShakaDemoConfig {
    * @param {string} name
    * @param {function(!Element)} onChange
    * @param {string=} tooltipMessage
-   * @return {!ShakaDemoConfig}
+   * @return {!shakaDemo.Config}
    * @private
    */
   addCustomBoolInput_(name, onChange, tooltipMessage) {
     this.createRow_(name, tooltipMessage);
-    this.latestInput_ = new ShakaDemoBoolInput(
+    this.latestInput_ = new shakaDemo.BoolInput(
         this.getLatestSection_(), name, onChange);
     return this;
   }
@@ -444,7 +447,7 @@ class ShakaDemoConfig {
    * @param {string} name
    * @param {string} valueName
    * @param {string=} tooltipMessage
-   * @return {!ShakaDemoConfig}
+   * @return {!shakaDemo.Config}
    * @private
    */
   addTextInput_(name, valueName, tooltipMessage) {
@@ -463,12 +466,12 @@ class ShakaDemoConfig {
    * @param {string} name
    * @param {function(!Element)} onChange
    * @param {string=} tooltipMessage
-   * @return {!ShakaDemoConfig}
+   * @return {!shakaDemo.Config}
    * @private
    */
   addCustomTextInput_(name, onChange, tooltipMessage) {
     this.createRow_(name, tooltipMessage);
-    this.latestInput_ = new ShakaDemoTextInput(
+    this.latestInput_ = new shakaDemo.TextInput(
         this.getLatestSection_(), name, onChange);
     return this;
   }
@@ -480,7 +483,7 @@ class ShakaDemoConfig {
    * @param {boolean=} canBeZero
    * @param {boolean=} canBeUnset
    * @param {string=} tooltipMessage
-   * @return {!ShakaDemoConfig}
+   * @return {!shakaDemo.Config}
    * @private
    */
   addNumberInput_(name, valueName, canBeDecimal = false, canBeZero = true,
@@ -509,7 +512,7 @@ class ShakaDemoConfig {
       }
     };
     this.createRow_(name, tooltipMessage);
-    this.latestInput_ = new ShakaDemoNumberInput(
+    this.latestInput_ = new shakaDemo.NumberInput(
         this.getLatestSection_(), name, onChange, canBeDecimal, canBeZero,
         canBeUnset);
     this.latestInput_.input().value =
@@ -526,12 +529,12 @@ class ShakaDemoConfig {
    * @param {!Array.<string>} values
    * @param {function(!Element)} onChange
    * @param {string=} tooltipMessage
-   * @return {!ShakaDemoConfig}
+   * @return {!shakaDemo.Config}
    * @private
    */
   addDatalistInput_(name, values, onChange, tooltipMessage) {
     this.createRow_(name, tooltipMessage);
-    this.latestInput_ = new ShakaDemoDatalistInput(
+    this.latestInput_ = new shakaDemo.DatalistInput(
         this.getLatestSection_(), name, onChange, values);
     return this;
   }
@@ -541,12 +544,12 @@ class ShakaDemoConfig {
    * @param {!Object.<string, string>} values
    * @param {function(!Element)} onChange
    * @param {string=} tooltipMessage
-   * @return {!ShakaDemoConfig}
+   * @return {!shakaDemo.Config}
    * @private
    */
   addSelectInput_(name, values, onChange, tooltipMessage) {
     this.createRow_(name, tooltipMessage);
-    this.latestInput_ = new ShakaDemoSelectInput(
+    this.latestInput_ = new shakaDemo.SelectInput(
         this.getLatestSection_(), name, onChange, values);
     return this;
   }
@@ -605,7 +608,7 @@ class ShakaDemoConfig {
   /**
    * Gets the latest section. Results in a failed assert if there is no latest
    * section.
-   * @return {!ShakaDemoInputContainer}
+   * @return {!shakaDemo.InputContainer}
    * @private
    */
   getLatestSection_() {
@@ -613,7 +616,7 @@ class ShakaDemoConfig {
                         'Must have at least one section.');
     return this.sections_[this.sections_.length - 1];
   }
-}
+};
 
 
-document.addEventListener('shaka-main-loaded', ShakaDemoConfig.init);
+document.addEventListener('shaka-main-loaded', shakaDemo.Config.init);

package/demo/custom.js

@@ -16,20 +16,23 @@
  */
 
 
-/** @type {?ShakaDemoCustom} */
+goog.provide('shakaDemo.Custom');
+
+
+/** @type {?shakaDemo.Custom} */
 let shakaDemoCustom;
 
 
 /**
  * Shaka Player demo, custom asset page layout.
  */
-class ShakaDemoCustom {
+shakaDemo.Custom = class {
   /**
    * Register the page configuration.
    */
   static init() {
     const container = shakaDemoMain.addNavButton('custom');
-    shakaDemoCustom = new ShakaDemoCustom(container);
+    shakaDemoCustom = new shakaDemo.Custom(container);
   }
 
   /** @param {!Element} container */
@@ -45,7 +48,7 @@ class ShakaDemoCustom {
     /** @private {!Set.<!ShakaDemoAssetInfo>} */
     this.assets_ = this.loadAssetInfos_();
 
-    /** @private {!Array.<!AssetCard>} */
+    /** @private {!Array.<!shakaDemo.AssetCard>} */
     this.assetCards_ = [];
     this.savedList_ = document.createElement('div');
     container.appendChild(this.savedList_);
@@ -120,7 +123,7 @@ class ShakaDemoCustom {
       if (licenseServerURL) {
         // Make a license server entry for every common DRM plugin.
         assetInProgress.licenseServers.clear();
-        for (const drmSystem of ShakaDemoMain.commonDrmSystems) {
+        for (const drmSystem of shakaDemo.Main.commonDrmSystems) {
           assetInProgress.licenseServers.set(drmSystem, licenseServerURL);
         }
         if (customDRMSystem) {
@@ -132,8 +135,8 @@ class ShakaDemoCustom {
       }
     };
 
-    const containerStyle = ShakaDemoInputContainer.Style.VERTICAL;
-    const container = new ShakaDemoInputContainer(
+    const containerStyle = shakaDemo.InputContainer.Style.VERTICAL;
+    const container = new shakaDemo.InputContainer(
         inputDiv, /* headerText = */ null, containerStyle,
         /* docLink = */ null);
 
@@ -145,7 +148,7 @@ class ShakaDemoCustom {
      */
     const makeField = (name, setup, onChange) => {
       container.addRow(null, null);
-      const input = new ShakaDemoTextInput(container, name, onChange);
+      const input = new shakaDemo.TextInput(container, name, onChange);
       input.extra().textContent = name;
       setup(input.input(), input.container());
     };
@@ -204,7 +207,7 @@ class ShakaDemoCustom {
       customDrmSystemInput = input;
       const drmSystems = assetInProgress.licenseServers.keys();
       for (const drmSystem of drmSystems) {
-        if (!ShakaDemoMain.commonDrmSystems.includes(drmSystem)) {
+        if (!shakaDemo.Main.commonDrmSystems.includes(drmSystem)) {
           input.value = drmSystem;
           break;
         }
@@ -300,7 +303,7 @@ class ShakaDemoCustom {
    * @private
    */
   loadAssetInfos_() {
-    const savedString = window.localStorage.getItem(ShakaDemoCustom.saveId_);
+    const savedString = window.localStorage.getItem(shakaDemo.Custom.saveId_);
     if (savedString) {
       const assets = JSON.parse(savedString);
       return new Set(assets.map((json) => {
@@ -317,7 +320,7 @@ class ShakaDemoCustom {
    * @private
    */
   saveAssetInfos_(assetInfos) {
-    const saveId = ShakaDemoCustom.saveId_;
+    const saveId = shakaDemo.Custom.saveId_;
     const assets = Array.from(assetInfos);
     window.localStorage.setItem(saveId, JSON.stringify(assets));
   }
@@ -352,12 +355,13 @@ class ShakaDemoCustom {
 
   /**
    * @param {!ShakaDemoAssetInfo} asset
-   * @return {!AssetCard}
+   * @return {!shakaDemo.AssetCard}
    * @private
    */
   createAssetCardFor_(asset) {
     const savedList = this.savedList_;
-    return new AssetCard(savedList, asset, /* isFeatured = */ false, (c) => {
+    const isFeatured = false;
+    return new shakaDemo.AssetCard(savedList, asset, isFeatured, (c) => {
       c.addButton('Play', () => {
         shakaDemoMain.loadAsset(asset);
         this.updateSelected_();
@@ -417,7 +421,7 @@ class ShakaDemoCustom {
       this.updateSelected_();
     }
   }
-}
+};
 
 
 /**
@@ -425,7 +429,7 @@ class ShakaDemoCustom {
  * custom assets.
  * @const {string}
  */
-ShakaDemoCustom.saveId_ = 'shakaPlayerDemoSavedAssets';
+shakaDemo.Custom.saveId_ = 'shakaPlayerDemoSavedAssets';
 
 
-document.addEventListener('shaka-main-loaded', ShakaDemoCustom.init);
+document.addEventListener('shaka-main-loaded', shakaDemo.Custom.init);