shaka-player 3.3.2 → 4.0.0

package/build/test.py

@@ -19,13 +19,22 @@
 import argparse
 import json
 import logging
+import os
 import platform
+import re
 
 import build
 import gendeps
 import shakaBuildHelpers
 
 
+# Set a higher default for capture_timeout in grid mode.  If the test gets
+# queued by the grid, this may prevent Karma from killing the session while
+# waiting.
+LOCAL_CAPTURE_TIMEOUT = 1 * 60 * 1000  # 1m in ms
+SELENIUM_CAPTURE_TIMEOUT = 10 * 60 * 1000  # 10m in ms
+
+
 class _HandleMixedListsAction(argparse.Action):
   '''Action to handle comma-separated and space-separated lists.
 
@@ -59,6 +68,21 @@ class _HandleKeyValuePairs(argparse.Action):
     merged[key] = value
     setattr(namespace, self.dest, merged)
 
+def _KeyValueValidator(argument):
+    '''To validate the option has a key value pair format.
+
+      When you forget to provide the option in key=value format,
+      it reminds you by throwing an error before executing any tests.
+    '''
+
+    keyValuePair = [str for str in argument.split('=') if str != ''];
+
+    if len(keyValuePair) == 2:
+      return argument
+    else:
+      raise argparse.ArgumentTypeError(
+        'Received %s but expecting format of key=value' % argument
+      ) 
 
 def _IntGreaterThanZero(x):
   i = int(x)
@@ -85,6 +109,8 @@ def _GetDefaultBrowsers():
   raise Error('Unrecognized system: %s' % platform.uname()[0])
 
 
+# TODO(joeyparrish): When internal tools using this Launcher system are removed,
+# simplify this whole mess.
 class Launcher:
   """A stateful object for parsing arguments and running Karma commands.
 
@@ -111,7 +137,7 @@ class Launcher:
 
     running_commands = self.parser.add_argument_group(
         'Running',
-        'These commands affect how tests are ran.')
+        'These commands affect how tests are run.')
     logging_commands = self.parser.add_argument_group(
         'Logging',
         'These commands affect what gets logged and how the logs will appear.')
@@ -183,8 +209,14 @@ class Launcher:
         action='store_true')
     running_commands.add_argument(
         '--drm',
-        help='Run tests that require DRM.',
+        help='Run tests that require DRM (on by default).',
+        default=True,
         action='store_true')
+    running_commands.add_argument(
+        '--no-drm', '--nodrm',
+        help='Skip tests that require DRM (opposite of --drm).',
+        dest='drm',
+        action='store_false')
     running_commands.add_argument(
         '--quarantined',
         help='Run tests that have been quarantined.',
@@ -215,9 +247,9 @@ class Launcher:
     running_commands.add_argument(
         '--capture-timeout',
         help='Kill the browser if it does not capture in the given time [ms]. '
-             '(default %(default)s)',
-        type=int,
-        default=60000)
+             '(default {} for local, {} for Selenium)'.format(
+                 LOCAL_CAPTURE_TIMEOUT, SELENIUM_CAPTURE_TIMEOUT),
+        type=int)
     running_commands.add_argument(
         '--delay-tests',
         help='Insert an artificial delay between tests, in seconds. '
@@ -244,7 +276,7 @@ class Launcher:
         help='Configure license servers for the custom asset playback test. '
              'May be specified multiple times to configure multiple key '
              'systems.',
-        type=str,
+        type=_KeyValueValidator,
         metavar='KEY_SYSTEM_ID=LICENSE_SERVER_URI',
         action=_HandleKeyValuePairs)
     running_commands.add_argument(
@@ -258,6 +290,13 @@ class Launcher:
         help="Don't use Babel to convert ES6 to ES5.",
         dest='babel',
         action='store_false')
+    running_commands.add_argument(
+        '--grid-address',
+        help='Address (hostname:port) of a Selenium grid to run tests on.')
+    running_commands.add_argument(
+        '--grid-config',
+        help='Path to a yaml config defining Selenium grid browsers. '
+             '(See docs/selenium-grid-config.md)')
 
 
     logging_commands.add_argument(
@@ -313,6 +352,17 @@ class Launcher:
         help='Specify the hostname to be used when capturing browsers. This '
              'defaults to localhost.',
         default='localhost')
+    networking_commands.add_argument(
+        '--tls-key',
+        help='Specify a TLS key to serve tests over HTTPs.')
+    networking_commands.add_argument(
+        '--tls-cert',
+        help='Specify a TLS cert to serve tests over HTTPs.')
+    networking_commands.add_argument(
+        '--lets-encrypt-folder',
+        help="Specify a Let's Encrypt folder to search for the latest key and "
+             "cert, to serve tests over HTTPs.  This overrides --tls-key and "
+             "--tls-cert.")
 
 
     pre_launch_commands.add_argument(
@@ -345,28 +395,36 @@ class Launcher:
     pass_through = [
       'auto_watch',
       'babel',
+      'browsers',
       'capture_timeout',
       'colors',
+      'delay_tests',
       'drm',
+      'exclude_browsers',
       'external',
       'filter',
+      'grid_address',
+      'grid_config',
       'hostname',
       'html_coverage_report',
       'log_level',
       'logging',
+      'no_browsers',
       'port',
       'quarantined',
       'quick',
       'random',
+      'reporters',
       'report_slower_than',
       'seed',
       'single_run',
-      'uncompiled',
-      'delay_tests',
       'spec_hide_passed',
       'test_custom_asset',
       'test_custom_license_server',
       'test_timeout',
+      'tls_key',
+      'tls_cert',
+      'uncompiled',
     ]
 
     # Check each value before setting it to avoid passing null values.
@@ -375,8 +433,33 @@ class Launcher:
       if value is not None:
         self.karma_config[name] = value
 
-    if self.parsed_args.reporters:
-      self.karma_config['reporters'] = self.parsed_args.reporters
+    if not self.parsed_args.capture_timeout:
+      # The default for capture_timeout depends on whether or not we are using
+      # a Selenium grid.
+      if self.parsed_args.grid_config:
+        self.karma_config['capture_timeout'] = SELENIUM_CAPTURE_TIMEOUT
+      else:
+        self.karma_config['capture_timeout'] = LOCAL_CAPTURE_TIMEOUT
+
+    self._HandleLetsEncryptConfig()
+
+  def _HandleLetsEncryptConfig(self):
+    folder = self.parsed_args.lets_encrypt_folder
+    if not folder:
+      return
+
+    max_serial_number = 0
+    # Go through the contents of the folder to find the latest key & cert.
+    for file_name in os.listdir(folder):
+      matches = re.match(r'(?:privkey|fullchain)(\d+).pem', file_name)
+      if matches:
+        serial_number = int(matches.group(1))
+        max_serial_number = max(max_serial_number, serial_number)
+
+    self.karma_config['tls_key'] = os.path.join(
+        folder, 'privkey{}.pem'.format(max_serial_number))
+    self.karma_config['tls_cert'] = os.path.join(
+        folder, 'fullchain{}.pem'.format(max_serial_number))
 
   def ResolveBrowsers(self, default_browsers):
     """Decide what browsers we should use.
@@ -385,25 +468,7 @@ class Launcher:
        additional logic to derive a browser list from the parsed arguments.
     """
     assert(default_browsers and len(default_browsers))
-
-    if self.parsed_args.no_browsers:
-      logging.warning('In this mode browsers must manually connect to karma.')
-    elif self.parsed_args.browsers:
-      self.karma_config['browsers'] = self.parsed_args.browsers
-    else:
-      logging.warning('Using default browsers: %s', default_browsers)
-      self.karma_config['browsers'] = default_browsers
-
-    # Check if there are any browsers that we should remove
-    if self.parsed_args.exclude_browsers and 'browsers' in self.karma_config:
-      all_browsers = set(self.karma_config['browsers'])
-      bad_browsers = set(self.parsed_args.exclude_browsers)
-      if bad_browsers - all_browsers:
-        raise RuntimeError('Attempting to exclude unselected browsers: %s' %
-                           ','.join(bad_browsers - all_browsers))
-
-      good_browsers = all_browsers - bad_browsers
-      self.karma_config['browsers'] = list(good_browsers)
+    self.karma_config['default_browsers'] = default_browsers
 
   def RunCommand(self, karma_conf):
     """Build a command and send it to Karma for execution.

package/build/types/core

@@ -84,7 +84,6 @@
 +../../lib/util/mp4_box_parsers.js
 +../../lib/util/mp4_parser.js
 +../../lib/util/multi_map.js
-+../../lib/util/mutex.js
 +../../lib/util/networking.js
 +../../lib/util/object_utils.js
 +../../lib/util/operation_manager.js

package/build/types/polyfill

@@ -4,17 +4,15 @@
 +../../lib/polyfill/aria.js
 +../../lib/polyfill/encryption_scheme.js
 +../../lib/polyfill/fullscreen.js
-+../../lib/polyfill/mathround.js
 +../../lib/polyfill/mediasource.js
 +../../lib/polyfill/media_capabilities.js
 +../../lib/polyfill/orientation.js
-+../../lib/polyfill/patchedmediakeys_apple.js
-+../../lib/polyfill/patchedmediakeys_ms.js
 +../../lib/polyfill/patchedmediakeys_nop.js
 +../../lib/polyfill/patchedmediakeys_webkit.js
 +../../lib/polyfill/pip_webkit.js
 +../../lib/polyfill/random_uuid.js
 +../../lib/polyfill/storage_estimate.js
++../../lib/polyfill/symbol.js
 +../../lib/polyfill/video_play_promise.js
 +../../lib/polyfill/videoplaybackquality.js
 +../../lib/polyfill/vttcue.js

package/build/wrapper.template.js

@@ -6,7 +6,7 @@
 
 (function() {
   // This is "window" in browsers and "global" in nodejs.
-  // See https://github.com/google/shaka-player/issues/1445
+  // See https://github.com/shaka-project/shaka-player/issues/1445
   var innerGlobal = typeof window != 'undefined' ? window : global;
 
   // This is where our library exports things to.  It is "this" in the wrapped
@@ -18,7 +18,7 @@
   // $jscomp.global, which will be "window", or "global", or "this", depending
   // on circumstances.
   // See https://github.com/google/closure-compiler/issues/2957 and
-  // https://github.com/google/shaka-player/issues/1455#issuecomment-393250035
+  // https://github.com/shaka-project/shaka-player/issues/1455#issuecomment-393250035
 
   // We provide "global" for use by Closure, and "window" for use by the Shaka
   // library itself.  Both point to "innerGlobal" above.

package/demo/asset_card.js

@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 goog.provide('shakaDemo.AssetCard');
 
-
 goog.require('goog.asserts');
+goog.require('shakaAssets');
 goog.require('shakaDemo.MessageIds');
 goog.require('shakaDemo.Tooltips');
 goog.requireType('ShakaDemoAssetInfo');

package/demo/cast_receiver/index.html

@@ -63,7 +63,7 @@ UNCOMPILED_JS = [
     <script defer src="../load.js"></script>
   </head>
   <body>
-    <div data-shaka-player-container id="videoContainer">
+    <div data-shaka-player-container id="video-container">
       <video autoplay data-shaka-player id="video"></video>
     </div>
     <!-- Covers everything else while idle -->

package/demo/cast_receiver/receiver_app.css

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* Experimentation has revealed that unless html, body, and videoContainer are
+/* Experimentation has revealed that unless html, body, and video-container are
  * width and height 100%, video can force all its parents to grow larger than
  * window.innerHeight, causing things to be cut off for some content.
  */
@@ -25,7 +25,7 @@ body {
   color: white;
 }
 
-#videoContainer {
+#video-container {
   width: 100%;
   height: 100%;
 }
@@ -83,29 +83,29 @@ body:after {
   height: 0;
   overflow: hidden;
   z-index: -1;
-  content: url(idle1.jpg) url(idle2.jpg) url(idle3.jpg);
+  content: url("idle1.jpg") url("idle2.jpg") url("idle3.jpg");
 }
 
 @keyframes bg-change {
-  0% { background-image: url('idle1.jpg'); padding-left: 0; }
+  0% { background-image: url("idle1.jpg"); padding-left: 0; }
 
-  32% { background-image: url('idle1.jpg'); padding-left: 0; }
+  32% { background-image: url("idle1.jpg"); padding-left: 0; }
 
-  34% { background-image: url('idle2.jpg'); padding-left: 0; }
+  34% { background-image: url("idle2.jpg"); padding-left: 0; }
 
-  49% { background-image: url('idle2.jpg'); padding-left: 0; }
+  49% { background-image: url("idle2.jpg"); padding-left: 0; }
 
-  50% { background-image: url('idle2.jpg'); padding-left: 400px; }
+  50% { background-image: url("idle2.jpg"); padding-left: 400px; }
 
-  65% { background-image: url('idle2.jpg'); padding-left: 400px; }
+  65% { background-image: url("idle2.jpg"); padding-left: 400px; }
 
-  67% { background-image: url('idle3.jpg'); padding-left: 400px; }
+  67% { background-image: url("idle3.jpg"); padding-left: 400px; }
 
-  87% { background-image: url('idle3.jpg'); padding-left: 400px; }
+  87% { background-image: url("idle3.jpg"); padding-left: 400px; }
 
-  88% { background-image: url('idle3.jpg'); padding-left: 0; }
+  88% { background-image: url("idle3.jpg"); padding-left: 0; }
 
-  98% { background-image: url('idle3.jpg'); padding-left: 0; }
+  98% { background-image: url("idle3.jpg"); padding-left: 0; }
 
-  100% { background-image: url('idle1.jpg'); padding-left: 0; }
+  100% { background-image: url("idle1.jpg"); padding-left: 0; }
 }

package/demo/common/asset.js

@@ -77,6 +77,8 @@ const ShakaDemoAssetInfo = class {
     this.imaContentSrcId = null;
     /** @type {?string} */
     this.mimeType = null;
+    /** @type {?string} */
+    this.mediaPlaylistFullMimeType = null;
 
 
     // Offline storage values.
@@ -161,6 +163,15 @@ const ShakaDemoAssetInfo = class {
     return this.drm.length == 1 && this.drm[0] == shakaAssets.KeySystem.CLEAR;
   }
 
+  /**
+   * @param {string} mediaPlaylistFullMimeType
+   * @return {!ShakaDemoAssetInfo}
+   */
+  setMediaPlaylistFullMimeType(mediaPlaylistFullMimeType) {
+    this.mediaPlaylistFullMimeType = mediaPlaylistFullMimeType;
+    return this;
+  }
+
   /**
    * @param {!Object} extraConfig
    * @return {!ShakaDemoAssetInfo}
@@ -368,7 +379,7 @@ const ShakaDemoAssetInfo = class {
    */
   getConfiguration() {
     const config = /** @type {shaka.extern.PlayerConfiguration} */(
-      {drm: {advanced: {}}, manifest: {dash: {}}});
+      {drm: {advanced: {}}, manifest: {dash: {}, hls: {}}});
 
     if (this.extraConfig) {
       for (const key in this.extraConfig) {
@@ -376,6 +387,11 @@ 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) => {

package/demo/common/assets.js

@@ -13,6 +13,8 @@
 goog.require('ShakaDemoAssetInfo');
 goog.require('shakaDemo.MessageIds');
 
+goog.provide('shakaAssets');
+
 
 // Types and enums {{{
 /**
@@ -123,6 +125,8 @@ shakaAssets.Feature = {
   MP4: shakaDemo.MessageIds.MP4,
   // Set if the asset has at least one MPEG-2 TS stream.
   MP2TS: shakaDemo.MessageIds.MP2TS,
+  // Set if the asset has at least one containerless stream (AAC, etc).
+  CONTAINERLESS: shakaDemo.MessageIds.CONTAINERLESS,
 
   // Set if the asset has at least one stream that is at least 720p.
   HIGH_DEFINITION: shakaDemo.MessageIds.HIGH_DEFINITION,
@@ -292,6 +296,15 @@ shakaAssets.testAssets = [
       .addFeature(shakaAssets.Feature.SUBTITLES)
       .addFeature(shakaAssets.Feature.SURROUND)
       .addFeature(shakaAssets.Feature.OFFLINE),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Angel One (HLS, MP4, video media playlist only)',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/angel_one.png',
+      /* manifestUri= */ 'https://storage.googleapis.com/shaka-demo-assets/angel-one-hls/playlist_v-0480p-1000k-libx264.mp4.m3u8',
+      /* source= */ shakaAssets.Source.SHAKA)
+      .addFeature(shakaAssets.Feature.HLS)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.OFFLINE)
+      .setMediaPlaylistFullMimeType('video/mp4; codecs="avc1.4d401f"'),
   new ShakaDemoAssetInfo(
       /* name= */ 'Angel One (HLS, MP4, multilingual, Widevine)',
       /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/angel_one.png',
@@ -1188,6 +1201,24 @@ shakaAssets.testAssets = [
       .addFeature(shakaAssets.Feature.HLS)
       .addFeature(shakaAssets.Feature.LIVE)
       .addFeature(shakaAssets.Feature.MP4),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Audio only HLS with raw AAC',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/apple_test_pattern.png',
+      /* manifestUri= */ 'https://storage.googleapis.com/shaka-demo-assets/raw-hls-audio-only/manifest.m3u8',
+      /* source= */ shakaAssets.Source.APPLE)
+      .addFeature(shakaAssets.Feature.HLS)
+      .addFeature(shakaAssets.Feature.CONTAINERLESS)
+      .addFeature(shakaAssets.Feature.AUDIO_ONLY),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Apple Advanced HLS Stream (TS) with raw AAC',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/apple_test_pattern.png',
+      /* manifestUri= */ 'https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_ts/master.m3u8',
+      /* source= */ shakaAssets.Source.APPLE)
+      .addFeature(shakaAssets.Feature.HLS)
+      .addFeature(shakaAssets.Feature.MP2TS)
+      .addFeature(shakaAssets.Feature.CONTAINERLESS)
+      .addFeature(shakaAssets.Feature.HIGH_DEFINITION)
+      .addFeature(shakaAssets.Feature.OFFLINE),
   // }}}
 
   // IRT assets {{{

package/demo/common/message_ids.js

@@ -13,6 +13,7 @@ shakaDemo.MessageIds = {
   ADS: 'DEMO_ADS',
   AUDIO_ONLY: 'DEMO_AUDIO_ONLY',
   CAPTIONS: 'DEMO_CAPTIONS',
+  CONTAINERLESS: 'DEMO_CONTAINERLESS',
   DASH: 'DEMO_DASH',
   HIGH_DEFINITION: 'DEMO_HIGH_DEFINITION',
   HLS: 'DEMO_HLS',
@@ -106,6 +107,8 @@ shakaDemo.MessageIds = {
   DRM_SYSTEM: 'DEMO_DRM_SYSTEM',
   DRM_TAB: 'DEMO_DRM_TAB',
   EDIT_CUSTOM: 'DEMO_EDIT_CUSTOM',
+  HLS_FULL_MIME_TYPE: 'DEMO_HLS_FULL_MIME_TYPE',
+  HLS_TAB: 'DEMO_HLS_TAB',
   HEADERS_TAB: 'DEMO_HEADERS_TAB',
   ICON_URL: 'DEMO_ICON_URL',
   LICENSE_CERTIFICATE_URL: 'DEMO_LICENSE_CERTIFICATE_URL',
@@ -187,12 +190,11 @@ shakaDemo.MessageIds = {
   IGNORE_DASH_SUGGESTED_PRESENTATION_DELAY: 'DEMO_IGNORE_DASH_SUGGESTED_PRESENTATION_DELAY',
   IGNORE_HLS_IMAGE_FAILURES: 'DEMO_IGNORE_HLS_IMAGE_FAILURES',
   IGNORE_HLS_TEXT_FAILURES: 'DEMO_IGNORE_HLS_TEXT_FAILURES',
-  USE_FULL_SEGMENTS_FOR_START_TIME: 'DEMO_USE_FULL_SEGMENTS_FOR_START_TIME',
+  IGNORE_MANIFEST_PROGRAM_DATE_TIME: 'DEMO_IGNORE_MANIFEST_PROGRAM_DATE_TIME',
   IGNORE_MIN_BUFFER_TIME: 'DEMO_IGNORE_MIN_BUFFER_TIME',
   IGNORE_TEXT_FAILURES: 'DEMO_IGNORE_TEXT_FAILURES',
   INACCURATE_MANIFEST_TOLERANCE: 'DEMO_INACCURATE_MANIFEST_TOLERANCE',
   INITIAL_SEGMENT_LIMIT: 'DEMO_INITIAL_SEGMENT_LIMIT',
-  JUMP_LARGE_GAPS: 'DEMO_JUMP_LARGE_GAPS',
   LANGUAGE_SECTION_HEADER: 'DEMO_LANGUAGE_SECTION_HEADER',
   LOG_LEVEL: 'DEMO_LOG_LEVEL',
   LOG_LEVEL_DEBUG: 'DEMO_LOG_LEVEL_DEBUG',
@@ -208,7 +210,6 @@ shakaDemo.MessageIds = {
   MAX_FRAMERATE: 'DEMO_MAX_FRAMERATE',
   MAX_HEIGHT: 'DEMO_MAX_HEIGHT',
   MAX_PIXELS: 'DEMO_MAX_PIXELS',
-  MAX_SMALL_GAP_SIZE: 'DEMO_MAX_SMALL_GAP_SIZE',
   MAX_WIDTH: 'DEMO_MAX_WIDTH',
   MIN_BANDWIDTH: 'DEMO_MIN_BANDWIDTH',
   MIN_BYTES: 'DEMO_MIN_BYTES',
@@ -222,6 +223,7 @@ shakaDemo.MessageIds = {
   NUMBER_INTEGER_WARNING: 'DEMO_NUMBER_INTEGER_WARNING',
   NUMBER_NONZERO_DECIMAL_WARNING: 'DEMO_NUMBER_NONZERO_DECIMAL_WARNING',
   NUMBER_NONZERO_INTEGER_WARNING: 'DEMO_NUMBER_NONZERO_INTEGER_WARNING',
+  NUMBER_OF_PARALLEL_DOWNLOADS: 'DEMO_NUMBER_OF_PARALLEL_DOWNLOADS',
   OFFLINE_SECTION_HEADER: 'DEMO_OFFLINE_SECTION_HEADER',
   PREFER_FORCED_SUBS: 'DEMO_PREFER_FORCED_SUBS',
   PREFER_NATIVE_HLS: 'DEMO_PREFER_NATIVE_HLS',
@@ -229,6 +231,7 @@ shakaDemo.MessageIds = {
   RESTRICTIONS_SECTION_HEADER: 'DEMO_RESTRICTIONS_SECTION_HEADER',
   SAFE_SEEK_OFFSET: 'DEMO_SAFE_SEEK_OFFSET',
   SAFE_SKIP_DISTANCE: 'DEMO_SAFE_SKIP_DISTANCE',
+  SEGMENT_RELATIVE_VTT_TIMING: 'DEMO_SEGMENT_RELATIVE_VTT_TIMING',
   SESSION_ID: 'DEMO_SESSION_ID',
   SHAKA_CONTROLS: 'DEMO_SHAKA_CONTROLS',
   SLOW_HALF_LIFE: 'DEMO_SLOW_HALF_LIFE',

package/demo/config.js

@@ -11,7 +11,6 @@ goog.require('goog.asserts');
 goog.require('shakaDemo.BoolInput');
 goog.require('shakaDemo.DatalistInput');
 goog.require('shakaDemo.InputContainer');
-goog.require('shakaDemo.Main');
 goog.require('shakaDemo.MessageIds');
 goog.require('shakaDemo.NumberInput');
 goog.require('shakaDemo.SelectInput');
@@ -209,12 +208,12 @@ shakaDemo.Config = class {
             'manifest.hls.ignoreTextStreamFailures')
         .addBoolInput_(MessageIds.IGNORE_HLS_IMAGE_FAILURES,
             'manifest.hls.ignoreImageStreamFailures')
-        .addBoolInput_(MessageIds.USE_FULL_SEGMENTS_FOR_START_TIME,
-            'manifest.hls.useFullSegmentsForStartTime')
         .addTextInput_(MessageIds.DEFAULT_AUDIO_CODEC,
             'manifest.hls.defaultAudioCodec')
         .addTextInput_(MessageIds.DEFAULT_VIDEO_CODEC,
             'manifest.hls.defaultVideoCodec')
+        .addBoolInput_(MessageIds.IGNORE_MANIFEST_PROGRAM_DATE_TIME,
+            'manifest.hls.ignoreManifestProgramDateTime')
         .addNumberInput_(MessageIds.AVAILABILITY_WINDOW_OVERRIDE,
             'manifest.availabilityWindowOverride',
             /* canBeDecimal= */ true,
@@ -237,7 +236,9 @@ shakaDemo.Config = class {
         .addBoolInput_(MessageIds.DISABLE_TEXT,
             'manifest.disableText')
         .addBoolInput_(MessageIds.DISABLE_THUMBNAILS,
-            'manifest.disableThumbnails');
+            'manifest.disableThumbnails')
+        .addBoolInput_(MessageIds.SEGMENT_RELATIVE_VTT_TIMING,
+            'manifest.segmentRelativeVttTiming');
 
     this.addRetrySection_('manifest', MessageIds.MANIFEST_RETRY_SECTION_HEADER);
   }
@@ -340,7 +341,9 @@ shakaDemo.Config = class {
     const docLink = this.resolveExternLink_('.OfflineConfiguration');
     this.addSection_(MessageIds.OFFLINE_SECTION_HEADER, docLink)
         .addBoolInput_(MessageIds.USE_PERSISTENT_LICENSES,
-            'offline.usePersistentLicense');
+            'offline.usePersistentLicense')
+        .addNumberInput_(MessageIds.NUMBER_OF_PARALLEL_DOWNLOADS,
+            'offline.numberOfParallelDownloads');
   }
 
   /** @private */
@@ -351,9 +354,6 @@ shakaDemo.Config = class {
         .addNumberInput_(MessageIds.GAP_DETECTION_THRESHOLD,
             'streaming.gapDetectionThreshold',
             /* canBeDecimal= */ true)
-        .addNumberInput_(MessageIds.MAX_SMALL_GAP_SIZE,
-            'streaming.smallGapLimit',
-            /* canBeDecimal= */ true)
         .addNumberInput_(MessageIds.BUFFERING_GOAL,
             'streaming.bufferingGoal',
             /* canBeDecimal= */ true)
@@ -406,10 +406,8 @@ shakaDemo.Config = class {
       this.latestInput_.input().checked = true;
     }
 
-    this.addBoolInput_(MessageIds.JUMP_LARGE_GAPS,
-        'streaming.jumpLargeGaps')
-        .addBoolInput_(MessageIds.FORCE_TRANSMUX_TS,
-            'streaming.forceTransmuxTS')
+    this.addBoolInput_(MessageIds.FORCE_TRANSMUX_TS,
+        'streaming.forceTransmuxTS')
         .addBoolInput_(MessageIds.START_AT_SEGMENT_BOUNDARY,
             'streaming.startAtSegmentBoundary')
         .addBoolInput_(MessageIds.IGNORE_TEXT_FAILURES,

package/demo/custom.js

@@ -12,7 +12,6 @@ goog.require('ShakaDemoAssetInfo');
 goog.require('shakaDemo.AssetCard');
 goog.require('shakaDemo.Input');
 goog.require('shakaDemo.InputContainer');
-goog.require('shakaDemo.Main');
 goog.require('shakaDemo.MessageIds');
 goog.require('shakaDemo.TextInput');
 
@@ -245,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
@@ -674,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_(
@@ -713,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);
 
@@ -722,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/customWarning.txt

@@ -4,5 +4,5 @@ of the asset you were playing at the time you pressed the bug report button.
 We have detected that you were playing a custom asset.
 If this asset's URL is confidential, you might instead want to fill out an issue
 template manually:
-https://github.com/google/shaka-player/issues/new/choose
--->
+https://github.com/shaka-project/shaka-player/issues/new/choose
+-->