Merge remote-tracking branch 'hugo/master' into mpd-patch

shaka-project · Dec 5, 2023 · d14971c · d14971c
2 parents 936244f + 1af93e6
commit d14971c
Show file tree

Hide file tree

Showing 120 changed files with 1,459 additions and 239 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,12 +1,32 @@
+# exclude core
 !core
+
+# github
 .git
 .gitattributes
 .gitignore
+.github
 .release-please*
 *.backup
+
+# python
 *.pyc
+
+# directories
 app-engine/
 build/
-docs/api/
 coverage/
-test/test/assets/screenshots/
+demo/
+docs/
+
+# tests
+test/
+karma.conf.js
+
+# dist
+dist/demo.*
+dist/receiver.*
+
+# markdown
+*.md
+!README.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,53 @@
 # Changelog
 
+## [4.7.0](https://github.com/shaka-project/shaka-player/compare/v4.6.0...v4.7.0) (2023-12-04)
+
+
+### Features
+
+* Add config to allow Media Source recoveries ([#5938](https://github.com/shaka-project/shaka-player/issues/5938)) ([0deb25b](https://github.com/shaka-project/shaka-player/commit/0deb25b57f0612a802ad8fbc8e3e379dff54a57c))
+* Add config to prefer spatial audio ([#5963](https://github.com/shaka-project/shaka-player/issues/5963)) ([90bc6a7](https://github.com/shaka-project/shaka-player/commit/90bc6a7c783103aaa4fca1a6284be338f9ec7301))
+* add preferred video label ([#5948](https://github.com/shaka-project/shaka-player/issues/5948)) ([503327a](https://github.com/shaka-project/shaka-player/commit/503327a0e3570372d85e5cf4af62230ede35b1bf))
+* Add support for Common Media Server Data (CMSD) ([#5900](https://github.com/shaka-project/shaka-player/issues/5900)) ([966b910](https://github.com/shaka-project/shaka-player/commit/966b910edcd3fea03e0276bee1f36ad859a453f6))
+* Avoid streams which cannot fit into the browser's MediaSource quota ([#5937](https://github.com/shaka-project/shaka-player/issues/5937)) ([c496aaf](https://github.com/shaka-project/shaka-player/commit/c496aafaeb505851b6606f6a9567fcaae1930ac7))
+* **DASH:** Add support for location in Content Steering ([#5914](https://github.com/shaka-project/shaka-player/issues/5914)) ([8f453c2](https://github.com/shaka-project/shaka-player/commit/8f453c245fd21c907109f2982c25514869ffb2e3))
+* **DASH:** Handle mixed-codec variants. ([#5950](https://github.com/shaka-project/shaka-player/issues/5950)) ([24e3255](https://github.com/shaka-project/shaka-player/commit/24e32559bff6457aa8a1b356f26d83b6a320b9b2)), closes [#5961](https://github.com/shaka-project/shaka-player/issues/5961)
+* **Demo:** Add field for chapters URL when adding custom content ([#5934](https://github.com/shaka-project/shaka-player/issues/5934)) ([d1bc83d](https://github.com/shaka-project/shaka-player/commit/d1bc83dd53fb596a8ff22a111c26d2331860e303))
+* **Demo:** Add field for text URL when adding custom content ([#5953](https://github.com/shaka-project/shaka-player/issues/5953)) ([5c4a3a2](https://github.com/shaka-project/shaka-player/commit/5c4a3a24558c5b443f78fb4cf234a4f3a60674f1))
+* **Demo:** Use MediaSession action handler in the demo ([#5927](https://github.com/shaka-project/shaka-player/issues/5927)) ([078ab36](https://github.com/shaka-project/shaka-player/commit/078ab36201946ce3f854197e7985dbdc56c6e9dc))
+* expose CEA708 window position in the cue's region ([#5924](https://github.com/shaka-project/shaka-player/issues/5924)) ([2a524bf](https://github.com/shaka-project/shaka-player/commit/2a524bf51fc613b8ebddb5794524cbb3f6366d4b))
+* Fix Media Source recoveries in some cases ([#5966](https://github.com/shaka-project/shaka-player/issues/5966)) ([b2a880b](https://github.com/shaka-project/shaka-player/commit/b2a880b402dd1eeef418383f7bed1a709369d8b4))
+* Improve npm package size ([#5955](https://github.com/shaka-project/shaka-player/issues/5955)) ([ca28063](https://github.com/shaka-project/shaka-player/commit/ca28063427167933fc2ef198a5622610332eefbd))
+* Set baseDelay to 100 by default for low latency streaming ([#5926](https://github.com/shaka-project/shaka-player/issues/5926)) ([515a4ab](https://github.com/shaka-project/shaka-player/commit/515a4ab02b15b11ee5e6873d6eaa80cfaa472482))
+* **UI:** Add double tap to forward/rewind in the video ([#5943](https://github.com/shaka-project/shaka-player/issues/5943)) ([918c30b](https://github.com/shaka-project/shaka-player/commit/918c30b25ae7d193bef82de95d6e0e807426cea9))
+* **UI:** Add more keyboard shortcuts ([#5942](https://github.com/shaka-project/shaka-player/issues/5942)) ([2fcc2f8](https://github.com/shaka-project/shaka-player/commit/2fcc2f8f123a5fe4c43bdebdef7c97edd7b83cb1))
+* **UI:** Hide language and resolution overflow menu button if there's only one choice ([#5928](https://github.com/shaka-project/shaka-player/issues/5928)) ([628bb63](https://github.com/shaka-project/shaka-player/commit/628bb63c4c082b44f749876cf1cb8b3f06887d0b))
+
+
+### Bug Fixes
+
+* **CEA:** Fix positioning in CEA-608 ([#5925](https://github.com/shaka-project/shaka-player/issues/5925)) ([83f6f53](https://github.com/shaka-project/shaka-player/commit/83f6f5379bfaffac0166c08c0a5e038b6b5d439f))
+* **DASH:** Fix bad url when specify using a full WebVTT with BaseURL ([#5954](https://github.com/shaka-project/shaka-player/issues/5954)) ([ba85ece](https://github.com/shaka-project/shaka-player/commit/ba85ece3ac4dd8d2df788f29b8a0530ba110d234))
+* **DASH:** Fix false redirect detection ([#5910](https://github.com/shaka-project/shaka-player/issues/5910)) ([3a68623](https://github.com/shaka-project/shaka-player/commit/3a686239461cd2389ebb11615cd01886421a6fdd))
+* **DASH:** SegmentTemplate@media not updated after change in manifest ([#5899](https://github.com/shaka-project/shaka-player/issues/5899)) ([30de177](https://github.com/shaka-project/shaka-player/commit/30de1771cf598068f5e0b446b36f07eb12676f4d))
+* **Demo:** Allow configure some missing configs ([#5918](https://github.com/shaka-project/shaka-player/issues/5918)) ([c62e38c](https://github.com/shaka-project/shaka-player/commit/c62e38c6e35bdeb2b5c6ecc68c85e9b28d13e39d))
+* **Demo:** Pressing "Edit" button unstores custom asset, but does not update "stored" button ([#5936](https://github.com/shaka-project/shaka-player/issues/5936)) ([82b958f](https://github.com/shaka-project/shaka-player/commit/82b958f3e4e34d2d6952f7f425d9f47a944a1e3b))
+* Fix color detection in text utils ([#5970](https://github.com/shaka-project/shaka-player/issues/5970)) ([68903e1](https://github.com/shaka-project/shaka-player/commit/68903e130ec85585211d5b89ee92d6610aa6e4b3))
+* Fix ESDS box parser ([#5952](https://github.com/shaka-project/shaka-player/issues/5952)) ([7683892](https://github.com/shaka-project/shaka-player/commit/76838921065d71bf31183f5a4b7ac775f24e800b))
+* Fix init segment comparison ([#5920](https://github.com/shaka-project/shaka-player/issues/5920)) ([82ab893](https://github.com/shaka-project/shaka-player/commit/82ab8937e68e2a46002794d86fea1527cbba213e))
+* Fix language comparison in addTextTrackAsync ([#5904](https://github.com/shaka-project/shaka-player/issues/5904)) ([f708318](https://github.com/shaka-project/shaka-player/commit/f7083183c30339e7074d7501a94fabb4ea3166df))
+* Fix reset Media Source when using mixed codecs in different containers ([#5949](https://github.com/shaka-project/shaka-player/issues/5949)) ([419b1c3](https://github.com/shaka-project/shaka-player/commit/419b1c35d8c72c77fe17cb65d43d8f1c0f24f298))
+* Fix trackschanged event not fired after a license request is denied for some tracks ([#5962](https://github.com/shaka-project/shaka-player/issues/5962)) ([4eba182](https://github.com/shaka-project/shaka-player/commit/4eba182826e71040dd2ed55072ecc1a4704ce536))
+* Fix transmuxer when sample has no video data ([#5933](https://github.com/shaka-project/shaka-player/issues/5933)) ([6102060](https://github.com/shaka-project/shaka-player/commit/610206002838157658bdadb608588c4430cf075d))
+* **HLS:** Fix m4s extension detection ([#5951](https://github.com/shaka-project/shaka-player/issues/5951)) ([d89945f](https://github.com/shaka-project/shaka-player/commit/d89945fc78ed671caabb6d8a5a8134630d5f89b4))
+* **HLS:** Provide a fallback to GET request when HEAD request fails ([#5964](https://github.com/shaka-project/shaka-player/issues/5964)) ([fb5a833](https://github.com/shaka-project/shaka-player/commit/fb5a833df86a03d9f282f37fb2a3a61e61fa9c84))
+* **HLS:** Recognize CEA subtitles when CLOSED-CAPTIONS attribute is missing ([#5916](https://github.com/shaka-project/shaka-player/issues/5916)) ([58d4597](https://github.com/shaka-project/shaka-player/commit/58d45976d83d5a2b63bf1c1a2defa018fc5c5d8c))
+* Only append to the buffer init segments when the segment is independent ([#5921](https://github.com/shaka-project/shaka-player/issues/5921)) ([09f2a2e](https://github.com/shaka-project/shaka-player/commit/09f2a2e887459a534d13a7b0a9c3d65c77c4a403))
+* Properly size region anchor from LINE units ([#5941](https://github.com/shaka-project/shaka-player/issues/5941)) ([8b6602e](https://github.com/shaka-project/shaka-player/commit/8b6602ec7c82717a56b672e5c2697856eab44ad2))
+* **UI:** Correctly display video time and duration for VOD ([#5929](https://github.com/shaka-project/shaka-player/issues/5929)) ([00ff864](https://github.com/shaka-project/shaka-player/commit/00ff864c2c948de611ab8959e35194e5d356a751))
+* Unmask errors on LL ([#5908](https://github.com/shaka-project/shaka-player/issues/5908)) ([c898364](https://github.com/shaka-project/shaka-player/commit/c8983646c1d3d1721ed86a5d8376dea84835ad63))
+* **WebVTT:** Fix support for line vertical alignment ([#5945](https://github.com/shaka-project/shaka-player/issues/5945)) ([9f5e461](https://github.com/shaka-project/shaka-player/commit/9f5e46190ca00b1df36d5210852962bb52aac0c4))
+
 ## [4.6.0](https://github.com/shaka-project/shaka-player/compare/v4.5.0...v4.6.0) (2023-11-16)
 
 

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -55,6 +55,7 @@ Esteban Dosztal <edosztal@gmail.com>
 Fadomire <fadomire@gmail.com>
 Fernando Neira <slocomber@gmail.com>
 François Beaufort <fbeaufort@google.com>
+Gary Katsevman <git@gkatsev.com>
 Gerardo Meola <meola.gerardo@gmail.com>
 Gil Gonen <gil.gonen@gmail.com>
 Giorgio Gamberoni <giorgio.gamberoni@gmail.com>

diff --git a/README.md b/README.md
@@ -104,6 +104,7 @@ DASH features supported:
  - Trick mode tracks
  - WebVTT and TTML
  - CEA-608/708 captions
+ - Multi-codec variants (on platforms with changeType support)
 
 DASH features **not** supported:
  - Xlink with actuate=onRequest

diff --git a/build/types/ui b/build/types/ui
@@ -16,6 +16,9 @@
 +../../ui/element.js
 +../../ui/fast_forward_button.js
 +../../ui/fullscreen_button.js
++../../ui/hidden_fast_forward_button.js
++../../ui/hidden_rewind_button.js
++../../ui/hidden_seek_button.js
 +../../ui/language_utils.js
 +../../ui/localization.js
 +../../ui/loop_button.js

diff --git a/demo/common/asset.js b/demo/common/asset.js
@@ -7,7 +7,6 @@
 
 /**
  * @fileoverview
- * @suppress {missingRequire}
  */
 
 goog.provide('ShakaDemoAssetInfo');
@@ -316,6 +315,17 @@ const ShakaDemoAssetInfo = class {
     return this;
   }
 
+  /**
+   * @param {string} textUri
+   * @return {!ShakaDemoAssetInfo}
+   */
+  removeExtraText(textUri) {
+    this.extraText = this.extraText.filter((extraText) => {
+      return extraText.uri != textUri;
+    });
+    return this;
+  }
+
   /**
    * @param {string} uri
    * @return {!ShakaDemoAssetInfo}

diff --git a/demo/common/assets.js b/demo/common/assets.js
@@ -7,7 +7,6 @@
 
 /**
  * @fileoverview
- * @suppress {missingRequire}
  */
 
 goog.require('ShakaDemoAssetInfo');

diff --git a/demo/config.js b/demo/config.js
@@ -195,6 +195,8 @@ shakaDemo.Config = class {
             'manifest.dash.ignoreEmptyAdaptationSet')
         .addBoolInput_('Ignore DASH maxSegmentDuration',
             'manifest.dash.ignoreMaxSegmentDuration')
+        .addBoolInput_('Allow DASH multi type variants',
+            'manifest.dash.multiTypeVariantsAllowed')
         .addBoolInput_('Ignore HLS Text Stream Failures',
             'manifest.hls.ignoreTextStreamFailures')
         .addBoolInput_('Ignore HLS Image Stream Failures',
@@ -532,6 +534,7 @@ shakaDemo.Config = class {
     this.addSection_('Language', docLink)
         .addTextInput_('Preferred Audio Language', 'preferredAudioLanguage')
         .addTextInput_('Preferred Audio Label', 'preferredAudioLabel')
+        .addTextInput_('Preferred Video Label', 'preferredVideoLabel')
         .addTextInput_('Preferred Variant Role', 'preferredVariantRole')
         .addTextInput_('Preferred Text Language', 'preferredTextLanguage')
         .addTextInput_('Preferred Text Role', 'preferredTextRole')
@@ -547,6 +550,7 @@ shakaDemo.Config = class {
     this.latestInput_.input().value = shakaDemoMain.getUILocale();
     this.addNumberInput_('Preferred Audio Channel Count',
         'preferredAudioChannelCount');
+    this.addBoolInput_('Prefer Spatial Audio', 'preferSpatialAudio');
     this.addBoolInput_('Prefer Forced Subs', 'preferForcedSubs');
   }
 

diff --git a/demo/custom.js b/demo/custom.js
@@ -462,20 +462,131 @@ shakaDemo.Custom = class {
     this.makeField_(
         container, 'Thumbnails URL', thumbnailsUrlSetup, thumbnailsUrlOnChange);
 
-    // Because this field can theoretically contain an unlimited number of
-    // values, it has to take up an entire section by itself.
-    const makeEmptyRow = () => {
-      makePreFilledRow(/* chapterUrl= */ null, /* chapterLanguage= */ null);
-    };
     /**
      * @type {!Array.<{
-     *   chapterUrl: ?string,
+     *   uri: ?string,
      *   div: !Element,
      * }>}
      */
     const collisionCheckEntries = [];
+
+    // Because this field can theoretically contain an unlimited number of
+    // values, it has to take up an entire section by itself.
+    const makeEmptyRowForText = () => {
+      makePreFilledRowForText(
+          /* textUrl= */ null, /* textLanguage= */ null);
+    };
     /** @type {function(?string, ?string)} */
-    const makePreFilledRow = (chapterUrl, chapterLanguage) => {
+    const makePreFilledRowForText = (textUrl, textLanguage) => {
+      const div = document.createElement('div');
+      extraTracksDiv.appendChild(div);
+      const containerStyle = shakaDemo.InputContainer.Style.VERTICAL;
+      const container = new shakaDemo.InputContainer(
+          div, 'Subtitle', containerStyle,
+          /* docLink= */ null);
+
+      const collisionCheckEntry = {
+        uri: textUrl,
+        div,
+      };
+      collisionCheckEntries.push(collisionCheckEntry);
+
+      // Don't add a new row for a row that was pre-filled.
+      let firstTime = !textUrl;
+      const onChange = (newTextUrl, newTextLanguage) => {
+        if (textUrl) {
+          // In case the subtitle url changed, remove the old subtitle.
+          assetInProgress.removeExtraText(textUrl);
+        }
+        // Set the new values.
+        textUrl = newTextUrl;
+        collisionCheckEntry.uri = newTextUrl;
+        textLanguage = newTextLanguage;
+        if (!textUrl || !textLanguage) {
+          if (!firstTime) {
+            // The user has set a field that used to be filled to empty.
+            // This signals that they probably want to remove this subtitle.
+            extraTracksDiv.removeChild(div);
+          }
+          return;
+        }
+        if (firstTime) {
+          firstTime = false;
+          // You have filled out this row for the first time; add a new row, in
+          // case the user wants to add more subtitles.
+          makeEmptyRowForText();
+          // Update the componentHandler, to account for the new MDL elements.
+          componentHandler.upgradeDom();
+        }
+        assetInProgress.extraText.push({
+          uri: String(textUrl),
+          language: String(textLanguage),
+          kind: 'subtitle',
+          mime: '',
+        });
+        // Eliminate any OTHER subtitles with the same name. Assume this newly
+        // added/modified one is the "correct" one.
+        for (const entry of collisionCheckEntries) {
+          if (entry == collisionCheckEntry) {
+            // You can't "collide" with yourself.
+            continue;
+          }
+          if (textUrl != entry.uri) {
+            // It's not a collision.
+            continue;
+          }
+          // Remove the entry for the old field from the array.
+          const idx = collisionCheckEntries.indexOf(entry);
+          collisionCheckEntries.splice(idx, 1);
+          // Remove the div for the old field from the overall extra tracks div.
+          extraTracksDiv.removeChild(entry.div);
+          break;
+        }
+      };
+
+      const nameSetup = (input, container) => {
+        if (textUrl) {
+          input.value = textUrl;
+        }
+      };
+      const nameOnChange = (input) => {
+        onChange(input.value, textLanguage);
+      };
+      this.makeField_(container, 'Subtitle URL', nameSetup, nameOnChange);
+
+      const valueSetup = (input, container) => {
+        if (textLanguage) {
+          input.value = textLanguage;
+        }
+      };
+      const valueOnChange = (input) => {
+        onChange(textUrl, input.value);
+      };
+      this.makeField_(
+          container, 'Subtitle Language', valueSetup, valueOnChange);
+    };
+    if (!assetInProgress.extraText.length) {
+      // It starts out with a single empty row, but each time you start filling
+      // out one for the first time it adds a new one. Empty rows are ignored in
+      // the actual data.
+      makeEmptyRowForText();
+    } else {
+      // Make a row for each subtitles.
+      for (const extraText of assetInProgress.extraText) {
+        makePreFilledRowForText(extraText.uri, extraText.language);
+      }
+      // ...and also an empty one at the end.
+      makeEmptyRowForText();
+    }
+
+    // Because this field can theoretically contain an unlimited number of
+    // values, it has to take up an entire section by itself.
+    const makeEmptyRowForChapter = () => {
+      makePreFilledRowForChapter(
+          /* chapterUrl= */ null, /* chapterLanguage= */ null);
+    };
+    /** @type {function(?string, ?string)} */
+    const makePreFilledRowForChapter = (chapterUrl, chapterLanguage) => {
       const div = document.createElement('div');
       extraTracksDiv.appendChild(div);
       const containerStyle = shakaDemo.InputContainer.Style.VERTICAL;
@@ -484,7 +595,7 @@ shakaDemo.Custom = class {
           /* docLink= */ null);
 
       const collisionCheckEntry = {
-        chapterUrl,
+        url: chapterUrl,
         div,
       };
       collisionCheckEntries.push(collisionCheckEntry);
@@ -498,7 +609,7 @@ shakaDemo.Custom = class {
         }
         // Set the new values.
         chapterUrl = newChapterUrl;
-        collisionCheckEntry.chapterUrl = newChapterUrl;
+        collisionCheckEntry.uri = newChapterUrl;
         chapterLanguage = newChapterLanguage;
         if (!chapterUrl || !chapterLanguage) {
           if (!firstTime) {
@@ -512,7 +623,7 @@ shakaDemo.Custom = class {
           firstTime = false;
           // You have filled out this row for the first time; add a new row, in
           // case the user wants to add more chapters.
-          makeEmptyRow();
+          makeEmptyRowForChapter();
           // Update the componentHandler, to account for the new MDL elements.
           componentHandler.upgradeDom();
         }
@@ -528,7 +639,7 @@ shakaDemo.Custom = class {
             // You can't "collide" with yourself.
             continue;
           }
-          if (chapterUrl != entry.chapterUrl) {
+          if (chapterUrl != entry.uri) {
             // It's not a collision.
             continue;
           }
@@ -565,14 +676,14 @@ shakaDemo.Custom = class {
       // It starts out with a single empty row, but each time you start filling
       // out one for the first time it adds a new one. Empty rows are ignored in
       // the actual data.
-      makeEmptyRow();
+      makeEmptyRowForChapter();
     } else {
       // Make a row for each chapter.
       for (const extraChapter of assetInProgress.extraChapter) {
-        makePreFilledRow(extraChapter.uri, extraChapter.language);
+        makePreFilledRowForChapter(extraChapter.uri, extraChapter.language);
       }
       // ...and also an empty one at the end.
-      makeEmptyRow();
+      makeEmptyRowForChapter();
     }
 
     return extraTracksDiv;

diff --git a/demo/main.js b/demo/main.js
@@ -1263,8 +1263,13 @@ shakaDemo.Main = class {
       }
 
       for (const extraText of asset.extraText) {
-        this.player_.addTextTrackAsync(extraText.uri, extraText.language,
-            extraText.kind, extraText.mime, extraText.codecs);
+        if (extraText.mime) {
+          this.player_.addTextTrackAsync(extraText.uri, extraText.language,
+              extraText.kind, extraText.mime, extraText.codecs);
+        } else {
+          this.player_.addTextTrackAsync(extraText.uri, extraText.language,
+              extraText.kind);
+        }
       }
 
       for (const extraThumbnail of asset.extraThumbnail) {