shaka-player 3.1.3 → 3.1.4

package/test/test/assets/3675/dash_5.mpd

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MPD xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="urn:mpeg:dash:schema:mpd:2011"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011 http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-DASH_schema_files/DASH-MPD.xsd"
+	profiles="urn:mpeg:dash:profile:isoff-live:2011"
+	type="static"
+	mediaPresentationDuration="PT14.0S"
+	maxSegmentDuration="PT2.0S"
+	minBufferTime="PT4.0S">
+	<ProgramInformation>
+	</ProgramInformation>
+	<ServiceDescription id="0">
+	</ServiceDescription>
+	<Period id="0" start="PT0.0S">
+		<AdaptationSet id="0" contentType="video" startWithSAP="1" segmentAlignment="true" bitstreamSwitching="true" frameRate="30/1" maxWidth="1280" maxHeight="720" par="16:9">
+			<Representation id="0" mimeType="video/mp4" codecs="avc1.64001f" bandwidth="122012" width="1280" height="720" sar="1:1">
+				<SegmentTemplate timescale="15360" initialization="init-stream$RepresentationID$.m4s" media="chunk-stream$RepresentationID$-$Number%05d$.m4s" startNumber="3">
+					<SegmentTimeline>
+						<S t="61440" d="30720" r="4" />
+					</SegmentTimeline>
+				</SegmentTemplate>
+			</Representation>
+		</AdaptationSet>
+	</Period>
+</MPD>

package/test/test/util/fake_ad_manager.js

@@ -78,7 +78,7 @@ shaka.test.FakeAdManager = class extends shaka.util.FakeEventTarget {
    */
   startAd(ad) {
     const event = new shaka.util.FakeEvent(shaka.ads.AdManager.AD_STARTED,
-        {'ad': ad});
+        (new Map()).set('ad', ad));
 
     this.dispatchEvent(event);
   }

package/test/text/ttml_text_parser_unit.js

@@ -476,6 +476,15 @@ describe('TtmlTextParser', () => {
         {periodStart: 0, segmentStart: 0, segmentEnd: 0});
   });
 
+  it('supports comments in the body', () => {
+    verifyHelper(
+        [],
+        '<tt><body><div>' +
+        '<!-- text-based TTML -->' +
+        '</div></body></tt>',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+  });
+
   it('parses alignment from textAlign attribute of a region', () => {
     verifyHelper(
         [

package/test/text/ui_text_displayer_unit.js

@@ -84,20 +84,16 @@ describe('UITextDisplayer', () => {
     // Wait until updateCaptions_() gets called.
     await shaka.test.Util.delay(0.5);
 
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
-    const captions =
-        textContainer.querySelector('span:not(.shaka-text-wrapper)');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const captions = textContainer.querySelector('div');
     const cssObj = parseCssText(captions.style.cssText);
 
     const expectCssObj = {
       'color': 'green',
-      'background-color': 'black',
       'direction': 'ltr',
       'font-size': '10px',
       'font-style': 'normal',
       'font-weight': 400,
-      'line-height': 2,
       'text-align': 'center',
     };
 
@@ -114,6 +110,8 @@ describe('UITextDisplayer', () => {
     }
 
     expect(cssObj).toEqual(jasmine.objectContaining(expectCssObj));
+    expect(parseCssText(textContainer.querySelector('span').style.cssText))
+        .toEqual(jasmine.objectContaining({'background-color': 'black'}));
   });
 
   it('correctly displays styles for nested cues', async () => {
@@ -137,15 +135,13 @@ describe('UITextDisplayer', () => {
     await shaka.test.Util.delay(0.5);
 
     // Verify styles applied to the nested cues.
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
     const captions =
         textContainer.querySelector('span:not(.shaka-text-wrapper)');
     const cssObj = parseCssText(captions.style.cssText);
 
     const expectCssObj = {
       'color': 'green',
-      'background-color': 'black',
       'font-size': '10px',
       'font-style': 'normal',
       'font-weight': 400,
@@ -165,6 +161,8 @@ describe('UITextDisplayer', () => {
     }
 
     expect(cssObj).toEqual(jasmine.objectContaining(expectCssObj));
+    expect(parseCssText(captions.querySelector('span').style.cssText))
+        .toEqual(jasmine.objectContaining({'background-color': 'black'}));
   });
 
   it('correctly displays styles for cellResolution units', async () => {
@@ -191,10 +189,8 @@ describe('UITextDisplayer', () => {
     // style.
     const expectedLinePadding = '11.25px';
 
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
-    const captions =
-        textContainer.querySelector('span:not(.shaka-text-wrapper)');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const captions = textContainer.querySelector('div');
     const cssObj = parseCssText(captions.style.cssText);
     expect(cssObj).toEqual(
         jasmine.objectContaining({
@@ -222,10 +218,8 @@ describe('UITextDisplayer', () => {
     // videoContainerHeight=450px and tts:fontSize="90%" on the default style.
     const expectedFontSize = '27px';
 
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
-    const captions =
-        textContainer.querySelector('span:not(.shaka-text-wrapper)');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const captions = textContainer.querySelector('div');
     const cssObj = parseCssText(captions.style.cssText);
     expect(cssObj).toEqual(
         jasmine.objectContaining({'font-size': expectedFontSize}));
@@ -319,6 +313,24 @@ describe('UITextDisplayer', () => {
     expect(captions.length).toBe(3);
   });
 
+  it('hides currently displayed cue when removed', async () => {
+    const cue = new shaka.text.Cue(0, 50, 'One');
+    textDisplayer.setTextVisibility(true);
+    textDisplayer.append([cue]);
+    video.currentTime = 10;
+    await shaka.test.Util.delay(0.5);
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+
+    let cueElements = textContainer.querySelectorAll('div');
+    expect(cueElements.length).toBe(1);
+    expect(cueElements[0].textContent).toBe('One');
+
+    textDisplayer.remove(0, 100);
+
+    cueElements = textContainer.querySelectorAll('div');
+    expect(cueElements.length).toBe(0);
+  });
+
   it('hides and shows nested cues at appropriate times', async () => {
     const parentCue1 = new shaka.text.Cue(0, 100, '');
     const cue1 = new shaka.text.Cue(0, 50, 'One');

package/test/ui/localization_unit.js

@@ -198,7 +198,7 @@ describe('Localization', () => {
       localization.changeLocale([ELVISH_WOODLAND]);
 
       expect(events.length).toBe(1);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND]);
     });
 
 
@@ -214,23 +214,23 @@ describe('Localization', () => {
       localization.changeLocale([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       expect(events.length).toBe(1);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       // We should see an event telling us that dwarfish is still missing.
       localization.insert(ELVISH_WOODLAND, new Map());
       localization.changeLocale([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       expect(events.length).toBe(2);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
-      expect(events[1].locales).toEqual([DWARFISH_NORTH]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
+      expect(events[1]['locales']).toEqual([DWARFISH_NORTH]);
 
       // There should be no more events now that we added the last language.
       localization.insert(DWARFISH_NORTH, new Map());
       localization.changeLocale([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       expect(events.length).toBe(2);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
-      expect(events[1].locales).toEqual([DWARFISH_NORTH]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
+      expect(events[1]['locales']).toEqual([DWARFISH_NORTH]);
     });
   });
 
@@ -373,8 +373,8 @@ describe('Localization', () => {
           // it was in the fallback (HALFLING) but not our preferred language
           // (EVLISH).
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([ELVISH_WOODLAND]);
-          expect(events[0].missing).toEqual(['hello']);
+          expect(events[0]['locales']).toEqual([ELVISH_WOODLAND]);
+          expect(events[0]['missing']).toEqual(['hello']);
         });
 
     it('fires when key/value is missing from preferred but found in base',
@@ -400,8 +400,8 @@ describe('Localization', () => {
           // because it was in the base (ELVISH) but not our preferred language
           // (EVLISH_WOODLAND).
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([ELVISH_WOODLAND]);
-          expect(events[0].missing).toEqual(['Best Wishes']);
+          expect(events[0]['locales']).toEqual([ELVISH_WOODLAND]);
+          expect(events[0]['missing']).toEqual(['Best Wishes']);
         });
 
     it('fires when key/value is missing from preferred but found in sibling',
@@ -427,8 +427,8 @@ describe('Localization', () => {
           // understand" because it was in a sibling locale (HALFLING_SHIRE)
           // but not our preferred language (HALFLING_COMMON).
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([HALFLING_COMMON]);
-          expect(events[0].missing).toEqual(['Do you understand']);
+          expect(events[0]['locales']).toEqual([HALFLING_COMMON]);
+          expect(events[0]['missing']).toEqual(['Do you understand']);
         });
 
     it('fires when key/value is missing from some preferred languages',
@@ -454,8 +454,9 @@ describe('Localization', () => {
 
           // There should have no missing localization events.
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
-          expect(events[0].missing).toEqual(['may your forge burn bright']);
+          expect(events[0]['locales']).toEqual(
+              [ELVISH_WOODLAND, DWARFISH_NORTH]);
+          expect(events[0]['missing']).toEqual(['may your forge burn bright']);
         });
   });
 

package/test/ui/text_displayer_layout_unit.js

@@ -141,7 +141,9 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
         cue.region.id = '1';
         // Position the cue *explicitly* at the bottom of the screen.
         cue.region.viewportAnchorX = 0;  // %
-        cue.region.viewportAnchorY = 100;  // %
+        cue.region.viewportAnchorY = 90;  // %
+        cue.region.width = 100;  // %
+        cue.region.height = 10;  // %
         textDisplayer.append([cue]);
 
         await checkScreenshot('ui', 'cue-with-controls');
@@ -314,6 +316,16 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
       await checkScreenshot(prefix, 'nested-cues-with-linebreak');
     });
 
+    // Regression test for #3600
+    it('cue positioning', async () => {
+      const cue = new shaka.text.Cue(0, 1, 'Text');
+      cue.line = 10;
+      cue.lineInterpretation = shaka.text.Cue.lineInterpretation.PERCENTAGE;
+      textDisplayer.append([cue]);
+
+      await checkScreenshot(prefix, 'cue-position');
+    });
+
     // Regression test for #2157 and #2584
     it('region positioning', async () => {
       const nestedCue = new shaka.text.Cue(

package/test/util/stream_utils_unit.js

@@ -537,6 +537,41 @@ describe('StreamUtils', () => {
       expect(manifest.variants.length).toBe(1);
       expect(manifest.variants[0].decodingInfos.length).toBe(0);
     });
+
+    it('includes transferFunction in config when hdr', async () => {
+      window.shakaMediaCapabilities.decodingInfo =
+          shaka.test.Util.spyFunc(decodingInfoSpy);
+
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.addVideo(0, (stream) => {
+            stream.mime('video/mp4', 'avc1.640028');
+            stream.hdr = 'SDR';
+          });
+        });
+        manifest.addVariant(1, (variant) => {
+          variant.addVideo(1, (stream) => {
+            stream.mime('video/mp4', 'hvc1.2.4.L150.90');
+            stream.hdr = 'PQ';
+          });
+        });
+        manifest.addVariant(2, (variant) => {
+          variant.addVideo(2, (stream) => {
+            stream.mime('video/mp4', 'hvc1.2.4.L153.B0');
+            stream.hdr = 'HLG';
+          });
+        });
+      });
+
+      await StreamUtils.getDecodingInfosForVariants(manifest.variants,
+          /* usePersistentLicenses= */ false, /* srcEquals= */ false);
+      expect(decodingInfoSpy.calls.argsFor(0)[0].video.transferFunction)
+          .toBe('srgb');
+      expect(decodingInfoSpy.calls.argsFor(1)[0].video.transferFunction)
+          .toBe('pq');
+      expect(decodingInfoSpy.calls.argsFor(2)[0].video.transferFunction)
+          .toBe('hlg');
+    });
   });
 
   describe('filterManifest', () => {

package/ui/cast_button.js

@@ -102,9 +102,8 @@ shaka.ui.CastButton = class extends shaka.ui.Element {
       } catch (error) {
         this.castButton_.disabled = false;
         if (error.code != shaka.util.Error.Code.CAST_CANCELED_BY_USER) {
-          this.controls.dispatchEvent(new shaka.util.FakeEvent('error', {
-            detail: error,
-          }));
+          this.controls.dispatchEvent(new shaka.util.FakeEvent(
+              'error', (new Map()).set('detail', error)));
         }
       }
     }

package/ui/controls.js

@@ -573,9 +573,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
           }
         }
       } catch (error) {
-        this.dispatchEvent(new shaka.util.FakeEvent('error', {
-          detail: error,
-        }));
+        this.dispatchEvent(new shaka.util.FakeEvent(
+            'error', (new Map()).set('detail', error)));
       }
     }
   }
@@ -1162,9 +1161,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
   /** @private */
   onCastStatusChange_() {
     const isCasting = this.castProxy_.isCasting();
-    this.dispatchEvent(new shaka.util.FakeEvent('caststatuschanged', {
-      newStatus: isCasting,
-    }));
+    this.dispatchEvent(new shaka.util.FakeEvent(
+        'caststatuschanged', (new Map()).set('newStatus', isCasting)));
 
     if (isCasting) {
       this.controlsContainer_.setAttribute('casting', 'true');

package/ui/less/containers.less

@@ -229,13 +229,9 @@
   transition-delay: 500ms;
 
   /* These are defaults which are overridden by JS or cue styles. */
-  span:not(.shaka-text-wrapper) {
-    display: inline;
-    font-size: 20px;
-    line-height: 1.4;  // relative to font size.
-    background-color: rgba(0, 0, 0, 0.8);
-    color: rgb(255, 255, 255);
-  }
+  font-size: 20px;
+  line-height: 1.4;  // relative to font size.
+  color: rgb(255, 255, 255);
 
   span.shaka-text-wrapper {
     display: inline;

package/ui/locales/ru.json

@@ -1,10 +1,10 @@
 {
-  "AD_DURATION": "Продолжительность объявления",
-  "AD_PROGRESS": "Объявление [AD_ON] из [NUM_ADS]",
-  "AD_TIME": "Объявление: [AD_TIME]",
+  "AD_DURATION": "Продолжительность рекламы",
+  "AD_PROGRESS": "Реклама [AD_ON] из [NUM_ADS]",
+  "AD_TIME": "Реклама: [AD_TIME]",
   "AUTO_QUALITY": "Авто",
   "BACK": "Назад",
-  "CAPTIONS": "Титры",
+  "CAPTIONS": "Субтитры",
   "CAST": "Транслировать...",
   "ENTER_LOOP_MODE": "Зациклить текущее видео",
   "ENTER_PICTURE_IN_PICTURE": "Перейти в режим \"Картинка в картинке\"",
@@ -20,8 +20,8 @@
   "MULTIPLE_LANGUAGES": "Несколько языков",
   "MUTE": "Отключить звук",
   "NOT_APPLICABLE": "Неприменимо",
-  "OFF": "Включить",
-  "ON": "Отключить",
+  "OFF": "Выкл.",
+  "ON": "Вкл.",
   "PAUSE": "Пауза",
   "PICTURE_IN_PICTURE": "Картинка в картинке",
   "PLAY": "Воспроизвести",

package/ui/localization.js

@@ -130,28 +130,20 @@ shaka.ui.Localization = class {
         (locale) => !this.localizations_.has(locale));
 
     if (missing.length) {
-      /** @type {shaka.ui.Localization.UnknownLocalesEvent} */
-      const eMissing = {
-        'locales': missing,
-      };
-
       this.events_.dispatchEvent(new shaka.util.FakeEvent(
           Class.UNKNOWN_LOCALES,
-          eMissing));
+          (new Map()).set('locales', missing)));
     }
 
     const found = shaka.util.Iterables.filter(
         this.currentLocales_,
         (locale) => this.localizations_.has(locale));
 
-    /** @type {shaka.ui.Localization.LocaleChangedEvent} */
-    const eFound = {
-      'locales': found.length ? found : [this.fallbackLocale_],
-    };
-
+    const data = (new Map()).set(
+        'locales', found.length ? found : [this.fallbackLocale_]);
     this.events_.dispatchEvent(new shaka.util.FakeEvent(
         Class.LOCALE_CHANGED,
-        eFound));
+        data));
   }
 
   /**
@@ -253,14 +245,11 @@ shaka.ui.Localization = class {
     // number of locales. Since we don't know which ones we actually checked,
     // just tell them the preferred locale.
 
-    /** @type {shaka.ui.Localization.UnknownLocalizationEvent} */
-    const e = {
-      // Make a copy to avoid leaking references.
-      'locales': Array.from(this.currentLocales_),
-      'missing': id,
-    };
-
-    this.events_.dispatchEvent(new FakeEvent(Class.UNKNOWN_LOCALIZATION, e));
+    const data = new Map()
+        // Make a copy to avoid leaking references.
+        .set('locales', Array.from(this.currentLocales_))
+        .set('missing', id);
+    this.events_.dispatchEvent(new FakeEvent(Class.UNKNOWN_LOCALIZATION, data));
 
     return '';
   }
@@ -381,18 +370,16 @@ shaka.ui.Localization = class {
     }
 
     if (missing.size > 0) {
-      /** @type {shaka.ui.Localization.MissingLocalizationsEvent} */
-      const e = {
-        // Make a copy of the preferred locales to avoid leaking references.
-        'locales': Array.from(preferredLocales),
-        // Because most people like arrays more than sets, convert the set to
-        // an array.
-        'missing': Array.from(missing),
-      };
+      const data = new Map()
+          // Make a copy of the preferred locales to avoid leaking references.
+          .set('locales', Array.from(preferredLocales))
+          // Because more people like arrays more than sets, convert the set to
+          // an array.
+          .set('missing', Array.from(missing));
 
       this.events_.dispatchEvent(new shaka.util.FakeEvent(
           shaka.ui.Localization.MISSING_LOCALIZATIONS,
-          e));
+          data));
     }
   }
 
@@ -478,52 +465,42 @@ shaka.ui.Localization.LOCALE_CHANGED = 'locale-changed';
 shaka.ui.Localization.LOCALE_UPDATED = 'locale-updated';
 
 /**
- * @typedef {{
- *   'locales': !Array.<string>
- * }}
- *
+ * @event shaka.ui.Localization.UnknownLocalesEvent
+ * @property {string} type
+ *   'unknown-locales'
  * @property {!Array.<string>} locales
  *    The locales that the user wanted but could not be found.
  * @exportDoc
  */
-shaka.ui.Localization.UnknownLocalesEvent;
 
 /**
- * @typedef {{
- *   'locales': !Array.<string>,
- *   'missing': string
- * }}
- *
+ * @event shaka.ui.Localization.MissingLocalizationsEvent
+ * @property {string} type
+ *   'unknown-localization'
  * @property {!Array.<string>} locales
  *    The locales that the user wanted.
  * @property {string} missing
  *    The id of the unknown entry.
  * @exportDoc
  */
-shaka.ui.Localization.UnknownLocalizationEvent;
 
 /**
- * @typedef {{
- *   'locales': !Array.<string>,
- *   'missing': !Array.<string>
- * }}
- *
+ * @event shaka.ui.Localization.MissingLocalizationsEvent
+ * @property {string} type
+ *   'missing-localizations'
  * @property {string} locale
  *    The locale that the user wanted.
  * @property {!Array.<string>} missing
  *    The ids of the missing entries.
  * @exportDoc
  */
-shaka.ui.Localization.MissingLocalizationsEvent;
 
 /**
- * @typedef {{
- *   'locales': !Array.<string>
- * }}
- *
+ * @event shaka.ui.Localization.LocaleChangedEvent
+ * @property {string} type
+ *   'locale-changed'
  * @property {!Array.<string>} locales
  *    The new set of locales that user wanted,
  *    and that were successfully found.
  * @exportDoc
  */
-shaka.ui.Localization.LocaleChangedEvent;

package/ui/pip_button.js

@@ -131,9 +131,8 @@ shaka.ui.PipButton = class extends shaka.ui.Element {
         await document.exitPictureInPicture();
       }
     } catch (error) {
-      this.controls.dispatchEvent(new shaka.util.FakeEvent('error', {
-        detail: error,
-      }));
+      this.controls.dispatchEvent(new shaka.util.FakeEvent(
+          'error', (new Map()).set('detail', error)));
     }
   }