shaka-player 4.4.3 → 4.6.0

package/demo/asset_card.js

@@ -8,7 +8,6 @@ goog.provide('shakaDemo.AssetCard');
 
 goog.require('goog.asserts');
 goog.require('shakaAssets');
-goog.require('shakaDemo.MessageIds');
 goog.require('shakaDemo.Tooltips');
 goog.requireType('ShakaDemoAssetInfo');
 
@@ -134,7 +133,7 @@ shakaDemo.AssetCard = class {
 
   /**
    * @param {string} icon
-   * @param {!shakaDemo.MessageIds} title
+   * @param {string} title
    * @private
    */
   addFeatureIcon_(icon, title) {
@@ -190,18 +189,17 @@ shakaDemo.AssetCard = class {
 
   /**
    * Modify an asset to make it clear that it is unsupported.
-   * @param {!shakaDemo.MessageIds} unsupportedReason
+   * @param {string} unsupportedReason
    */
   markAsUnsupported(unsupportedReason) {
     this.card_.classList.add('asset-card-unsupported');
-    this.makeUnsupportedButton_(
-        shakaDemo.MessageIds.UNSUPPORTED, unsupportedReason);
+    this.makeUnsupportedButton_('Not Available', unsupportedReason);
   }
 
   /**
    * Make a button that represents the lack of a working button.
-   * @param {?shakaDemo.MessageIds} buttonName
-   * @param {!shakaDemo.MessageIds} unsupportedReason
+   * @param {?string} buttonName
+   * @param {string} unsupportedReason
    * @return {!Element}
    * @private
    */
@@ -306,16 +304,15 @@ shakaDemo.AssetCard = class {
       return;
     }
 
-    this.makeYesNoDialogue_(parentDiv,
-        shakaDemo.MessageIds.DELETE_STORED_PROMPT, async () => {
-          deleteButton.disabled = true;
-          await this.asset_.unstoreCallback();
-        });
+    this.makeYesNoDialogue_(parentDiv, 'Delete the offline copy?', async () => {
+      deleteButton.disabled = true;
+      await this.asset_.unstoreCallback();
+    });
   }
 
   /**
    * @param {!Element} parentDiv
-   * @param {!shakaDemo.MessageIds} text
+   * @param {string} text
    * @param {function():Promise} callback
    * @private
    */
@@ -330,14 +327,14 @@ shakaDemo.AssetCard = class {
 
     const textElement = document.createElement('h2');
     textElement.classList.add('mdl-typography--title');
-    textElement.textContent = shakaDemoMain.getLocalizedString(text);
+    textElement.textContent = text;
     dialog.appendChild(textElement);
 
     const buttonsDiv = document.createElement('div');
     dialog.appendChild(buttonsDiv);
-    const makeButton = (textId, fn) => {
+    const makeButton = (text, fn) => {
       const button = document.createElement('button');
-      button.textContent = shakaDemoMain.getLocalizedString(textId);
+      button.textContent = text;
       button.classList.add('mdl-button');
       button.classList.add('mdl-button--colored');
       button.classList.add('mdl-js-button');
@@ -348,12 +345,12 @@ shakaDemo.AssetCard = class {
       buttonsDiv.appendChild(button);
       button.blur();
     };
-    makeButton(shakaDemo.MessageIds.PROMPT_YES, async () => {
+    makeButton('Yes', async () => {
       dialog.close();
       await callback();
       this.remakeButtons();
     });
-    makeButton(shakaDemo.MessageIds.PROMPT_NO, () => {
+    makeButton('No', () => {
       dialog.close();
     });
 
@@ -385,9 +382,9 @@ shakaDemo.AssetCard = class {
   /**
    * Adds a button to the bottom of the card that will call |onClick| when
    * clicked. For example, a play or delete button.
-   * @param {?shakaDemo.MessageIds} name
+   * @param {?string} name
    * @param {function()} onclick
-   * @param {shakaDemo.MessageIds=} yesNoDialogText
+   * @param {string=} yesNoDialogText
    * @return {!HTMLButtonElement}
    */
   addButton(name, onclick, yesNoDialogText) {
@@ -397,7 +394,7 @@ shakaDemo.AssetCard = class {
     button.classList.add('mdl-button--colored');
     button.classList.add('mdl-js-button');
     button.classList.add('mdl-js-ripple-effect');
-    button.textContent = name ? shakaDemoMain.getLocalizedString(name) : '';
+    button.textContent = name || '';
     button.addEventListener('click', () => {
       if (!button.hasAttribute('disabled')) {
         if (yesNoDialogText) {

package/demo/cast_receiver/index.html

@@ -52,7 +52,6 @@ UNCOMPILED_JS = [
   // This file contains goog.require calls for all exported library classes.
   '../../shaka-player.uncompiled.js',
   // These are the individual parts of the receiver app.
-  '../common/message_ids.js',
   '../common/asset.js',
   '../common/assets.js',
   'receiver_app.js',

package/demo/close_button.js

@@ -41,9 +41,6 @@ shakaDemo.CloseButton = class extends shaka.ui.Element {
             });
           });
     }
-
-    // TODO: Make sure that the screenreader description of this control is
-    // localized!
   }
 };
 

package/demo/common/asset.js

@@ -12,8 +12,6 @@
 
 goog.provide('ShakaDemoAssetInfo');
 
-goog.require('shakaDemo.MessageIds');
-
 
 /**
  * An object that contains information about an asset.
@@ -47,6 +45,8 @@ const ShakaDemoAssetInfo = class {
     this.extraText = [];
     /** @type {!Array.<string>} */
     this.extraThumbnail = [];
+    /** @type {!Array.<!shakaAssets.ExtraChapter>} */
+    this.extraChapter = [];
     /** @type {?string} */
     this.certificateUri = null;
     /** @type {?string} */
@@ -80,9 +80,11 @@ const ShakaDemoAssetInfo = class {
     /** @type {?string} */
     this.imaManifestType = null;
     /** @type {?string} */
-    this.mimeType = null;
+    this.mediaTailorUrl = null;
+    /** @type {?Object} */
+    this.mediaTailorAdsParams = null;
     /** @type {?string} */
-    this.mediaPlaylistFullMimeType = null;
+    this.mimeType = null;
 
 
     // Offline storage values.
@@ -115,9 +117,9 @@ const ShakaDemoAssetInfo = class {
   }
 
   /**
-   * A sort comparator for comparing two message Ids, ignoring case.
-   * @param {shakaDemo.MessageIds} a
-   * @param {shakaDemo.MessageIds} b
+   * A sort comparator for comparing two messages, ignoring case.
+   * @param {string} a
+   * @param {string} b
    * @return {number}
    * @private
    */
@@ -172,15 +174,6 @@ const ShakaDemoAssetInfo = class {
     return this.drm.length == 1 && this.drm[0] == shakaAssets.KeySystem.AES128;
   }
 
-  /**
-   * @param {string} mediaPlaylistFullMimeType
-   * @return {!ShakaDemoAssetInfo}
-   */
-  setMediaPlaylistFullMimeType(mediaPlaylistFullMimeType) {
-    this.mediaPlaylistFullMimeType = mediaPlaylistFullMimeType;
-    return this;
-  }
-
   /**
    * @param {!Object} extraConfig
    * @return {!ShakaDemoAssetInfo}
@@ -289,6 +282,21 @@ const ShakaDemoAssetInfo = class {
     return this;
   }
 
+  /**
+   * @param {string} url
+   * @param {?Object=} adsParams
+   * @return {!ShakaDemoAssetInfo}
+   */
+  setMediaTailor(url, adsParams=null) {
+    this.mediaTailorUrl = url;
+    this.mediaTailorAdsParams = adsParams;
+    if (!this.features.includes(shakaAssets.Feature.ADS)) {
+      this.addFeature(shakaAssets.Feature.ADS);
+    }
+
+    return this;
+  }
+
   /**
    * @param {string} headerName
    * @param {string} headerValue
@@ -304,7 +312,6 @@ const ShakaDemoAssetInfo = class {
    * @return {!ShakaDemoAssetInfo}
    */
   addExtraText(extraText) {
-    // TODO: At no point do we actually use the extraText... why does it exist?
     this.extraText.push(extraText);
     return this;
   }
@@ -318,6 +325,15 @@ const ShakaDemoAssetInfo = class {
     return this;
   }
 
+  /**
+   * @param {shakaAssets.ExtraChapter} extraChapter
+   * @return {!ShakaDemoAssetInfo}
+   */
+  addExtraChapter(extraChapter) {
+    this.extraChapter.push(extraChapter);
+    return this;
+  }
+
   /**
    * If this is called, the asset will be focused on by the integration tests.
    * @return {!ShakaDemoAssetInfo}
@@ -419,11 +435,6 @@ const ShakaDemoAssetInfo = class {
       }
     }
 
-    if (this.mediaPlaylistFullMimeType) {
-      config.manifest.hls.mediaPlaylistFullMimeType =
-          this.mediaPlaylistFullMimeType;
-    }
-
     if (this.licenseServers.size) {
       config.drm.servers = config.drm.servers || {};
       this.licenseServers.forEach((value, key) => {