From b3621c26a86897ba80c17b68f316e22aba61b30b Mon Sep 17 00:00:00 2001
From: Maria Maddox <mariaddox@yahoo.com>
Date: Tue, 27 Sep 2022 09:16:58 -0700
Subject: [PATCH 01/13] fix: check for negative rows before moving (#4510)

Closes #4508
---
 lib/cea/cea608_memory.js       |  4 ++
 test/cea/cea608_memory_unit.js | 88 ++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/lib/cea/cea608_memory.js b/lib/cea/cea608_memory.js
index a30d8e8073..751141a39f 100644
--- a/lib/cea/cea608_memory.js
+++ b/lib/cea/cea608_memory.js
@@ -184,6 +184,10 @@ shaka.cea.Cea608Memory = class {
    * @param {number} count Count of rows to move.
    */
   moveRows(dst, src, count) {
+    if (src < 0 || dst < 0) {
+      return;
+    }
+
     if (dst >= src) {
       for (let i = count-1; i >= 0; i--) {
         this.rows_[dst + i] = this.rows_[src + i].map((e) => e);
diff --git a/test/cea/cea608_memory_unit.js b/test/cea/cea608_memory_unit.js
index 4105b0bd41..b7858c414c 100644
--- a/test/cea/cea608_memory_unit.js
+++ b/test/cea/cea608_memory_unit.js
@@ -295,5 +295,93 @@ describe('Cea608Memory', () => {
       const caption = memory.forceEmit(startTime, endTime);
       expect(caption).toEqual(expectedCaption);
     });
+
+    it('does not move rows if source row index is negative', () => {
+      const startTime = 1;
+      const endTime = 2;
+      const text = 'test';
+
+      // Add the text to the buffer, each character on separate rows.
+      // At this point, the memory looks like:
+      // [1]: t
+      // [2]: e
+      // [3]: s
+      // [4]: t
+      for (const c of text) {
+        memory.addChar(CharSet.BASIC_NORTH_AMERICAN,
+            c.charCodeAt(0));
+        memory.setRow(memory.getRow() + 1); // increment row
+      }
+
+      const srcRowIdx = -1;
+      const dstRowIdx = 2;
+      const rowsToMove = 3;
+      memory.moveRows(dstRowIdx, srcRowIdx, rowsToMove);
+
+      // Expected text is 't\ne\ns\nt'
+      const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
+      topLevelCue.nestedCues = [
+        CeaUtils.createDefaultCue(startTime, endTime, 't'),
+        CeaUtils.createLineBreakCue(startTime, endTime),
+        CeaUtils.createDefaultCue(startTime, endTime, 'e'),
+        CeaUtils.createLineBreakCue(startTime, endTime),
+        CeaUtils.createDefaultCue(startTime, endTime, 's'),
+        CeaUtils.createLineBreakCue(startTime, endTime),
+        CeaUtils.createDefaultCue(startTime, endTime, 't'),
+      ];
+
+      const expectedCaption = {
+        stream,
+        cue: topLevelCue,
+      };
+
+      // Force out the new memory.
+      const caption = memory.forceEmit(startTime, endTime);
+      expect(caption).toEqual(expectedCaption);
+    });
+
+    it('does not move rows if destination row index is negative', () => {
+      const startTime = 1;
+      const endTime = 2;
+      const text = 'test';
+
+      // Add the text to the buffer, each character on separate rows.
+      // At this point, the memory looks like:
+      // [1]: t
+      // [2]: e
+      // [3]: s
+      // [4]: t
+      for (const c of text) {
+        memory.addChar(CharSet.BASIC_NORTH_AMERICAN,
+            c.charCodeAt(0));
+        memory.setRow(memory.getRow() + 1); // increment row
+      }
+
+      const srcRowIdx = 1;
+      const dstRowIdx = -2;
+      const rowsToMove = 3;
+      memory.moveRows(dstRowIdx, srcRowIdx, rowsToMove);
+
+      // Expected text is 't\ne\ns\nt'
+      const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
+      topLevelCue.nestedCues = [
+        CeaUtils.createDefaultCue(startTime, endTime, 't'),
+        CeaUtils.createLineBreakCue(startTime, endTime),
+        CeaUtils.createDefaultCue(startTime, endTime, 'e'),
+        CeaUtils.createLineBreakCue(startTime, endTime),
+        CeaUtils.createDefaultCue(startTime, endTime, 's'),
+        CeaUtils.createLineBreakCue(startTime, endTime),
+        CeaUtils.createDefaultCue(startTime, endTime, 't'),
+      ];
+
+      const expectedCaption = {
+        stream,
+        cue: topLevelCue,
+      };
+
+      // Force out the new memory.
+      const caption = memory.forceEmit(startTime, endTime);
+      expect(caption).toEqual(expectedCaption);
+    });
   });
 });

From 32b0a90a8c583bba03a3d7b035a1244d325e3da6 Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@users.noreply.github.com>
Date: Tue, 27 Sep 2022 19:51:46 -0700
Subject: [PATCH 02/13] fix(ttml): Default TTML background color to transparent
 if unspecified (#4496)

Closes #4468
---
 lib/text/ttml_text_parser.js       |  6 ++++
 test/test/util/ttml_utils.js       |  2 --
 test/text/ttml_text_parser_unit.js | 46 ++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/lib/text/ttml_text_parser.js b/lib/text/ttml_text_parser.js
index de34a05241..bf26ec4509 100644
--- a/lib/text/ttml_text_parser.js
+++ b/lib/text/ttml_text_parser.js
@@ -164,6 +164,12 @@ shaka.text.TtmlTextParser = class {
           cellResolutionInfo, /* parentCueElement= */ null,
           /* isContent= */ false);
       if (cue) {
+        // According to the TTML spec, backgrounds default to transparent.
+        // So default the background of the top-level element to transparent.
+        // Nested elements may override that background color already.
+        if (!cue.backgroundColor) {
+          cue.backgroundColor = 'transparent';
+        }
         cues.push(cue);
       }
     }
diff --git a/test/test/util/ttml_utils.js b/test/test/util/ttml_utils.js
index bb7ed09482..a8417bade4 100644
--- a/test/test/util/ttml_utils.js
+++ b/test/test/util/ttml_utils.js
@@ -51,8 +51,6 @@ shaka.test.TtmlUtils = class {
         region,
         nestedCues: jasmine.any(Object),
         payload: '',
-        startTime: 0,
-        endTime: Infinity,
         isContainer: true,
       });
       Object.assign(containerCue, properties);
diff --git a/test/text/ttml_text_parser_unit.js b/test/text/ttml_text_parser_unit.js
index 32f4e3353a..a0b09bb0fb 100644
--- a/test/text/ttml_text_parser_unit.js
+++ b/test/text/ttml_text_parser_unit.js
@@ -1535,6 +1535,52 @@ describe('TtmlTextParser', () => {
         {startTime: 1, endTime: 2});
   });
 
+  // Regression test for #4468
+  it('defaults the body background to transparent', () => {
+    verifyHelper(
+        // One cue, don't care about the details
+        [{}],
+        '<tt xmlns:tts="http://www.w3.org/ns/ttml#styling">' +
+        '<head>' +
+        '<styling>' +
+        '<style xml:id="s1" tts:backgroundColor="black" />' +
+        '</styling>' +
+        '</head>' +
+        '<body><div>' +
+        '<p begin="00:01.00" end="00:02.00">' +
+        '<span style="s1">Test</span>' +
+        '</p>' +
+        '</div></body></tt>',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
+        // The body must have these properties:
+        {backgroundColor: 'transparent'},
+        // The div must have these properties:
+        {});  // don't care
+  });
+
+  // Regression test for #4468
+  it('allows the body background color to be set', () => {
+    verifyHelper(
+        // One cue, don't care about the details
+        [{}],
+        '<tt xmlns:tts="http://www.w3.org/ns/ttml#styling">' +
+        '<head>' +
+        '<styling>' +
+        '<style xml:id="s1" tts:backgroundColor="black" />' +
+        '</styling>' +
+        '</head>' +
+        '<body style="s1"><div>' +
+        '<p begin="00:01.00" end="00:02.00">' +
+        '<span>Test</span>' +
+        '</p>' +
+        '</div></body></tt>',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
+        // The body must have these properties:
+        {backgroundColor: 'black'},
+        // The div must have these properties:
+        {});  // don't care
+  });
+
   it('parses wrapping option', () => {
     verifyHelper(
         [

From b5935a8a6b3b05c0c4cd10774a9625b0bbaf1cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Velad=20Galv=C3=A1n?= <ladvan91@hotmail.com>
Date: Wed, 28 Sep 2022 08:19:09 +0200
Subject: [PATCH 03/13] feat: Automatic ABR quality restrictions based on
 screen size (#4515)

---
 demo/common/message_ids.js       | 1 +
 demo/config.js                   | 2 ++
 demo/locales/en.json             | 1 +
 demo/locales/source.json         | 4 ++++
 externs/shaka/player.js          | 6 +++++-
 lib/abr/simple_abr_manager.js    | 7 +++++++
 lib/util/player_configuration.js | 1 +
 7 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/demo/common/message_ids.js b/demo/common/message_ids.js
index 4048d393ef..0b53985fd5 100644
--- a/demo/common/message_ids.js
+++ b/demo/common/message_ids.js
@@ -240,6 +240,7 @@ shakaDemo.MessageIds = {
   PREFER_NATIVE_HLS: 'DEMO_PREFER_NATIVE_HLS',
   REBUFFERING_GOAL: 'DEMO_REBUFFERING_GOAL',
   RESTRICT_TO_ELEMENT_SIZE: 'DEMO_RESTRICT_TO_ELEMENT_SIZE',
+  RESTRICT_TO_SCREEN_SIZE: 'DEMO_RESTRICT_TO_SCREEN_SIZE',
   RESTRICTIONS_SECTION_HEADER: 'DEMO_RESTRICTIONS_SECTION_HEADER',
   SAFE_SEEK_OFFSET: 'DEMO_SAFE_SEEK_OFFSET',
   SAFE_SKIP_DISTANCE: 'DEMO_SAFE_SKIP_DISTANCE',
diff --git a/demo/config.js b/demo/config.js
index 26d289b86a..58524f68f7 100644
--- a/demo/config.js
+++ b/demo/config.js
@@ -274,6 +274,8 @@ shakaDemo.Config = class {
             /* canBeDecimal= */ true)
         .addBoolInput_(MessageIds.RESTRICT_TO_ELEMENT_SIZE,
             'abr.restrictToElementSize')
+        .addBoolInput_(MessageIds.RESTRICT_TO_SCREEN_SIZE,
+            'abr.restrictToScreenSize')
         .addBoolInput_(MessageIds.IGNORE_DEVICE_PIXEL_RATIO,
             'abr.ignoreDevicePixelRatio');
     this.addRetrictionsSection_('abr',
diff --git a/demo/locales/en.json b/demo/locales/en.json
index b08c65fb6a..d7684fc40d 100644
--- a/demo/locales/en.json
+++ b/demo/locales/en.json
@@ -184,6 +184,7 @@
   "DEMO_REBUFFERING_GOAL": "Rebuffering Goal",
   "DEMO_REPORT_BUG": "REPORT BUG",
   "DEMO_RESTRICT_TO_ELEMENT_SIZE": "Restrict to element size",
+  "DEMO_RESTRICT_TO_SCREEN_SIZE": "Restrict to screen size",
   "DEMO_RESTRICTIONS_SECTION_HEADER": "Restrictions",
   "DEMO_SAFE_SEEK_OFFSET": "Safe Seek Offset",
   "DEMO_SAFE_SKIP_DISTANCE": "Safe Skip Distance",
diff --git a/demo/locales/source.json b/demo/locales/source.json
index 71688d0861..37c9af9a12 100644
--- a/demo/locales/source.json
+++ b/demo/locales/source.json
@@ -739,6 +739,10 @@
     "description": "The name of a configuration value.",
     "message": "Restrict to element size"
   },
+  "DEMO_RESTRICT_TO_SCREEN_SIZE": {
+    "description": "The name of a configuration value.",
+    "message": "Restrict to screen size"
+  },
   "DEMO_RESTRICTIONS_SECTION_HEADER": {
     "description": "The header for a section of configuration values.",
     "message": "Restrictions"
diff --git a/externs/shaka/player.js b/externs/shaka/player.js
index 6614c3c43e..fa85935b4f 100644
--- a/externs/shaka/player.js
+++ b/externs/shaka/player.js
@@ -1028,6 +1028,7 @@ shaka.extern.StreamingConfiguration;
  *   bandwidthDowngradeTarget: number,
  *   advanced: shaka.extern.AdvancedAbrConfiguration,
  *   restrictToElementSize: boolean,
+ *   restrictToScreenSize: boolean,
  *   ignoreDevicePixelRatio: boolean
  * }}
  *
@@ -1063,9 +1064,12 @@ shaka.extern.StreamingConfiguration;
  *   Note: The use of ResizeObserver is required for it to work properly. If
  *   true without ResizeObserver, it behaves as false.
  *   Defaults false.
+ * @property {boolean} restrictToScreenSize
+ *   If true, restrict the quality to screen size.
+ *   Defaults false.
  * @property {boolean} ignoreDevicePixelRatio
  *   If true,device pixel ratio is ignored when restricting the quality to
- *   media element size.
+ *   media element size or screen size.
  *   Defaults false.
  * @exportDoc
  */
diff --git a/lib/abr/simple_abr_manager.js b/lib/abr/simple_abr_manager.js
index d799dbf06b..19bec41518 100644
--- a/lib/abr/simple_abr_manager.js
+++ b/lib/abr/simple_abr_manager.js
@@ -148,6 +148,13 @@ shaka.abr.SimpleAbrManager = class {
     let maxHeight = Infinity;
     let maxWidth = Infinity;
 
+    if (this.config_.restrictToScreenSize) {
+      const devicePixelRatio =
+          this.config_.ignoreDevicePixelRatio ? 1 : window.devicePixelRatio;
+      maxHeight = window.screen.height * devicePixelRatio;
+      maxWidth = window.screen.width * devicePixelRatio;
+    }
+
     if (this.resizeObserver_ && this.config_.restrictToElementSize) {
       const devicePixelRatio =
           this.config_.ignoreDevicePixelRatio ? 1 : window.devicePixelRatio;
diff --git a/lib/util/player_configuration.js b/lib/util/player_configuration.js
index 3778806ff3..6b03e49259 100644
--- a/lib/util/player_configuration.js
+++ b/lib/util/player_configuration.js
@@ -247,6 +247,7 @@ shaka.util.PlayerConfiguration = class {
         slowHalfLife: 5,
       },
       restrictToElementSize: false,
+      restrictToScreenSize: false,
       ignoreDevicePixelRatio: false,
     };
 

From c97768bfe04cb9389291c2d2ed7fa7bcd89bc0fa Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@users.noreply.github.com>
Date: Tue, 27 Sep 2022 23:19:44 -0700
Subject: [PATCH 04/13] test: Fix playback timeouts on ChromeMac (#4520)

Shorten a StreamingEngine integration test to work around an issue with
ChromeMac where playback doesn't always occur at 1x. This is an issue
with Selenium or Chrome itself (unknown) that is out of our control. By
making the test somewhat shorter, we can have it complete on time, even
when this issue is present on a device.

Also increase timeouts on offline playback tests.
---
 test/media/streaming_engine_integration.js | 15 ++++++++-------
 test/offline/offline_integration.js        |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/test/media/streaming_engine_integration.js b/test/media/streaming_engine_integration.js
index 36af6b43d6..5546d10d6c 100644
--- a/test/media/streaming_engine_integration.js
+++ b/test/media/streaming_engine_integration.js
@@ -90,17 +90,17 @@ describe('StreamingEngine', () => {
 
     segmentAvailability = {
       start: 0,
-      end: 60,
+      end: 40,
     };
 
     timeline = shaka.test.StreamingEngineUtil.createFakePresentationTimeline(
         segmentAvailability,
-        /* presentationDuration= */ 60,
+        /* presentationDuration= */ 40,
         /* maxSegmentDuration= */ metadata.video.segmentDuration,
         /* isLive= */ false);
 
     setupNetworkingEngine(
-        /* presentationDuration= */ 60,
+        /* presentationDuration= */ 40,
         {
           audio: metadata.audio.segmentDuration,
           video: metadata.video.segmentDuration,
@@ -108,8 +108,8 @@ describe('StreamingEngine', () => {
 
     setupManifest(
         /* firstPeriodStartTime= */ 0,
-        /* secondPeriodStartTime= */ 30,
-        /* presentationDuration= */ 60);
+        /* secondPeriodStartTime= */ 20,
+        /* presentationDuration= */ 40);
 
     setupPlayhead();
 
@@ -263,10 +263,11 @@ describe('StreamingEngine', () => {
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
       video.play();
-      // The overall test timeout is 120 seconds, and the content is 60
+      // The overall test timeout is 120 seconds, and the content is 40
       // seconds.  It should be possible to complete this test in 100 seconds,
       // and if not, we want the error thrown to be within the overall test's
-      // timeout window.
+      // timeout window.  Note that we have seen some devices fail to play at
+      // full speed for reasons beyond our control, so we plan for >= 0.5x.
       await waiter.timeoutAfter(100).waitForEnd(video);
     });
 
diff --git a/test/offline/offline_integration.js b/test/offline/offline_integration.js
index a4771c93a2..db935b0ffa 100644
--- a/test/offline/offline_integration.js
+++ b/test/offline/offline_integration.js
@@ -68,7 +68,7 @@ filterDescribe('Offline', supportsStorage, () => {
     await player.load(contentUri);
 
     video.play();
-    await playTo(/* end= */ 3, /* timeout= */ 10);
+    await playTo(/* end= */ 3, /* timeout= */ 20);
     await player.unload();
     await storage.remove(contentUri);
   });
@@ -104,7 +104,7 @@ filterDescribe('Offline', supportsStorage, () => {
         await player.load(contentUri);
 
         video.play();
-        await playTo(/* end= */ 3, /* timeout= */ 10);
+        await playTo(/* end= */ 3, /* timeout= */ 20);
         await player.unload();
         await storage.remove(contentUri);
       });
@@ -147,7 +147,7 @@ filterDescribe('Offline', supportsStorage, () => {
         await player.load(contentUri);
 
         video.play();
-        await playTo(/* end= */ 3, /* timeout= */ 10);
+        await playTo(/* end= */ 3, /* timeout= */ 20);
         await player.unload();
         await storage.remove(contentUri);
       });

From 7d2a170336b828e8aac871ff276dbb8b42c384a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Velad=20Galv=C3=A1n?= <ladvan91@hotmail.com>
Date: Thu, 29 Sep 2022 19:30:09 +0200
Subject: [PATCH 05/13] feat(ads): Add getDescription to CS and SS ads (#4526)

---
 externs/ima.js            |  6 ++++++
 externs/shaka/ads.js      |  5 +++++
 lib/ads/client_side_ad.js |  8 ++++++++
 lib/ads/server_side_ad.js |  8 ++++++++
 test/test/util/fake_ad.js | 11 +++++++++++
 5 files changed, 38 insertions(+)

diff --git a/externs/ima.js b/externs/ima.js
index 24511e2308..456f5e7628 100644
--- a/externs/ima.js
+++ b/externs/ima.js
@@ -170,6 +170,9 @@ google.ima.Ad = class {
 
   /** @return {string} */
   getTitle() {}
+
+  /** @return {string} */
+  getDescription() {}
 };
 
 
@@ -395,6 +398,9 @@ google.ima.dai.api.Ad = class {
 
   /** @return {string} */
   getTitle() {}
+
+  /** @return {string} */
+  getDescription() {}
 };
 
 
diff --git a/externs/shaka/ads.js b/externs/shaka/ads.js
index 4259a3ed42..af83b7c046 100644
--- a/externs/shaka/ads.js
+++ b/externs/shaka/ads.js
@@ -232,4 +232,9 @@ shaka.extern.IAd = class {
    * @return {string}
    */
   getTitle() {}
+
+  /**
+   * @return {string}
+   */
+  getDescription() {}
 };
diff --git a/lib/ads/client_side_ad.js b/lib/ads/client_side_ad.js
index f768648dc2..2b54da55a5 100644
--- a/lib/ads/client_side_ad.js
+++ b/lib/ads/client_side_ad.js
@@ -244,6 +244,14 @@ shaka.ads.ClientSideAd = class {
     return this.ad_.getTitle();
   }
 
+  /**
+   * @override
+   * @export
+   */
+  getDescription() {
+    return this.ad_.getDescription();
+  }
+
   /**
    * @override
    * @export
diff --git a/lib/ads/server_side_ad.js b/lib/ads/server_side_ad.js
index a078585ad9..12aa2db89a 100644
--- a/lib/ads/server_side_ad.js
+++ b/lib/ads/server_side_ad.js
@@ -213,6 +213,14 @@ shaka.ads.ServerSideAd = class {
     return this.ad_.getTitle();
   }
 
+  /**
+   * @override
+   * @export
+   */
+  getDescription() {
+    return this.ad_.getDescription();
+  }
+
   /**
    * @override
    * @export
diff --git a/test/test/util/fake_ad.js b/test/test/util/fake_ad.js
index ef67c45925..dbd9fb774d 100644
--- a/test/test/util/fake_ad.js
+++ b/test/test/util/fake_ad.js
@@ -37,6 +37,9 @@ shaka.test.FakeAd = class {
 
     /** @private {string} */
     this.title_ = 'Test Title';
+
+    /** @private {string} */
+    this.description_ = 'Test Description';
   }
 
   /**
@@ -201,6 +204,14 @@ shaka.test.FakeAd = class {
     return this.title_;
   }
 
+  /**
+   * @override
+   * @export
+   */
+  getDescription() {
+    return this.description_;
+  }
+
   /**
    * @override
    * @export

From 75d54ea8e43bf2575b14bd7add1da72cebf51fb0 Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@users.noreply.github.com>
Date: Thu, 29 Sep 2022 12:41:23 -0700
Subject: [PATCH 06/13] test: Expand test cases for HLS track roles (#4529)

---
 test/hls/hls_parser_unit.js | 61 +++++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/test/hls/hls_parser_unit.js b/test/hls/hls_parser_unit.js
index a0c6612d68..2d6ccca6d4 100644
--- a/test/hls/hls_parser_unit.js
+++ b/test/hls/hls_parser_unit.js
@@ -118,6 +118,8 @@ describe('HlsParser', () => {
         .setResponseText('test:/audio2', media)
         .setResponseText('test:/video', media)
         .setResponseText('test:/video2', media)
+        .setResponseText('test:/text', media)
+        .setResponseText('test:/text2', media)
         .setResponseText('test:/main.vtt', vttText)
         .setResponseValue('test:/init.mp4', initSegmentData)
         .setResponseValue('test:/init2.mp4', initSegmentData)
@@ -935,11 +937,14 @@ describe('HlsParser', () => {
       '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1,mp4a",',
       'RESOLUTION=960x540,FRAME-RATE=60,AUDIO="aud1"\n',
       'video\n',
+
       '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="en",',
-      'URI="audio"\n',
+      'NAME="English",URI="audio"\n',
+
       '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="en",',
       'CHARACTERISTICS="public.accessibility.describes-video,',
-      'public.accessibility.describes-music-and-sound",URI="audio2"\n',
+      'public.accessibility.describes-music-and-sound",',
+      'NAME="English (describes-video)",URI="audio2"\n',
     ].join('');
 
     const media = [
@@ -977,6 +982,58 @@ describe('HlsParser', () => {
     await testHlsParser(master, media, manifest);
   });
 
+  it('parses characteristics from text tags', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1",',
+      'RESOLUTION=960x540,FRAME-RATE=60,SUBTITLES="sub1"\n',
+      'video\n',
+
+      '#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="sub1",LANGUAGE="en",',
+      'NAME="English (caption)",DEFAULT=YES,AUTOSELECT=YES,',
+      'URI="text"\n',
+
+      '#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="sub1",LANGUAGE="en",',
+      'NAME="English (caption)",DEFAULT=YES,AUTOSELECT=YES,',
+      'CHARACTERISTICS="public.accessibility.describes-spoken-dialog,',
+      'public.accessibility.describes-music-and-sound",',
+      'URI="text2"\n',
+    ].join('');
+
+    const media = [
+      '#EXTM3U\n',
+      '#EXT-X-PLAYLIST-TYPE:VOD\n',
+      '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      'main.mp4',
+    ].join('');
+
+    const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+      manifest.anyTimeline();
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.VIDEO);
+      });
+      manifest.addPartialTextStream((stream) => {
+        stream.language = 'en';
+        stream.kind = TextStreamKind.SUBTITLE;
+        stream.mime('application/mp4', '');
+      });
+      manifest.addPartialTextStream((stream) => {
+        stream.language = 'en';
+        stream.kind = TextStreamKind.SUBTITLE;
+        stream.mime('application/mp4', '');
+        stream.roles = [
+          'public.accessibility.describes-spoken-dialog',
+          'public.accessibility.describes-music-and-sound',
+        ];
+      });
+      manifest.sequenceMode = true;
+    });
+
+    await testHlsParser(master, media, manifest);
+  });
+
   it('gets mime type from header request', async () => {
     const master = [
       '#EXTM3U\n',

From 9b039f33cb7f8a6f36a25a2c1af2a89aeb592ebd Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@users.noreply.github.com>
Date: Thu, 29 Sep 2022 14:38:48 -0700
Subject: [PATCH 07/13] ci: Upload screenshot assets on failure (#4530)

This should make it possible (if not easy) to download screenshots and
diagnose layout test failures locally.
---
 .github/workflows/build-and-test.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 470a25b6e0..35ef4dc147 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -165,6 +165,18 @@ jobs:
           # an environment variable set, the file should definitely be there.
           if-no-files-found: error
 
+      # Upload new screenshots and diffs on failure; ignore if missing
+      - name: Upload screenshots
+        uses: actions/upload-artifact@v3
+        if: ${{ failure() }}
+        with:
+          name: screenshots-${{ matrix.browser }}
+          path: |
+            test/test/assets/screenshots/*/*.png-new
+            test/test/assets/screenshots/*/*.png-diff
+          if-no-files-found: ignore
+          retention-days: 5
+
   build_in_docker:
     # Don't waste time doing a full matrix of test runs when there was an
     # obvious linter error.

From 80e6124aa0744872a9baa0d2ed9fa633f6594065 Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@users.noreply.github.com>
Date: Thu, 29 Sep 2022 14:45:00 -0700
Subject: [PATCH 08/13] ci: Test on Safari 16 and 15 (#4531)

Since Safari 16 became the default on macos-11 images in GitHub, we are
updating our homedir installation of Safari 14 to Safari 15 instead.
This also renames that entry in the matrix from Safari-14 to Safari-old,
in recognition of the fact that we will probably have to continue
updating this.
---
 .github/workflows/build-and-test.yaml | 31 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 35ef4dc147..6fbab86e08 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -57,7 +57,7 @@ jobs:
           - os: macos-latest
             browser: Safari
           - os: macos-latest
-            browser: Safari-14
+            browser: Safari-old
 
           - os: windows-latest
             browser: Chrome
@@ -87,21 +87,22 @@ jobs:
         with:
           ref: ${{ github.event.inputs.ref || github.ref }}
 
-      # Safari 14 can be installed, but not to the root, and it can't replace
-      # the standard version, at least not on GitHub's VMs.  If you try to
-      # install directly to the root with sudo, it will appear to succeed, but
-      # will have no effect.  If you try to script it explicitly with rm -rf
-      # and cp, this will fail.  Safari may be on a read-only filesystem.
-      - name: Install Safari 14 to home directory
-        if: matrix.os == 'macos-latest' && matrix.browser == 'Safari-14'
+      # Older versions of Safari can be installed, but not to the root, and it
+      # can't replace the standard version, at least not on GitHub's VMs.  If
+      # you try to install directly to the root with sudo, it will appear to
+      # succeed, but will have no effect.  If you try to script it explicitly
+      # with rm -rf and cp, this will fail.  Safari may be on a read-only
+      # filesystem.
+      - name: Install old Safari to home directory
+        if: matrix.os == 'macos-latest' && matrix.browser == 'Safari-old'
         run: |
-          # Download Safari 14
-          # See also https://www.macupdate.com/app/mac/15675/apple-safari/old-versions
-          curl -Lv https://www.macupdate.com/action/download/62946 > Safari14.0CatalinaAuto.pkg.zip
+          # Download Safari 15
+          # This URL discovered through the seed files listed at
+          # https://github.com/zhangyoufu/swscan.apple.com/blob/master/url.txt
+          curl -Lv http://swcdn.apple.com/content/downloads/42/33/012-57329-A_41P2VU6UHN/5fw5vna27fdw4mqfak5adj3pjpxvo9hgh7/Safari15.6.1CatalinaAuto.pkg > Safari.pkg
 
-          # Install Safari 14 to homedir specifically.
-          unzip Safari14.0CatalinaAuto.pkg.zip
-          installer -pkg Safari14.0CatalinaAuto.pkg -target CurrentUserHomeDirectory
+          # Install older Safari to homedir specifically.
+          installer -pkg Safari.pkg -target CurrentUserHomeDirectory
 
           # Install a launcher that can execute a shell script to launch this
           npm install karma-script-launcher --save-dev
@@ -114,7 +115,7 @@ jobs:
         run: |
           browser=${{ matrix.browser }}
 
-          if [[ "$browser" == "Safari-14" ]]; then
+          if [[ "$browser" == "Safari-old" ]]; then
             # Replace the browser name with a script that can launch this
             # browser from the command line.
             browser="$PWD/.github/workflows/safari-homedir-launcher.sh"

From c12912d8bcd3163e877250c718e06e0eda666c8c Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@users.noreply.github.com>
Date: Thu, 29 Sep 2022 16:00:08 -0700
Subject: [PATCH 09/13] ci: Fix missing coverage data from integration tests
 (#4534)

Player integration tests use the compiled bundle by default. This
prevents us from getting coverage data in these tests, since the
instrumentation was added to the uncompiled library only.

By collecting coverage data in uncompiled mode, we can fix this.
---
 .github/workflows/build-and-test.yaml     |  4 +++-
 .github/workflows/selenium-lab-tests.yaml | 11 ++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 6fbab86e08..74a94b57a8 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -41,9 +41,11 @@ jobs:
         include:
           # Run Linux browsers with xvfb, so they're in a headless X session.
           # Additionally, generate a code coverage report from Linux Chrome.
+          # It should be the uncompiled build, or else we won't execute any
+          # coverage instrumentation on full-stack player integration tests.
           - os: ubuntu-latest
             browser: Chrome
-            extra_flags: "--use-xvfb --html-coverage-report"
+            extra_flags: "--use-xvfb --html-coverage-report --uncompiled"
           - os: ubuntu-latest
             browser: Firefox
             extra_flags: "--use-xvfb"
diff --git a/.github/workflows/selenium-lab-tests.yaml b/.github/workflows/selenium-lab-tests.yaml
index db8d157f53..6852b6813f 100644
--- a/.github/workflows/selenium-lab-tests.yaml
+++ b/.github/workflows/selenium-lab-tests.yaml
@@ -180,6 +180,15 @@ jobs:
       # the container.
       - name: Test Player
         run: |
+          # Generate a coverage report from uncompiled code on ChromeLinux.
+          # It should be the uncompiled build, or else we won't execute any
+          # coverage instrumentation on full-stack player integration tests.
+          if [[ "${{ matrix.browser }}" == "ChromeLinux" ]]; then
+            extra_flags="--html-coverage-report --uncompiled"
+          else
+            extra_flags=""
+          fi
+
           python3 build/test.py \
               --no-build \
               --reporters spec --spec-hide-passed \
@@ -189,7 +198,7 @@ jobs:
               --grid-config build/shaka-lab.yaml \
               --grid-address selenium-grid.lab:4444 \
               --browsers ${{ matrix.browser }} \
-              --html-coverage-report
+              $extra_flags
 
       - name: Find coverage report (ChromeLinux only)
         id: coverage

From 997a48f7d47db5a79b30c98c3db1f1e6d7a0ad74 Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@users.noreply.github.com>
Date: Thu, 29 Sep 2022 16:01:27 -0700
Subject: [PATCH 10/13] test: Be more generous with timeouts (#4533)

Some timeouts in Player integration tests seem a little too short. This
seems to have caused an intermittent test failure in a recent PR.

This expands those timeouts a bit, specifically before waitForEnd()
calls.
---
 test/player_integration.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/player_integration.js b/test/player_integration.js
index 4093b2f906..2f1479601c 100644
--- a/test/player_integration.js
+++ b/test/player_integration.js
@@ -506,7 +506,7 @@ describe('Player', () => {
       // Seek the video, and see if it can continue playing from that point.
       video.currentTime = 20;
       // Expect that we can then reach the end of the video.
-      await waiter.timeoutAfter(20).waitForEnd(video);
+      await waiter.timeoutAfter(40).waitForEnd(video);
     });
 
     // Regression test for #2326.
@@ -857,7 +857,7 @@ describe('Player', () => {
       /** @type {shaka.test.Waiter} */
       const waiter = new shaka.test.Waiter(eventManager)
           .setPlayer(player)
-          .timeoutAfter(20)
+          .timeoutAfter(40)
           .failOnTimeout(true);
       await waiter.waitForEnd(video);
 

From 20d6da5170f3c3e7c186e4c11428199abb13ac0b Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@users.noreply.github.com>
Date: Thu, 29 Sep 2022 16:08:01 -0700
Subject: [PATCH 11/13] test: Update native edge-case layout test (#4532)

The native cue layout test for a timing edge-case only works correctly
on Safari 16. This updates the test expectations to match the fixed
implementation in Safari 16, and skips the test on older versions. Since
the issue is out of Shaka Player's control, it's fine to skip the test
case on older browsers.
---
 .../safari-Mac/native-end-time-edge-case.png  | Bin 7394 -> 3813 bytes
 test/ui/text_displayer_layout_unit.js         |  12 ++++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/test/assets/screenshots/safari-Mac/native-end-time-edge-case.png b/test/test/assets/screenshots/safari-Mac/native-end-time-edge-case.png
index 966ddb9255ce1e424877ac5a923303ea4e39dc82..173924f94f355cafa6e6f018f79e8d2d55fe1c18 100644
GIT binary patch
literal 3813
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
Cj@PyT

literal 7394
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

diff --git a/test/ui/text_displayer_layout_unit.js b/test/ui/text_displayer_layout_unit.js
index 61f2f63586..2b2118520d 100644
--- a/test/ui/text_displayer_layout_unit.js
+++ b/test/ui/text_displayer_layout_unit.js
@@ -262,11 +262,19 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
 
     // Regression test for #3151
     // Only one cue should be displayed.  Note, however, that we don't control
-    // this in a browser's native display.  As of Feb 2021, only Firefox does
-    // the right thing in native text display.  Chrome, Edge, and Safari all
+    // this in a browser's native display.  As of Sep 2022, both Firefox and
+    // Safari>=16 do the right thing in native text display.  Chrome and Edge
     // show both cues in this edge case.  When we control the display of text
     // through the UI & DOM, we can always get the timing right.
     it('cues ending exactly now', async () => {
+      // Due to a Safari implementation bug, the browser only does the correct
+      // thing for this test case on Safari 16+.  Skip the test on earlier
+      // versions.
+      const safariVersion = shaka.util.Platform.safariVersion();
+      if (prefix == 'native' && safariVersion && safariVersion < 16) {
+        pending('Native implementation known to be broken on Safari < 16');
+      }
+
       // At time exactly 1, this cue should _not_ be displayed any more.
       textDisplayer.append([
         new shaka.text.Cue(0, 1, 'This cue is over and gone.'),

From 4033be7c5b1d1c397d5a4840ef7333a26ca93983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Velad=20Galv=C3=A1n?= <ladvan91@hotmail.com>
Date: Fri, 30 Sep 2022 20:18:08 +0200
Subject: [PATCH 12/13] feat: Allow add extra features to
 MediaSource.addSourceBuffer (#4527)

---
 demo/common/message_ids.js                    |  2 ++
 demo/config.js                                | 10 ++++++++++
 demo/locales/en.json                          |  2 ++
 demo/locales/source.json                      |  8 ++++++++
 externs/shaka/player.js                       | 20 +++++++++++++++++++
 lib/media/media_source_engine.js              | 18 +++++++++++++++--
 lib/player.js                                 |  2 ++
 lib/util/player_configuration.js              |  5 +++++
 test/cast/cast_utils_unit.js                  |  3 +++
 test/media/drm_engine_integration.js          |  3 +++
 test/media/media_source_engine_integration.js |  2 ++
 test/media/media_source_engine_unit.js        |  2 ++
 test/media/streaming_engine_integration.js    |  3 +++
 test/player_unit.js                           |  1 +
 test/test/util/fake_media_source_engine.js    |  3 +++
 15 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/demo/common/message_ids.js b/demo/common/message_ids.js
index 0b53985fd5..84a4cb7ea9 100644
--- a/demo/common/message_ids.js
+++ b/demo/common/message_ids.js
@@ -222,6 +222,7 @@ shakaDemo.MessageIds = {
   MAX_HEIGHT: 'DEMO_MAX_HEIGHT',
   MAX_PIXELS: 'DEMO_MAX_PIXELS',
   MAX_WIDTH: 'DEMO_MAX_WIDTH',
+  MEDIA_SOURCE_SECTION_HEADER: 'DEMO_MEDIA_SOURCE_SECTION_HEADER',
   MIN_BANDWIDTH: 'DEMO_MIN_BANDWIDTH',
   MIN_BYTES: 'DEMO_MIN_BYTES',
   MIN_FRAMERATE: 'DEMO_MIN_FRAMERATE',
@@ -248,6 +249,7 @@ shakaDemo.MessageIds = {
   SESSION_ID: 'DEMO_SESSION_ID',
   SHAKA_CONTROLS: 'DEMO_SHAKA_CONTROLS',
   SLOW_HALF_LIFE: 'DEMO_SLOW_HALF_LIFE',
+  SOURCE_BUFFER_EXTRA_FEATURES: 'DEMO_SOURCE_BUFFER_EXTRA_FEATURES',
   STALL_DETECTOR_ENABLED: 'DEMO_STALL_DETECTOR_ENABLED',
   STALL_THRESHOLD: 'DEMO_STALL_THRESHOLD',
   STALL_TIMEOUT: 'DEMO_STALL_TIMEOUT',
diff --git a/demo/config.js b/demo/config.js
index 58524f68f7..e9d41ed6b3 100644
--- a/demo/config.js
+++ b/demo/config.js
@@ -92,6 +92,7 @@ shakaDemo.Config = class {
     this.addOfflineSection_();
     this.addDrmSection_();
     this.addStreamingSection_();
+    this.addMediaSourceSection_();
     this.addManifestSection_();
     this.addRetrictionsSection_('',
         shakaDemo.MessageIds.RESTRICTIONS_SECTION_HEADER);
@@ -428,6 +429,15 @@ shakaDemo.Config = class {
         MessageIds.STREAMING_RETRY_SECTION_HEADER);
   }
 
+  /** @private */
+  addMediaSourceSection_() {
+    const MessageIds = shakaDemo.MessageIds;
+    const docLink = this.resolveExternLink_('.MediaSourceConfiguration');
+    this.addSection_(MessageIds.MEDIA_SOURCE_SECTION_HEADER, docLink)
+        .addTextInput_(MessageIds.SOURCE_BUFFER_EXTRA_FEATURES,
+            'mediaSource.sourceBufferExtraFeatures');
+  }
+
   /** @private */
   addLanguageSection_() {
     const MessageIds = shakaDemo.MessageIds;
diff --git a/demo/locales/en.json b/demo/locales/en.json
index d7684fc40d..976c822c8a 100644
--- a/demo/locales/en.json
+++ b/demo/locales/en.json
@@ -144,6 +144,7 @@
   "DEMO_MAX_HEIGHT": "Max Height",
   "DEMO_MAX_PIXELS": "Max Pixels",
   "DEMO_MAX_WIDTH": "Max Width",
+  "DEMO_MEDIA_SOURCE_SECTION_HEADER": "Media source",
   "DEMO_METACDN": "MetaCDN",
   "DEMO_MICROSOFT": "Microsoft",
   "DEMO_MIME_TYPE": "MIME Type",
@@ -195,6 +196,7 @@
   "DEMO_SHAKA_CONTROLS": "Shaka Controls",
   "DEMO_SLOW_HALF_LIFE": "Slow half life",
   "DEMO_SOURCE": "Source on GitHub",
+  "DEMO_SOURCE_BUFFER_EXTRA_FEATURES": "Source buffer extra features",
   "DEMO_SOURCE_SEARCH": "Source",
   "DEMO_STALL_DETECTOR_ENABLED": "Stall Detector Enabled",
   "DEMO_STALL_THRESHOLD": "Stall Threshold",
diff --git a/demo/locales/source.json b/demo/locales/source.json
index 37c9af9a12..fede82ad59 100644
--- a/demo/locales/source.json
+++ b/demo/locales/source.json
@@ -579,6 +579,10 @@
     "description": "The name of a configuration value.",
     "message": "Max Width"
   },
+  "DEMO_MEDIA_SOURCE_SECTION_HEADER": {
+    "description": "The header for a section of configuration values.",
+    "message": "Media source"
+  },
   "DEMO_METACDN": {
     "description": "Text that describes an asset that comes from the MetaCDN asset library.",
     "message": "[PROPER_NAME:MetaCDN]"
@@ -783,6 +787,10 @@
     "description": "A link in the footer, to the Shaka Player source on GitHub.",
     "message": "Source on [PROPER_NAME:GitHub]"
   },
+  "DEMO_SOURCE_BUFFER_EXTRA_FEATURES": {
+    "description": "The name of a configuration value.",
+    "message": "Source buffer extra features"
+  },
   "DEMO_SOURCE_SEARCH": {
     "description": "A header on a search field that filters by the source of the asset.",
     "message": "Source"
diff --git a/externs/shaka/player.js b/externs/shaka/player.js
index fa85935b4f..d3cdae9275 100644
--- a/externs/shaka/player.js
+++ b/externs/shaka/player.js
@@ -1017,6 +1017,23 @@ shaka.extern.ManifestConfiguration;
 shaka.extern.StreamingConfiguration;
 
 
+/**
+ * @typedef {{
+ *   sourceBufferExtraFeatures: string
+ * }}
+ *
+ * @description
+ *   Media source configuration.
+ *
+ * @property {string} sourceBufferExtraFeatures
+ *   Some platforms may need to pass features when initializing the
+ *   sourceBuffer.
+ *   This string is ultimately appended to MIME types in addSourceBuffer().
+ * @exportDoc
+ */
+shaka.extern.MediaSourceConfiguration;
+
+
 /**
  * @typedef {{
  *   enabled: boolean,
@@ -1185,6 +1202,7 @@ shaka.extern.OfflineConfiguration;
  *   drm: shaka.extern.DrmConfiguration,
  *   manifest: shaka.extern.ManifestConfiguration,
  *   streaming: shaka.extern.StreamingConfiguration,
+ *   mediaSource: shaka.extern.MediaSourceConfiguration,
  *   abrFactory: shaka.extern.AbrManager.Factory,
  *   abr: shaka.extern.AbrConfiguration,
  *   cmcd: shaka.extern.CmcdConfiguration,
@@ -1212,6 +1230,8 @@ shaka.extern.OfflineConfiguration;
  *   Manifest configuration and settings.
  * @property {shaka.extern.StreamingConfiguration} streaming
  *   Streaming configuration and settings.
+ * @property {shaka.extern.MediaSourceConfiguration} mediaSource
+ *   Media source configuration and settings.
  * @property {shaka.extern.AbrManager.Factory} abrFactory
  *   A factory to construct an abr manager.
  * @property {shaka.extern.AbrConfiguration} abr
diff --git a/lib/media/media_source_engine.js b/lib/media/media_source_engine.js
index c303adce02..a8df88bd68 100644
--- a/lib/media/media_source_engine.js
+++ b/lib/media/media_source_engine.js
@@ -53,6 +53,9 @@ shaka.media.MediaSourceEngine = class {
     /** @private {HTMLMediaElement} */
     this.video_ = video;
 
+    /** @private {?shaka.extern.MediaSourceConfiguration} */
+    this.config_ = null;
+
     /** @private {shaka.extern.TextDisplayer} */
     this.textDisplayer_ = textDisplayer;
 
@@ -291,6 +294,7 @@ shaka.media.MediaSourceEngine = class {
       this.video_ = null;
     }
 
+    this.config_ = null;
     this.mediaSource_ = null;
     this.textEngine_ = null;
     this.textDisplayer_ = null;
@@ -357,8 +361,8 @@ shaka.media.MediaSourceEngine = class {
           mimeType =
               shaka.media.Transmuxer.convertTsCodecs(contentType, mimeType);
         }
-
-        const sourceBuffer = this.mediaSource_.addSourceBuffer(mimeType);
+        const type = mimeType + this.config_.sourceBufferExtraFeatures;
+        const sourceBuffer = this.mediaSource_.addSourceBuffer(type);
 
         this.eventManager_.listen(
             sourceBuffer, 'error',
@@ -374,6 +378,16 @@ shaka.media.MediaSourceEngine = class {
     }
   }
 
+  /**
+   * Called by the Player to provide an updated configuration any time it
+   * changes. Must be called at least once before init().
+   *
+   * @param {shaka.extern.MediaSourceConfiguration} config
+   */
+  configure(config) {
+    this.config_ = config;
+  }
+
   /**
    * Reinitialize the TextEngine for a new text type.
    * @param {string} mimeType
diff --git a/lib/player.js b/lib/player.js
index d1d4147fbb..98282426a3 100644
--- a/lib/player.js
+++ b/lib/player.js
@@ -1611,6 +1611,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         (metadata, offset, endTime) => {
           this.processTimedMetadataMediaSrc_(metadata, offset, endTime);
         });
+    mediaSourceEngine.configure(this.config_.mediaSource);
     const {segmentRelativeVttTiming} = this.config_.manifest;
     mediaSourceEngine.setSegmentRelativeVttTiming(segmentRelativeVttTiming);
 
@@ -3084,6 +3085,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }
 
     if (this.mediaSourceEngine_) {
+      this.mediaSourceEngine_.configure(this.config_.mediaSource);
       const {segmentRelativeVttTiming} = this.config_.manifest;
       this.mediaSourceEngine_.setSegmentRelativeVttTiming(
           segmentRelativeVttTiming);
diff --git a/lib/util/player_configuration.js b/lib/util/player_configuration.js
index 6b03e49259..fcffb12d59 100644
--- a/lib/util/player_configuration.js
+++ b/lib/util/player_configuration.js
@@ -258,6 +258,10 @@ shaka.util.PlayerConfiguration = class {
       useHeaders: false,
     };
 
+    const mediaSource = {
+      sourceBufferExtraFeatures: '',
+    };
+
     const AutoShowText = shaka.config.AutoShowText;
 
     /** @type {shaka.extern.PlayerConfiguration} */
@@ -265,6 +269,7 @@ shaka.util.PlayerConfiguration = class {
       drm: drm,
       manifest: manifest,
       streaming: streaming,
+      mediaSource: mediaSource,
       offline: offline,
       abrFactory: () => new shaka.abr.SimpleAbrManager(),
       abr: abr,
diff --git a/test/cast/cast_utils_unit.js b/test/cast/cast_utils_unit.js
index 93e08c7654..fa78068622 100644
--- a/test/cast/cast_utils_unit.js
+++ b/test/cast/cast_utils_unit.js
@@ -207,6 +207,9 @@ describe('CastUtils', () => {
             video,
             new shaka.test.FakeClosedCaptionParser(),
             new shaka.test.FakeTextDisplayer());
+        const config =
+            shaka.util.PlayerConfiguration.createDefault().mediaSource;
+        mediaSourceEngine.configure(config);
 
         const ContentType = shaka.util.ManifestParserUtils.ContentType;
         const initObject = new Map();
diff --git a/test/media/drm_engine_integration.js b/test/media/drm_engine_integration.js
index 8b3f587af9..25ea1524ae 100644
--- a/test/media/drm_engine_integration.js
+++ b/test/media/drm_engine_integration.js
@@ -128,6 +128,9 @@ describe('DrmEngine', () => {
         video,
         new shaka.test.FakeClosedCaptionParser(),
         new shaka.test.FakeTextDisplayer());
+    const mediaSourceConfig =
+        shaka.util.PlayerConfiguration.createDefault().mediaSource;
+    mediaSourceEngine.configure(mediaSourceConfig);
 
     const expectedObject = new Map();
     expectedObject.set(ContentType.AUDIO, audioStream);
diff --git a/test/media/media_source_engine_integration.js b/test/media/media_source_engine_integration.js
index ebbd49a370..b950129967 100644
--- a/test/media/media_source_engine_integration.js
+++ b/test/media/media_source_engine_integration.js
@@ -41,6 +41,8 @@ describe('MediaSourceEngine', () => {
         video,
         new shaka.media.ClosedCaptionParser(),
         textDisplayer);
+    const config = shaka.util.PlayerConfiguration.createDefault().mediaSource;
+    mediaSourceEngine.configure(config);
 
     mediaSource = /** @type {?} */(mediaSourceEngine)['mediaSource_'];
     expect(video.src).toBeTruthy();
diff --git a/test/media/media_source_engine_unit.js b/test/media/media_source_engine_unit.js
index 2ef9e190db..8a805d5e7e 100644
--- a/test/media/media_source_engine_unit.js
+++ b/test/media/media_source_engine_unit.js
@@ -150,6 +150,8 @@ describe('MediaSourceEngine', () => {
         video,
         mockClosedCaptionParser,
         mockTextDisplayer);
+    const config = shaka.util.PlayerConfiguration.createDefault().mediaSource;
+    mediaSourceEngine.configure(config);
   });
 
   afterEach(() => {
diff --git a/test/media/streaming_engine_integration.js b/test/media/streaming_engine_integration.js
index 5546d10d6c..517b68ecba 100644
--- a/test/media/streaming_engine_integration.js
+++ b/test/media/streaming_engine_integration.js
@@ -68,6 +68,9 @@ describe('StreamingEngine', () => {
         video,
         new shaka.test.FakeClosedCaptionParser(),
         new shaka.test.FakeTextDisplayer());
+    const mediaSourceConfig =
+        shaka.util.PlayerConfiguration.createDefault().mediaSource;
+    mediaSourceEngine.configure(mediaSourceConfig);
     waiter.setMediaSourceEngine(mediaSourceEngine);
   });
 
diff --git a/test/player_unit.js b/test/player_unit.js
index 0b1e02cffd..5007a645c3 100644
--- a/test/player_unit.js
+++ b/test/player_unit.js
@@ -123,6 +123,7 @@ describe('Player', () => {
       streamingEngine = new shaka.test.FakeStreamingEngine();
       mediaSourceEngine = {
         init: jasmine.createSpy('init').and.returnValue(Promise.resolve()),
+        configure: jasmine.createSpy('configure'),
         open: jasmine.createSpy('open').and.returnValue(Promise.resolve()),
         destroy:
             jasmine.createSpy('destroy').and.returnValue(Promise.resolve()),
diff --git a/test/test/util/fake_media_source_engine.js b/test/test/util/fake_media_source_engine.js
index f7e784bc32..360d398308 100644
--- a/test/test/util/fake_media_source_engine.js
+++ b/test/test/util/fake_media_source_engine.js
@@ -54,6 +54,9 @@ shaka.test.FakeMediaSourceEngine = class {
     /** @type {!jasmine.Spy} */
     this.open = jasmine.createSpy('open').and.returnValue(Promise.resolve());
 
+    /** @type {!jasmine.Spy} */
+    this.configure = jasmine.createSpy('configure').and.stub();
+
     /** @type {!jasmine.Spy} */
     this.reinitText = jasmine.createSpy('reinitText').and.stub();
 

From 3582f0a7274d6bb6f0bbfdf2ad51c5ecfb6f974b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Velad=20Galv=C3=A1n?= <ladvan91@hotmail.com>
Date: Fri, 30 Sep 2022 22:25:05 +0200
Subject: [PATCH 13/13] feat: Add external thumbnails support (#4497)

JW spec:
https://docs.jwplayer.com/platform/docs/vdh-add-preview-thumbnails

Video.js implementation:
https://github.com/chrisboustead/videojs-vtt-thumbnails

Note: thumbnails with sprites are not supported yet.
---
 lib/cast/cast_utils.js                  |   1 +
 lib/player.js                           | 133 ++++++++++++++++++++++++
 lib/util/error.js                       |  17 +++
 test/player_integration.js              |  43 ++++++++
 test/test/assets/thumbnails-sprites.vtt |  10 ++
 test/test/assets/thumbnails.vtt         |  10 ++
 6 files changed, 214 insertions(+)
 create mode 100644 test/test/assets/thumbnails-sprites.vtt
 create mode 100644 test/test/assets/thumbnails.vtt

diff --git a/lib/cast/cast_utils.js b/lib/cast/cast_utils.js
index 615f78111a..0ebcf89f1d 100644
--- a/lib/cast/cast_utils.js
+++ b/lib/cast/cast_utils.js
@@ -374,6 +374,7 @@ shaka.cast.CastUtils.PlayerInitAfterLoadState = [
 shaka.cast.CastUtils.PlayerVoidMethods = [
   'addChaptersTrack',
   'addTextTrackAsync',
+  'addThumbnailsTrack',
   'cancelTrickPlay',
   'configure',
   'getChapters',
diff --git a/lib/player.js b/lib/player.js
index 98282426a3..c9a8eeebfc 100644
--- a/lib/player.js
+++ b/lib/player.js
@@ -27,6 +27,7 @@ goog.require('shaka.media.QualityObserver');
 goog.require('shaka.media.RegionObserver');
 goog.require('shaka.media.RegionTimeline');
 goog.require('shaka.media.SegmentIndex');
+goog.require('shaka.media.SegmentReference');
 goog.require('shaka.media.SrcEqualsPlayhead');
 goog.require('shaka.media.StreamingEngine');
 goog.require('shaka.media.TimeRangesUtils');
@@ -4627,6 +4628,138 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     return shaka.util.StreamUtils.textStreamToTrack(stream);
   }
 
+  /**
+   * Adds the given thumbnails track to the loaded manifest.
+   * <code>load()</code> must resolve before calling.  The presentation must
+   * have a duration.
+   *
+   * This returns the created track, which can immediately be used by the
+   * application.
+   *
+   * @param {string} uri
+   * @param {string=} mimeType
+   * @return {!Promise.<shaka.extern.Track>}
+   * @export
+   */
+  async addThumbnailsTrack(uri, mimeType) {
+    if (this.loadMode_ != shaka.Player.LoadMode.MEDIA_SOURCE &&
+        this.loadMode_ != shaka.Player.LoadMode.SRC_EQUALS) {
+      shaka.log.error(
+          'Must call load() and wait for it to resolve before adding image ' +
+          'tracks.');
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.RECOVERABLE,
+          shaka.util.Error.Category.PLAYER,
+          shaka.util.Error.Code.CONTENT_NOT_LOADED);
+    }
+
+    if (this.loadMode_ == shaka.Player.LoadMode.SRC_EQUALS) {
+      shaka.log.error('Cannot add this thumbnail track when loaded with src=');
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.RECOVERABLE,
+          shaka.util.Error.Category.TEXT,
+          shaka.util.Error.Code.CANNOT_ADD_EXTERNAL_THUMBNAILS_TO_SRC_EQUALS);
+    }
+
+    if (!mimeType) {
+      mimeType = await this.getTextMimetype_(uri);
+    }
+
+    if (mimeType != 'text/vtt') {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.RECOVERABLE,
+          shaka.util.Error.Category.TEXT,
+          shaka.util.Error.Code.UNSUPPORTED_EXTERNAL_THUMBNAILS_URI,
+          uri);
+    }
+
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
+
+    const duration = this.manifest_.presentationTimeline.getDuration();
+    if (duration == Infinity) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.RECOVERABLE,
+          shaka.util.Error.Category.MANIFEST,
+          shaka.util.Error.Code.CANNOT_ADD_EXTERNAL_THUMBNAILS_TO_LIVE_STREAM);
+    }
+
+    goog.asserts.assert(
+        this.networkingEngine_, 'Need networking engine.');
+    const buffer = await this.getTextData_(uri,
+        this.networkingEngine_,
+        this.config_.streaming.retryParameters);
+
+    const factory = shaka.text.TextEngine.findParser(mimeType);
+    if (!factory) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.TEXT,
+          shaka.util.Error.Code.MISSING_TEXT_PLUGIN,
+          mimeType);
+    }
+    const TextParser = factory();
+    const time = {
+      periodStart: 0,
+      segmentStart: 0,
+      segmentEnd: duration,
+      vttOffset: 0,
+    };
+    const data = shaka.util.BufferUtils.toUint8(buffer);
+    const cues = TextParser.parseMedia(data, time);
+
+    const references = [];
+    for (const cue of cues) {
+      const imageUri = shaka.util.ManifestParserUtils.resolveUris(
+          [uri], [cue.payload])[0];
+      if (imageUri.includes('#xywh')) {
+        shaka.log.alwaysWarn('Unsupported image uri', imageUri);
+        continue;
+      }
+      references.push(new shaka.media.SegmentReference(
+          cue.startTime,
+          cue.endTime,
+          () => [imageUri],
+          /* startByte= */ 0,
+          /* endByte= */ null,
+          /* initSegmentReference= */ null,
+          /* timestampOffset= */ 0,
+          /* appendWindowStart= */ 0,
+          /* appendWindowEnd= */ Infinity,
+      ));
+    }
+
+    /** @type {shaka.extern.Stream} */
+    const stream = {
+      id: this.nextExternalStreamId_++,
+      originalId: null,
+      createSegmentIndex: () => Promise.resolve(),
+      segmentIndex: new shaka.media.SegmentIndex(references),
+      mimeType: mimeType || '',
+      codecs: '',
+      kind: '',
+      encrypted: false,
+      drmInfos: [],
+      keyIds: new Set(),
+      language: 'und',
+      label: null,
+      type: ContentType.IMAGE,
+      primary: false,
+      trickModeVideo: null,
+      emsgSchemeIdUris: null,
+      roles: [],
+      forced: false,
+      channelsCount: null,
+      audioSamplingRate: null,
+      spatialAudio: false,
+      closedCaptions: null,
+      tilesLayout: '1x1',
+    };
+
+    this.manifest_.imageStreams.push(stream);
+    this.onTracksChanged_();
+    return shaka.util.StreamUtils.imageStreamToTrack(stream);
+  }
+
   /**
    * Adds the given chapters track to the loaded manifest.  <code>load()</code>
    * must resolve before calling.  The presentation must have a duration.
diff --git a/lib/util/error.js b/lib/util/error.js
index 45f7f4fd18..9cf5305cc7 100644
--- a/lib/util/error.js
+++ b/lib/util/error.js
@@ -358,6 +358,18 @@ shaka.util.Error.Code = {
    */
   'CHAPTERS_TRACK_FAILED': 2015,
 
+  /**
+   * External thumbnails tracks cannot be added in src= because native platform
+   * doesn't support it.
+   */
+  'CANNOT_ADD_EXTERNAL_THUMBNAILS_TO_SRC_EQUALS': 2016,
+
+  /**
+   * Only external urls of WebVTT type are supported.
+   * <br> error.data[0] is the uri.
+   */
+  'UNSUPPORTED_EXTERNAL_THUMBNAILS_URI': 2017,
+
   /**
    * Some component tried to read past the end of a buffer.  The segment index,
    * init segment, or PSSH may be malformed.
@@ -707,6 +719,11 @@ shaka.util.Error.Code = {
    */
   'HLS_AES_128_INVALID_KEY_LENGTH': 4044,
 
+  /**
+   * External thumbnails tracks cannot be added to live streams.
+   */
+  'CANNOT_ADD_EXTERNAL_THUMBNAILS_TO_LIVE_STREAM': 4045,
+
 
   // RETIRED: 'INCONSISTENT_BUFFER_STATE': 5000,
   // RETIRED: 'INVALID_SEGMENT_INDEX': 5001,
diff --git a/test/player_integration.js b/test/player_integration.js
index 2f1479601c..7109fff5db 100644
--- a/test/player_integration.js
+++ b/test/player_integration.js
@@ -262,6 +262,49 @@ describe('Player', () => {
       expect(cues.length).toBeGreaterThan(0);
     });
 
+    it('skip appended thumbnails for external thumbnails with sprites',
+        async () => {
+          await player.load('test:sintel_no_text_compiled');
+          const locationUri = new goog.Uri(location.href);
+          const partialUri =
+              new goog.Uri('/base/test/test/assets/thumbnails-sprites.vtt');
+          const absoluteUri = locationUri.resolve(partialUri);
+          const newTrack =
+              await player.addThumbnailsTrack(absoluteUri.toString());
+
+          expect(player.getImageTracks()).toEqual([newTrack]);
+
+          const thumbnail1 = await player.getThumbnails(newTrack.id, 0);
+          expect(thumbnail1).toBe(null);
+          const thumbnail2 = await player.getThumbnails(newTrack.id, 10);
+          expect(thumbnail2).toBe(null);
+          const thumbnail3 = await player.getThumbnails(newTrack.id, 40);
+          expect(thumbnail3).toBe(null);
+        });
+
+    it('appends thumbnails for external thumbnails without sprites',
+        async () => {
+          await player.load('test:sintel_no_text_compiled');
+          const locationUri = new goog.Uri(location.href);
+          const partialUri =
+              new goog.Uri('/base/test/test/assets/thumbnails.vtt');
+          const absoluteUri = locationUri.resolve(partialUri);
+          const newTrack =
+              await player.addThumbnailsTrack(absoluteUri.toString());
+
+          expect(player.getImageTracks()).toEqual([newTrack]);
+
+          const thumbnail1 = await player.getThumbnails(newTrack.id, 0);
+          expect(thumbnail1.startTime).toBe(0);
+          expect(thumbnail1.duration).toBe(5);
+          const thumbnail2 = await player.getThumbnails(newTrack.id, 10);
+          expect(thumbnail2.startTime).toBe(5);
+          expect(thumbnail2.duration).toBe(25);
+          const thumbnail3 = await player.getThumbnails(newTrack.id, 40);
+          expect(thumbnail3.startTime).toBe(30);
+          expect(thumbnail3.duration).toBe(30);
+        });
+
     // https://github.com/shaka-project/shaka-player/issues/2553
     it('does not change the selected track', async () => {
       player.configure('streaming.alwaysStreamText', false);
diff --git a/test/test/assets/thumbnails-sprites.vtt b/test/test/assets/thumbnails-sprites.vtt
new file mode 100644
index 0000000000..42d2cf0fb5
--- /dev/null
+++ b/test/test/assets/thumbnails-sprites.vtt
@@ -0,0 +1,10 @@
+WEBVTT
+
+00:00.000 --> 00:05.000
+image1.jpg#xywh=0,0,160,90
+
+00:05.000 --> 00:30.000
+image2.jpg#xywh=0,0,160,90
+
+00:30.000 --> 01:00.000
+image3.jpg#xywh=0,0,160,90
\ No newline at end of file
diff --git a/test/test/assets/thumbnails.vtt b/test/test/assets/thumbnails.vtt
new file mode 100644
index 0000000000..b55896bf7c
--- /dev/null
+++ b/test/test/assets/thumbnails.vtt
@@ -0,0 +1,10 @@
+WEBVTT
+
+00:00.000 --> 00:05.000
+image1.jpg
+
+00:05.000 --> 00:30.000
+image2.jpg
+
+00:30.000 --> 01:00.000
+image3.jpg
\ No newline at end of file