shaka-player 3.3.4 → 4.0.1

package/demo/custom.js

@@ -244,6 +244,40 @@ shakaDemo.Custom = class {
   }
 
 
+  /**
+   * @param {!ShakaDemoAssetInfo} assetInProgress
+   * @param {!Array.<!HTMLInputElement>} inputsToCheck
+   * @return {!Element} div
+   * @private
+   */
+  makeAssetDialogContentsHLS_(assetInProgress, inputsToCheck) {
+    const mediaPlaylistDiv = document.createElement('div');
+    const containerStyle = shakaDemo.InputContainer.Style.FLEX;
+    const container = new shakaDemo.InputContainer(
+        mediaPlaylistDiv, /* headerText= */ null, containerStyle,
+        /* docLink= */ null);
+    container.getClassList().add('wide-input');
+    container.setDefaultRowClass('wide-input');
+
+    const fullMimeTypeSetup = (input, container) => {
+      if (assetInProgress.mediaPlaylistFullMimeType) {
+        input.value = assetInProgress.mediaPlaylistFullMimeType;
+      }
+      const defaultConfig = shaka.util.PlayerConfiguration.createDefault();
+      input.placeholder = defaultConfig.manifest.hls.mediaPlaylistFullMimeType;
+    };
+    const fullMimeTypeOnChange = (input) => {
+      assetInProgress.setMediaPlaylistFullMimeType(input.value);
+    };
+    const fullMimeTypeName = shakaDemoMain.getLocalizedString(
+        shakaDemo.MessageIds.HLS_FULL_MIME_TYPE);
+    this.makeField_(
+        container, fullMimeTypeName, fullMimeTypeSetup, fullMimeTypeOnChange);
+
+    return mediaPlaylistDiv;
+  }
+
+
   /**
    * @param {!ShakaDemoAssetInfo} assetInProgress
    * @param {!Array.<!HTMLInputElement>} inputsToCheck
@@ -673,6 +707,8 @@ shakaDemo.Custom = class {
         assetInProgress, inputsToCheck);
     const adsDiv = this.makeAssetDialogContentsAds_(
         assetInProgress, inputsToCheck);
+    const hlsDiv = this.makeAssetDialogContentsHLS_(
+        assetInProgress, inputsToCheck);
     const extraConfigDiv = this.makeAssetDialogContentsExtra_(
         assetInProgress, inputsToCheck);
     const finishDiv = this.makeAssetDialogContentsFinish_(
@@ -712,6 +748,8 @@ shakaDemo.Custom = class {
         shakaDemo.MessageIds.HEADERS_TAB, headersDiv, /* startOn= */ false);
     addTabButton(
         shakaDemo.MessageIds.ADS_TAB, adsDiv, /* startOn= */ false);
+    addTabButton(
+        shakaDemo.MessageIds.HLS_TAB, hlsDiv, /* startOn= */ false);
     addTabButton(
         shakaDemo.MessageIds.EXTRA_TAB, extraConfigDiv, /* startOn= */ false);
 
@@ -721,6 +759,7 @@ shakaDemo.Custom = class {
     this.dialog_.appendChild(drmDiv);
     this.dialog_.appendChild(headersDiv);
     this.dialog_.appendChild(adsDiv);
+    this.dialog_.appendChild(hlsDiv);
     this.dialog_.appendChild(extraConfigDiv);
     this.dialog_.appendChild(finishDiv);
     this.dialog_.appendChild(iconDiv);

package/demo/demo_utils.js

@@ -43,7 +43,6 @@ shakaDemo.Utils = class {
 
     // Override config values that are handled manually.
     overridden.push('abr.enabled');
-    overridden.push('streaming.jumpLargeGaps');
     overridden.push('drm.advanced');
     overridden.push('drm.servers');
 

package/demo/locales/en.json

@@ -39,6 +39,7 @@
   "DEMO_CONNECTION_TIMEOUT": "Connection timeout",
   "DEMO_CONFIG": "Shaka Player Demo Config",
   "DEMO_CONTAINER_SEARCH": "Container",
+  "DEMO_CONTAINERLESS": "Containerless",
   "DEMO_CONTENT_ID": "Content ID",
   "DEMO_CUSTOM": "Custom",
   "DEMO_CUSTOM_CONTENT": "CUSTOM CONTENT",
@@ -87,6 +88,7 @@
   "DEMO_HIGH_DEFINITION": "High definition",
   "DEMO_HIGH_DEFINITION_SEARCH": "Filters for assets with at least one high-definition video stream.",
   "DEMO_HLS": "HLS",
+  "DEMO_HLS_TAB": "HLS",
   "DEMO_HOME": "HOME",
   "DEMO_ICON_URL": "Icon URL",
   "DEMO_IGNORE_DASH_DRM": "Ignore DASH DRM Info",
@@ -98,6 +100,7 @@
   "DEMO_IMA_ASSET_KEY": "Asset key (for LIVE DAI Content)",
   "DEMO_IMA_CONTENT_SRC_ID": "Content source ID (for VOD DAI Content)",
   "DEMO_IMA_VIDEO_ID": "Video ID (for VOD DAI Content)",
+  "DEMO_IGNORE_MANIFEST_PROGRAM_DATE_TIME": "Ignore Program Date Time from manifest",
   "DEMO_IGNORE_MIN_BUFFER_TIME": "Ignore Min Buffer Time",
   "DEMO_IGNORE_TEXT_FAILURES": "Ignore Text Stream Failures",
   "DEMO_INACCURATE_MANIFEST_TOLERANCE": "Inaccurate Manifest Tolerance",
@@ -105,7 +108,6 @@
   "DEMO_INVALID_JSON_CONFIG_ERROR": "Invalid JSON configuration",
   "DEMO_IRT": "IRT",
   "DEMO_JSDELIVR": "jsDelivr",
-  "DEMO_JUMP_LARGE_GAPS": "Jump Large Gaps",
   "DEMO_LANGUAGE_SECTION_HEADER": "Language",
   "DEMO_LIBRARIES": "Google Hosted Libraries",
   "DEMO_LICENSE": "Apache License",
@@ -134,7 +136,6 @@
   "DEMO_MAX_FRAMERATE": "Max Framerate",
   "DEMO_MAX_HEIGHT": "Max Height",
   "DEMO_MAX_PIXELS": "Max Pixels",
-  "DEMO_MAX_SMALL_GAP_SIZE": "Maximum Small Gap Size",
   "DEMO_MAX_WIDTH": "Max Width",
   "DEMO_METACDN": "MetaCDN",
   "DEMO_MICROSOFT": "Microsoft",
@@ -158,12 +159,14 @@
   "DEMO_NUMBER_INTEGER_WARNING": "Must be a positive integer.",
   "DEMO_NUMBER_NONZERO_DECIMAL_WARNING": "Must be a positive, nonzero number.",
   "DEMO_NUMBER_NONZERO_INTEGER_WARNING": "Must be a positive, nonzero integer.",
+  "DEMO_NUMBER_OF_PARALLEL_DOWNLOADS": "Number of parallel downloads",
   "DEMO_OBSERVE_QUALITY_CHANGES": "Observe media quality changes",
   "DEMO_OFFLINE": "Downloadable",
   "DEMO_OFFLINE_SEARCH": "Filters for assets that can be stored offline.",
   "DEMO_OFFLINE_SECTION_HEADER": "Offline",
   "DEMO_FAILURE_MISC": "Shaka Player failed to load! If you are using an ad blocker, try switching to compiled mode at the bottom of the page.",
   "DEMO_FAILURE_NO_BROWSER_SUPPORT": "Your browser is not supported!",
+  "DEMO_HLS_FULL_MIME_TYPE": "Full Mime Type for Playing Media Playlists Directly",
   "DEMO_PLAY": "Play",
   "DEMO_PLAYREADY": "PlayReady DRM",
   "DEMO_PREFER_FORCED_SUBS": "Prefer Forced Subs",
@@ -176,6 +179,7 @@
   "DEMO_RESTRICTIONS_SECTION_HEADER": "Restrictions",
   "DEMO_SAFE_SEEK_OFFSET": "Safe Seek Offset",
   "DEMO_SAFE_SKIP_DISTANCE": "Safe Skip Distance",
+  "DEMO_SEGMENT_RELATIVE_VTT_TIMING": "Enable segment-relative VTT Timing",
   "DEMO_SESSION_ID": "Session ID",
   "DEMO_SAVE_BUTTON": "Save",
   "DEMO_SHAKA": "Shaka",
@@ -221,7 +225,6 @@
   "DEMO_UPDATE_EXPIRATION_TIME": "Update expiration time",
   "DEMO_UPDATE_INTERVAL_SECONDS": "Update interval seconds",
   "DEMO_UPLYNK": "Verizon Digital Media Services",
-  "DEMO_USE_FULL_SEGMENTS_FOR_START_TIME": "Use Full Segments For Start Time",
   "DEMO_USE_HEADERS": "Use Headers",
   "DEMO_USE_NATIVE_HLS_SAFARI": "Use native HLS on Safari",
   "DEMO_USE_PERSISTENT_LICENSES": "Use Persistent Licenses",

package/demo/locales/source.json

@@ -159,6 +159,10 @@
     "description": "A header on a search field that filters by container type.",
     "message": "Container"
   },
+  "DEMO_CONTAINERLESS": {
+    "description": "Text that describes an asset that has a stream with audio data not contained in a container.",
+    "message": "Containerless"
+  },
   "DEMO_CONTENT_ID": {
     "description": "The name of a configuration value.",
     "message": "Content ID"
@@ -351,6 +355,10 @@
     "description": "Text that describes an asset that is packaged in an HLS manifest.",
     "message": "[PROPER_NAME:HLS]"
   },
+  "DEMO_HLS_TAB": {
+    "description": "The header for a tab within the custom asset creation dialog.",
+    "message": "[PROPER_NAME:HLS]"
+  },
   "DEMO_HOME": {
     "description": "A link in the header, that switches to a page configuration for viewing the curated set of front-page content.",
     "message": "HOME"
@@ -395,9 +403,9 @@
     "description": "The label on a field that allows users to provide a video id for a custom asset.",
     "message": "Video ID (for VOD DAI Content)"
   },
-  "DEMO_USE_FULL_SEGMENTS_FOR_START_TIME": {
+  "DEMO_IGNORE_MANIFEST_PROGRAM_DATE_TIME": {
     "description": "The name of a configuration value.",
-    "message": "Use Full Segments For Start Time"
+    "message": "Ignore Program Date Time from manifest"
   },
   "DEMO_IGNORE_MIN_BUFFER_TIME": {
     "description": "The name of a configuration value.",
@@ -427,10 +435,6 @@
     "description": "A link in the footer, to Shaka Player in the jsDelivr CDN.",
     "message": "[PROPER_NAME:jsDelivr]"
   },
-  "DEMO_JUMP_LARGE_GAPS": {
-    "description": "The name of a configuration value.",
-    "message": "Jump Large Gaps"
-  },
   "DEMO_LANGUAGE_SECTION_HEADER": {
     "description": "The header for a section of configuration values.",
     "message": "Language"
@@ -543,10 +547,6 @@
     "description": "The name of a configuration value.",
     "message": "Max Pixels"
   },
-  "DEMO_MAX_SMALL_GAP_SIZE": {
-    "description": "The name of a configuration value.",
-    "message": "Maximum Small Gap Size"
-  },
   "DEMO_MAX_WIDTH": {
     "description": "The name of a configuration value.",
     "message": "Max Width"
@@ -639,6 +639,10 @@
     "description": "A warning on number inputs, telling the user what the expected input format is.",
     "message": "Must be a positive, nonzero integer."
   },
+  "DEMO_NUMBER_OF_PARALLEL_DOWNLOADS": {
+    "description": "The name of a configuration value.",
+    "message": "Number of parallel downloads."
+  },
   "DEMO_OBSERVE_QUALITY_CHANGES": {
     "description": "The name of a configuration value.",
     "message": "Observe media quality changes"
@@ -663,6 +667,10 @@
     "description": "An error displayed if Shaka Player is unable to load due to lack of browser support.",
     "message": "Your browser is not supported!"
   },
+  "DEMO_HLS_FULL_MIME_TYPE": {
+    "description": "The label on a field that allows users to provide a full mime type for a custom asset.",
+    "message": "Full Mime Type for Playing Media Playlists Directly"
+  },
   "DEMO_PLAY": {
     "description": "A button to play the attached asset.",
     "message": "Play"
@@ -715,6 +723,10 @@
     "description": "A button to save a custom asset.",
     "message": "Save"
   },
+  "DEMO_SEGMENT_RELATIVE_VTT_TIMING": {
+    "description": "The name of a configuration value.",
+    "message": "Enable segment-relative VTT Timing"
+  },
   "DEMO_SESSION_ID": {
     "description": "The name of a configuration value.",
     "message": "Session ID"

package/demo/main.js

@@ -582,7 +582,10 @@ shakaDemo.Main = class {
         };
         asset.storedProgress = 0;
         this.dispatchEventWithName_('shaka-main-offline-progress');
+        const start = Date.now();
         const stored = await storage.store(asset.manifestUri, metadata).promise;
+        const end = Date.now();
+        console.log('Download time:', end - start);
         asset.storedContent = stored;
       } catch (error) {
         this.onError_(/** @type {!shaka.util.Error} */ (error));
@@ -726,6 +729,9 @@ shakaDemo.Main = class {
     if (asset.features.includes(shakaAssets.Feature.MP2TS)) {
       mimeTypes.push('video/mp2t');
     }
+    if (asset.features.includes(shakaAssets.Feature.CONTAINERLESS)) {
+      mimeTypes.push('audio/aac');
+    }
     const hasSupportedMimeType = mimeTypes.some((type) => {
       return this.support_.media[type];
     });
@@ -941,9 +947,6 @@ shakaDemo.Main = class {
     if ('noadaptation' in params) {
       this.configure('abr.enabled', false);
     }
-    if ('jumpLargeGaps' in params) {
-      this.configure('streaming.jumpLargeGaps', true);
-    }
 
     // Add compiled/uncompiled links.
     this.makeVersionLinks_();
@@ -1124,6 +1127,9 @@ shakaDemo.Main = class {
     if (document.fullscreenElement) {
       document.exitFullscreen();
     }
+    if (this.video_.webkitDisplayingFullscreen) {
+      this.video_.webkitExitFullscreen();
+    }
     if (document.pictureInPictureElement) {
       document.exitPictureInPicture();
     }
@@ -1351,9 +1357,6 @@ shakaDemo.Main = class {
     if (!this.getCurrentConfigValue('abr.enabled')) {
       params.push('noadaptation');
     }
-    if (this.getCurrentConfigValue('streaming.jumpLargeGaps')) {
-      params.push('jumpLargeGaps');
-    }
     params.push('uilang=' + this.getUILocale());
 
     if (this.selectedAsset) {

package/demo/search.js

@@ -362,7 +362,8 @@ shakaDemo.Search = class {
         [Feature.DASH, Feature.HLS], FEATURE);
     this.makeSelectInput_(coreContainer,
         shakaDemo.MessageIds.CONTAINER_SEARCH,
-        [Feature.MP4, Feature.MP2TS, Feature.WEBM], FEATURE);
+        [Feature.MP4, Feature.MP2TS, Feature.WEBM, Feature.CONTAINERLESS],
+        FEATURE);
     this.makeSelectInput_(coreContainer,
         shakaDemo.MessageIds.DRM_SEARCH,
         Object.values(shakaAssets.KeySystem), DRM);

package/dist/controls.css

@@ -51,4 +51,4 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */.shaka-tooltips-on{overflow:visible}.shaka-tooltips-on>[class*=shaka-tooltip]{position:relative}.shaka-tooltips-on>[class*=shaka-tooltip]:active:after,.shaka-tooltips-on>[class*=shaka-tooltip]:focus-visible:after,.shaka-tooltips-on>[class*=shaka-tooltip]:hover:after{content:attr(aria-label);font-family:Roboto-Regular,Roboto,sans-serif;line-height:calc(32px / 2);white-space:nowrap;font-size:13px;background:rgba(35 35 35 / 90%);color:#fff;border-radius:3px;padding:5px 10px;position:absolute;bottom:calc(32px + 5px);left:calc(32px / 2);-webkit-transform:translateX(-50%);-moz-transform:translateX(-50%);-ms-transform:translateX(-50%);-o-transform:translateX(-50%);transform:translateX(-50%)}.shaka-tooltips-on>.shaka-tooltip-status:active:after,.shaka-tooltips-on>.shaka-tooltip-status:focus-visible:after,.shaka-tooltips-on>.shaka-tooltip-status:hover:after{content:attr(aria-label) " (" attr(shaka-status) ")"}.shaka-tooltips-on button:first-child:active:after,.shaka-tooltips-on button:first-child:focus-visible:after,.shaka-tooltips-on button:first-child:hover:after{left:0;-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0)}.shaka-tooltips-on button:last-child:active:after,.shaka-tooltips-on button:last-child:focus-visible:after,.shaka-tooltips-on button:last-child:hover:after{left:32px;-webkit-transform:translateX(-100%);-moz-transform:translateX(-100%);-ms-transform:translateX(-100%);-o-transform:translateX(-100%);transform:translateX(-100%)}@font-face{font-family:Roboto;font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu4mxP.ttf) format('truetype')}@font-face{font-family:'Material Icons Round';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialiconsround/v101/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmM.otf) format('opentype')}.material-icons-round{font-family:'Material Icons Round';font-weight:400;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr}/*# sourceMappingURL=controls.css.map */
+ */.shaka-tooltips-on{overflow:visible}.shaka-tooltips-on>[class*=shaka-tooltip]{position:relative}.shaka-tooltips-on>[class*=shaka-tooltip]:active:after,.shaka-tooltips-on>[class*=shaka-tooltip]:focus-visible:after,.shaka-tooltips-on>[class*=shaka-tooltip]:hover:after{content:attr(aria-label);font-family:Roboto-Regular,Roboto,sans-serif;line-height:calc(32px / 2);white-space:nowrap;font-size:13px;background:rgba(35 35 35 / 90%);color:#fff;border-radius:3px;padding:5px 10px;position:absolute;bottom:calc(32px + 5px);left:calc(32px / 2);-webkit-transform:translateX(-50%);-moz-transform:translateX(-50%);-ms-transform:translateX(-50%);-o-transform:translateX(-50%);transform:translateX(-50%)}.shaka-tooltips-on>.shaka-tooltip-status:active:after,.shaka-tooltips-on>.shaka-tooltip-status:focus-visible:after,.shaka-tooltips-on>.shaka-tooltip-status:hover:after{content:attr(aria-label) " (" attr(shaka-status) ")"}.shaka-tooltips-on button:first-child:active:after,.shaka-tooltips-on button:first-child:focus-visible:after,.shaka-tooltips-on button:first-child:hover:after{left:0;-webkit-transform:translateX(0);-moz-transform:translateX(0);-ms-transform:translateX(0);-o-transform:translateX(0);transform:translateX(0)}.shaka-tooltips-on button:last-child:active:after,.shaka-tooltips-on button:last-child:focus-visible:after,.shaka-tooltips-on button:last-child:hover:after{left:32px;-webkit-transform:translateX(-100%);-moz-transform:translateX(-100%);-ms-transform:translateX(-100%);-o-transform:translateX(-100%);transform:translateX(-100%)}@font-face{font-family:Roboto;font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu4mxP.ttf) format('truetype')}@font-face{font-family:'Material Icons Round';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialiconsround/v102/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmM.otf) format('opentype')}.material-icons-round{font-family:'Material Icons Round';font-weight:400;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr}/*# sourceMappingURL=controls.css.map */