shaka-player 4.3.12 → 4.3.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (140) hide show
  1. package/.github/ISSUE_TEMPLATE/bug_report.md +1 -1
  2. package/.github/ISSUE_TEMPLATE/question.md +7 -0
  3. package/.github/workflows/release-please.yaml +2 -27
  4. package/AUTHORS +5 -0
  5. package/CHANGELOG.md +108 -0
  6. package/CODE_OF_CONDUCT.md +1 -1
  7. package/CONTRIBUTORS +6 -0
  8. package/README.md +2 -0
  9. package/demo/common/asset.js +5 -1
  10. package/demo/common/assets.js +16 -2
  11. package/demo/common/message_ids.js +1 -0
  12. package/demo/custom.js +2 -0
  13. package/demo/locales/en.json +1 -0
  14. package/demo/locales/source.json +4 -0
  15. package/demo/main.js +1 -1
  16. package/dist/demo.compiled.debug.js +56 -54
  17. package/dist/demo.compiled.debug.map +3 -3
  18. package/dist/demo.compiled.js +56 -54
  19. package/dist/demo.compiled.map +3 -3
  20. package/dist/deps.js +6 -6
  21. package/dist/locales.js +31 -31
  22. package/dist/receiver.compiled.debug.js +24 -22
  23. package/dist/receiver.compiled.debug.map +3 -3
  24. package/dist/receiver.compiled.js +24 -22
  25. package/dist/receiver.compiled.map +3 -3
  26. package/dist/shaka-player.compiled.d.ts +26 -6
  27. package/dist/shaka-player.compiled.debug.d.ts +26 -6
  28. package/dist/shaka-player.compiled.debug.externs.js +79 -49
  29. package/dist/shaka-player.compiled.debug.js +426 -410
  30. package/dist/shaka-player.compiled.debug.map +4 -4
  31. package/dist/shaka-player.compiled.externs.js +79 -49
  32. package/dist/shaka-player.compiled.js +912 -901
  33. package/dist/shaka-player.compiled.map +4 -4
  34. package/dist/shaka-player.ui.d.ts +38 -7
  35. package/dist/shaka-player.ui.debug.d.ts +38 -7
  36. package/dist/shaka-player.ui.debug.externs.js +80 -49
  37. package/dist/shaka-player.ui.debug.js +460 -442
  38. package/dist/shaka-player.ui.debug.map +4 -4
  39. package/dist/shaka-player.ui.externs.js +80 -49
  40. package/dist/shaka-player.ui.js +1060 -1049
  41. package/dist/shaka-player.ui.map +4 -4
  42. package/docs/tutorials/ad_monetization.md +54 -0
  43. package/docs/tutorials/fairplay.md +2 -2
  44. package/docs/tutorials/index.json +1 -0
  45. package/docs/tutorials/offline.md +1 -1
  46. package/docs/tutorials/plugins.md +4 -0
  47. package/docs/tutorials/text-displayer.md +15 -0
  48. package/docs/tutorials/ui-customization.md +29 -0
  49. package/docs/tutorials/ui.md +4 -1
  50. package/externs/lcevc.js +6 -0
  51. package/externs/shaka/manifest_parser.js +8 -0
  52. package/externs/shaka/player.js +1 -1
  53. package/externs/shaka/text.js +3 -1
  54. package/lib/abr/simple_abr_manager.js +1 -1
  55. package/lib/ads/client_side_ad.js +9 -0
  56. package/lib/ads/client_side_ad_manager.js +7 -2
  57. package/lib/ads/server_side_ad_manager.js +4 -0
  58. package/lib/cast/cast_proxy.js +18 -0
  59. package/lib/cea/cea608_memory.js +1 -1
  60. package/lib/cea/cea_decoder.js +11 -1
  61. package/lib/dash/dash_parser.js +79 -42
  62. package/lib/dash/mpd_utils.js +39 -27
  63. package/lib/hls/hls_parser.js +148 -49
  64. package/lib/hls/hls_utils.js +5 -5
  65. package/lib/media/content_workarounds.js +30 -0
  66. package/lib/media/drm_engine.js +16 -12
  67. package/lib/media/media_source_engine.js +4 -2
  68. package/lib/media/play_rate_controller.js +1 -0
  69. package/lib/media/presentation_timeline.js +11 -0
  70. package/lib/media/quality_observer.js +1 -1
  71. package/lib/media/segment_reference.js +16 -7
  72. package/lib/media/streaming_engine.js +64 -54
  73. package/lib/media/transmuxer.js +1 -1
  74. package/lib/media/video_wrapper.js +4 -3
  75. package/lib/offline/offline_manifest_parser.js +5 -0
  76. package/lib/offline/session_deleter.js +0 -8
  77. package/lib/offline/storage.js +4 -1
  78. package/lib/player.js +79 -18
  79. package/lib/polyfill/media_capabilities.js +23 -3
  80. package/lib/text/mp4_ttml_parser.js +2 -2
  81. package/lib/text/simple_text_displayer.js +7 -6
  82. package/lib/text/srt_text_parser.js +2 -2
  83. package/lib/text/text_engine.js +3 -2
  84. package/lib/text/ttml_text_parser.js +33 -5
  85. package/lib/text/ui_text_displayer.js +81 -15
  86. package/lib/text/vtt_text_parser.js +13 -0
  87. package/lib/util/buffer_utils.js +26 -4
  88. package/lib/util/cmcd_manager.js +16 -1
  89. package/lib/util/fairplay_utils.js +1 -1
  90. package/lib/util/manifest_parser_utils.js +20 -8
  91. package/lib/util/object_utils.js +1 -1
  92. package/lib/util/periods.js +91 -36
  93. package/lib/util/platform.js +39 -2
  94. package/lib/util/player_configuration.js +5 -3
  95. package/lib/util/stream_utils.js +36 -28
  96. package/lib/util/ts_parser.js +3 -3
  97. package/lib/util/xml_utils.js +5 -0
  98. package/package.json +2 -2
  99. package/test/cea/cea_decoder_unit.js +40 -0
  100. package/test/dash/dash_parser_live_unit.js +5 -8
  101. package/test/dash/dash_parser_manifest_unit.js +5 -0
  102. package/test/dash/dash_parser_segment_base_unit.js +5 -0
  103. package/test/dash/dash_parser_segment_list_unit.js +21 -17
  104. package/test/dash/dash_parser_segment_template_unit.js +5 -0
  105. package/test/hls/hls_live_unit.js +33 -0
  106. package/test/hls/hls_parser_unit.js +52 -60
  107. package/test/media/buffering_observer_unit.js +13 -0
  108. package/test/media/content_workarounds_unit.js +1 -1
  109. package/test/media/drm_engine_unit.js +30 -3
  110. package/test/media/media_source_engine_unit.js +1 -1
  111. package/test/media/transmuxer_integration.js +2 -2
  112. package/test/offline/storage_integration.js +3 -0
  113. package/test/player_integration.js +40 -40
  114. package/test/player_unit.js +31 -0
  115. package/test/polyfill/media_capabilities_unit.js +12 -6
  116. package/test/test/util/dash_parser_util.js +16 -7
  117. package/test/test/util/fake_drm_engine.js +7 -0
  118. package/test/test/util/layout_tests.js +2 -1
  119. package/test/test/util/simple_fakes.js +2 -2
  120. package/test/test/util/test_scheme.js +3 -0
  121. package/test/test/util/waiter.js +5 -0
  122. package/test/text/mp4_ttml_parser_unit.js +4 -4
  123. package/test/text/simple_text_displayer_unit.js +1 -1
  124. package/test/text/srt_text_parser_unit.js +1 -1
  125. package/test/text/text_engine_unit.js +6 -0
  126. package/test/text/ttml_text_parser_unit.js +49 -18
  127. package/test/text/ui_text_displayer_unit.js +9 -0
  128. package/test/text/vtt_text_parser_unit.js +2 -17
  129. package/test/util/buffer_utils_unit.js +1 -1
  130. package/test/util/periods_unit.js +113 -0
  131. package/test/util/ts_parser_unit.js +1 -1
  132. package/third_party/closure-uri/uri.js +1 -1
  133. package/ui/externs/ui.js +24 -0
  134. package/ui/language_utils.js +11 -5
  135. package/ui/play_button.js +20 -0
  136. package/ui/playback_rate_selection.js +4 -0
  137. package/ui/presentation_time.js +5 -5
  138. package/ui/small_play_button.js +2 -2
  139. package/ui/volume_bar.js +10 -6
  140. /package/.github/{config.yml → ISSUE_TEMPLATE/config.yml} +0 -0
@@ -7,7 +7,7 @@
7
7
  describe('ContentWorkarounds', () => {
8
8
  const encryptionBoxes = {
9
9
  'encv': ['hev1', 'hvc1', 'avc1', 'avc3'],
10
- 'enca': ['ac-3', 'ec-3', 'mp4a'],
10
+ 'enca': ['ac-3', 'ec-3', 'ac-4', 'mp4a'],
11
11
  };
12
12
  for (const encryptionBox of Object.keys(encryptionBoxes)) {
13
13
  for (const box of encryptionBoxes[encryptionBox]) {
@@ -2100,7 +2100,7 @@ describe('DrmEngine', () => {
2100
2100
  videoRobustness: 'really_really_ridiculously_good',
2101
2101
  serverCertificate: serverCert,
2102
2102
  serverCertificateUri: '',
2103
- initData: ['blah'],
2103
+ initData: [{keyId: 'a'}],
2104
2104
  keyIds: new Set(['deadbeefdeadbeefdeadbeefdeadbeef']),
2105
2105
  };
2106
2106
  const drmInfoAudio = {
@@ -2111,7 +2111,7 @@ describe('DrmEngine', () => {
2111
2111
  audioRobustness: 'good',
2112
2112
  serverCertificate: undefined,
2113
2113
  serverCertificateUri: '',
2114
- initData: ['init data'],
2114
+ initData: [{keyId: 'b'}],
2115
2115
  keyIds: new Set(['eadbeefdeadbeefdeadbeefdeadbeefd']),
2116
2116
  };
2117
2117
  const drmInfoDesired = {
@@ -2123,7 +2123,7 @@ describe('DrmEngine', () => {
2123
2123
  videoRobustness: 'really_really_ridiculously_good',
2124
2124
  serverCertificate: serverCert,
2125
2125
  serverCertificateUri: '',
2126
- initData: ['blah', 'init data'],
2126
+ initData: [{keyId: 'a'}, {keyId: 'b'}],
2127
2127
  keyIds: new Set([
2128
2128
  'deadbeefdeadbeefdeadbeefdeadbeef',
2129
2129
  'eadbeefdeadbeefdeadbeefdeadbeefd',
@@ -2177,6 +2177,33 @@ describe('DrmEngine', () => {
2177
2177
  [drmInfoAudio]);
2178
2178
  expect(returned).toEqual([drmInfoDesired]);
2179
2179
  });
2180
+
2181
+ it('does not match incompatible drmInfos', () => {
2182
+ // Different key systems do not match.
2183
+ const drmInfo1 = {
2184
+ keySystem: 'drm.abc',
2185
+ licenseServerUri: undefined,
2186
+ distinctiveIdentifierRequired: false,
2187
+ persistentStateRequired: false,
2188
+ serverCertificate: undefined,
2189
+ serverCertificateUri: '',
2190
+ initData: [],
2191
+ keyIds: new Set(),
2192
+ };
2193
+ const drmInfo2 = {
2194
+ keySystem: 'drm.foobar',
2195
+ licenseServerUri: undefined,
2196
+ distinctiveIdentifierRequired: false,
2197
+ persistentStateRequired: false,
2198
+ serverCertificate: undefined,
2199
+ serverCertificateUri: '',
2200
+ initData: [],
2201
+ keyIds: new Set(),
2202
+ };
2203
+ const returned1 = shaka.media.DrmEngine.getCommonDrmInfos(
2204
+ [drmInfo1], [drmInfo2]);
2205
+ expect(returned1).toEqual([]);
2206
+ });
2180
2207
  }); // describe('getCommonDrmInfos')
2181
2208
 
2182
2209
  describe('configure', () => {
@@ -560,7 +560,7 @@ describe('MediaSourceEngine', () => {
560
560
  await mediaSourceEngine.appendBuffer(
561
561
  ContentType.TEXT, data, reference, /* hasClosedCaptions= */ false);
562
562
  expect(mockTextEngine.appendBuffer).toHaveBeenCalledWith(
563
- data, 0, 10);
563
+ data, 0, 10, 'foo://bar');
564
564
  });
565
565
 
566
566
  it('appends transmuxed data and captions', async () => {
@@ -102,8 +102,8 @@ describe('Transmuxer', () => {
102
102
  });
103
103
  });
104
104
 
105
- it('getOrginalMimeType returns the correct mimeType', () => {
106
- expect(transmuxer.getOrginalMimeType()).toBe(transmuxerMimeType);
105
+ it('getOriginalMimeType returns the correct mimeType', () => {
106
+ expect(transmuxer.getOriginalMimeType()).toBe(transmuxerMimeType);
107
107
  });
108
108
 
109
109
  describe('transmuxing', () => {
@@ -1741,6 +1741,9 @@ filterDescribe('Storage', storageSupport, () => {
1741
1741
 
1742
1742
  /** @override */
1743
1743
  onExpirationUpdated(session, number) {}
1744
+
1745
+ /** @override */
1746
+ onInitialVariantChosen(variant) {}
1744
1747
  };
1745
1748
 
1746
1749
  /**
@@ -59,6 +59,46 @@ describe('Player', () => {
59
59
  document.body.removeChild(video);
60
60
  });
61
61
 
62
+ describe('seek range', () => {
63
+ // Regression test for Issue #3675.
64
+ it('has a reasonable seek range after going from live to VOD', async () => {
65
+ const netEngine = player.getNetworkingEngine();
66
+ const startTime = Date.now();
67
+ netEngine.registerRequestFilter((type, request) => {
68
+ if (type != shaka.net.NetworkingEngine.RequestType.MANIFEST) {
69
+ return;
70
+ }
71
+ // Simulate a live stream by providing different manifests over time.
72
+ const time = (Date.now() - startTime) / 1000;
73
+ const manifestNumber = Math.min(5, Math.floor(0.5 + time / 2));
74
+ request.uris = [
75
+ '/base/test/test/assets/3675/dash_' + manifestNumber + '.mpd',
76
+ ];
77
+ console.log('getting manifest', request.uris);
78
+ });
79
+
80
+ // Play the stream.
81
+ await player.load('/base/test/test/assets/3675/dash_0.mpd');
82
+ await video.play();
83
+
84
+ // Wait for the stream to be over.
85
+ eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
86
+ /** @type {shaka.test.Waiter} */
87
+ const waiter = new shaka.test.Waiter(eventManager)
88
+ .setPlayer(player)
89
+ .timeoutAfter(40)
90
+ .failOnTimeout(true);
91
+ await waiter.waitForEnd(video);
92
+
93
+ // The stream should have transitioned to VOD by now.
94
+ expect(player.isLive()).toBe(false);
95
+
96
+ // Check that the final seek range is as expected.
97
+ const seekRange = player.seekRange();
98
+ expect(seekRange.end).toBeCloseTo(14);
99
+ });
100
+ });
101
+
62
102
  describe('attach', () => {
63
103
  beforeEach(async () => {
64
104
  // To test attach, we want to construct a player without a video element
@@ -903,46 +943,6 @@ describe('Player', () => {
903
943
  });
904
944
  });
905
945
 
906
- describe('seek range', () => {
907
- // Regression test for Issue #3675.
908
- it('has a reasonable seek range after going from live to VOD', async () => {
909
- const netEngine = player.getNetworkingEngine();
910
- const startTime = Date.now();
911
- netEngine.registerRequestFilter((type, request) => {
912
- if (type != shaka.net.NetworkingEngine.RequestType.MANIFEST) {
913
- return;
914
- }
915
- // Simulate a live stream by providing different manifests over time.
916
- const time = (Date.now() - startTime) / 1000;
917
- const manifestNumber = Math.min(5, Math.floor(0.5 + time / 2));
918
- request.uris = [
919
- '/base/test/test/assets/3675/dash_' + manifestNumber + '.mpd',
920
- ];
921
- console.log('getting manifest', request.uris);
922
- });
923
-
924
- // Play the stream.
925
- await player.load('/base/test/test/assets/3675/dash_0.mpd');
926
- await video.play();
927
-
928
- // Wait for the stream to be over.
929
- eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
930
- /** @type {shaka.test.Waiter} */
931
- const waiter = new shaka.test.Waiter(eventManager)
932
- .setPlayer(player)
933
- .timeoutAfter(40)
934
- .failOnTimeout(true);
935
- await waiter.waitForEnd(video);
936
-
937
- // The stream should have transitioned to VOD by now.
938
- expect(player.isLive()).toBe(false);
939
-
940
- // Check that the final seek range is as expected.
941
- const seekRange = player.seekRange();
942
- expect(seekRange.end).toBeCloseTo(14);
943
- });
944
- });
945
-
946
946
  describe('buffering', () => {
947
947
  const startBuffering = jasmine.objectContaining({buffering: true});
948
948
  const endBuffering = jasmine.objectContaining({buffering: false});
@@ -3291,6 +3291,37 @@ describe('Player', () => {
3291
3291
  expect(tracks[0].id).toBe(2);
3292
3292
  });
3293
3293
 
3294
+ it('removes based on frameRate', async () => {
3295
+ manifest = shaka.test.ManifestGenerator.generate((manifest) => {
3296
+ manifest.addVariant(0, (variant) => {
3297
+ variant.addVideo(1, (stream) => {
3298
+ stream.frameRate = 15;
3299
+ });
3300
+ });
3301
+
3302
+ manifest.addVariant(1, (variant) => {
3303
+ variant.addVideo(2, (stream) => {
3304
+ stream.frameRate = 30;
3305
+ });
3306
+ });
3307
+
3308
+ manifest.addVariant(2, (variant) => {
3309
+ variant.addVideo(3, (stream) => {
3310
+ stream.frameRate = 60;
3311
+ });
3312
+ });
3313
+ });
3314
+
3315
+ await player.load(fakeManifestUri, 0, fakeMimeType);
3316
+ expect(player.getVariantTracks().length).toBe(3);
3317
+
3318
+ player.configure({restrictions: {minFrameRate: 20, maxFrameRate: 40}});
3319
+
3320
+ const tracks = player.getVariantTracks();
3321
+ expect(tracks.length).toBe(1);
3322
+ expect(tracks[0].id).toBe(1);
3323
+ });
3324
+
3294
3325
  it('removes the whole variant if one stream is restricted', async () => {
3295
3326
  manifest = shaka.test.ManifestGenerator.generate((manifest) => {
3296
3327
  manifest.addVariant(0, (variant) => {
@@ -178,8 +178,10 @@ describe('MediaCapabilities', () => {
178
178
  await navigator.mediaCapabilities.decodingInfo(mockDecodingConfig);
179
179
 
180
180
  expect(mockCanDisplayType).not.toHaveBeenCalled();
181
- // 1 (during install()) + 1 (for video config check).
182
- expect(isChromecastSpy).toHaveBeenCalledTimes(2);
181
+ // 1 (during install()) +
182
+ // 1 (for video config check) +
183
+ // 1 (for audio config check).
184
+ expect(isChromecastSpy).toHaveBeenCalledTimes(3);
183
185
  // 1 (fallback in canCastDisplayType()) +
184
186
  // 1 (mockDecodingConfig.audio).
185
187
  expect(supportMap.has(mockDecodingConfig.video.contentType))
@@ -201,8 +203,10 @@ describe('MediaCapabilities', () => {
201
203
  await navigator.mediaCapabilities.decodingInfo(mockDecodingConfig);
202
204
 
203
205
  expect(mockCanDisplayType).not.toHaveBeenCalled();
204
- // 1 (during install()) + 1 (for video config check).
205
- expect(isChromecastSpy).toHaveBeenCalledTimes(2);
206
+ // 1 (during install()) +
207
+ // 1 (for video config check) +
208
+ // 1 (for audio config check).
209
+ expect(isChromecastSpy).toHaveBeenCalledTimes(3);
206
210
  // 1 (fallback in canCastDisplayType()) +
207
211
  // 1 (mockDecodingConfig.audio).
208
212
  expect(supportMap.has(mockDecodingConfig.video.contentType))
@@ -248,8 +252,10 @@ describe('MediaCapabilities', () => {
248
252
  shaka.polyfill.MediaCapabilities.install();
249
253
  await navigator.mediaCapabilities.decodingInfo(mockDecodingConfig);
250
254
 
251
- // 1 (during install()) + 1 (for video config check).
252
- expect(isChromecastSpy).toHaveBeenCalledTimes(2);
255
+ // 1 (during install()) +
256
+ // 1 (for video config check) +
257
+ // 1 (for audio config check).
258
+ expect(isChromecastSpy).toHaveBeenCalledTimes(3);
253
259
  // 1 (mockDecodingConfig.audio).
254
260
  expect(supportMap.has(chromecastType)).toBe(true);
255
261
  // Called once in canCastDisplayType.
@@ -46,11 +46,15 @@ shaka.test.Dash = class {
46
46
  updateDuration: () => {},
47
47
  newDrmInfo: (stream) => {},
48
48
  };
49
- const manifest = await dashParser.start('dummy://foo', playerInterface);
50
- const stream = manifest.variants[0].video;
51
- await stream.createSegmentIndex();
49
+ try {
50
+ const manifest = await dashParser.start('dummy://foo', playerInterface);
51
+ const stream = manifest.variants[0].video;
52
+ await stream.createSegmentIndex();
52
53
 
53
- shaka.test.ManifestParser.verifySegmentIndex(stream, references);
54
+ shaka.test.ManifestParser.verifySegmentIndex(stream, references);
55
+ } finally {
56
+ dashParser.stop();
57
+ }
54
58
  }
55
59
 
56
60
  /**
@@ -82,9 +86,14 @@ shaka.test.Dash = class {
82
86
  updateDuration: () => {},
83
87
  newDrmInfo: (stream) => {},
84
88
  };
85
- const p = dashParser.start('dummy://foo', playerInterface);
86
- await expectAsync(p).toBeRejectedWith(
87
- shaka.test.Util.jasmineError(expectedError));
89
+
90
+ try {
91
+ const p = dashParser.start('dummy://foo', playerInterface);
92
+ await expectAsync(p).toBeRejectedWith(
93
+ shaka.test.Util.jasmineError(expectedError));
94
+ } finally {
95
+ dashParser.stop();
96
+ }
88
97
  }
89
98
 
90
99
  /**
@@ -100,4 +100,11 @@ shaka.test.FakeDrmEngine = class {
100
100
  // Copy the values to break the reference to the input value.
101
101
  this.offlineSessions_ = sessions.map((s) => s);
102
102
  }
103
+
104
+ /**
105
+ * @override
106
+ */
107
+ hasManifestInitData() {
108
+ return true;
109
+ }
103
110
  };
@@ -377,7 +377,8 @@ shaka.test.NativeTextLayoutTests = class extends shaka.test.TextLayoutTests {
377
377
 
378
378
  /** @override */
379
379
  recreateTextDisplayer() {
380
- this.textDisplayer = new shaka.text.SimpleTextDisplayer(this.video);
380
+ this.textDisplayer = new shaka.text.SimpleTextDisplayer(
381
+ this.video, shaka.Player.TextTrackLabel);
381
382
  this.textDisplayer.setTextVisibility(true);
382
383
  }
383
384
 
@@ -520,7 +520,7 @@ shaka.test.FakeTransmuxer = class {
520
520
  jasmine.createSpy('transmux').and.returnValue(Promise.resolve(output));
521
521
 
522
522
  /** @type {!jasmine.Spy} */
523
- this.getOrginalMimeType =
524
- jasmine.createSpy('getOrginalMimeType').and.returnValue('mimeType');
523
+ this.getOriginalMimeType =
524
+ jasmine.createSpy('getOriginalMimeType').and.returnValue('mimeType');
525
525
  }
526
526
  };
@@ -763,6 +763,9 @@ shaka.test.TestScheme.ManifestParser = class {
763
763
 
764
764
  /** @override */
765
765
  onExpirationUpdated() {}
766
+
767
+ /** @override */
768
+ onInitialVariantChosen() {}
766
769
  };
767
770
 
768
771
 
@@ -184,6 +184,7 @@ shaka.test.Waiter = class {
184
184
  }
185
185
  this.eventManager_.unlisten(mediaElement, 'timeupdate');
186
186
  this.eventManager_.unlisten(mediaElement, 'ended');
187
+ this.eventManager_.unlisten(mediaElement, 'durationchange');
187
188
  };
188
189
 
189
190
  const p = new Promise((resolve) => {
@@ -202,6 +203,10 @@ shaka.test.Waiter = class {
202
203
  timer.tickEvery(/* seconds= */ 1);
203
204
  this.eventManager_.listen(mediaElement, 'timeupdate', check);
204
205
  this.eventManager_.listen(mediaElement, 'ended', check);
206
+ // Some tests on Safari expose a condition where the ended flag can be
207
+ // found in the desired state in a brief window during a durationchange
208
+ // event.
209
+ this.eventManager_.listen(mediaElement, 'durationchange', check);
205
210
  });
206
211
 
207
212
  return this.waitUntilGeneric_(goalName, p, cleanup, mediaElement);
@@ -43,7 +43,7 @@ describe('Mp4TtmlParser', () => {
43
43
  parser.parseInit(ttmlInitSegment);
44
44
  const time =
45
45
  {periodStart: 0, segmentStart: 0, segmentEnd: 60, vttOffset: 0};
46
- const ret = parser.parseMedia(ttmlSegmentMultipleMDAT, time);
46
+ const ret = parser.parseMedia(ttmlSegmentMultipleMDAT, time, null);
47
47
  // Bodies.
48
48
  expect(ret.length).toBe(2);
49
49
  // Divs.
@@ -63,10 +63,10 @@ describe('Mp4TtmlParser', () => {
63
63
  const parser = new shaka.text.Mp4TtmlParser();
64
64
  parser.parseInit(ttmlInitSegment);
65
65
 
66
- const ret1 = parser.parseMedia(ttmlSegment, time1);
66
+ const ret1 = parser.parseMedia(ttmlSegment, time1, null);
67
67
  expect(ret1.length).toBeGreaterThan(0);
68
68
 
69
- const ret2 = parser.parseMedia(ttmlSegment, time2);
69
+ const ret2 = parser.parseMedia(ttmlSegment, time2, null);
70
70
  expect(ret2.length).toBeGreaterThan(0);
71
71
 
72
72
  expect(ret2[0].startTime).toBe(ret1[0].startTime + 7);
@@ -164,7 +164,7 @@ describe('Mp4TtmlParser', () => {
164
164
  parser.parseInit(ttmlInitSegment);
165
165
  const time =
166
166
  {periodStart: 0, segmentStart: 0, segmentEnd: 60, vttOffset: 0};
167
- const result = parser.parseMedia(ttmlSegment, time);
167
+ const result = parser.parseMedia(ttmlSegment, time, null);
168
168
  shaka.test.TtmlUtils.verifyHelper(
169
169
  cues, result, {startTime: 23, endTime: 53.5});
170
170
  });
@@ -18,7 +18,7 @@ describe('SimpleTextDisplayer', () => {
18
18
 
19
19
  beforeEach(() => {
20
20
  video = new shaka.test.FakeVideo();
21
- displayer = new SimpleTextDisplayer(video);
21
+ displayer = new SimpleTextDisplayer(video, shaka.Player.TextTrackLabel);
22
22
 
23
23
  expect(video.textTracks.length).toBe(1);
24
24
  mockTrack = /** @type {!shaka.test.FakeTextTrack} */ (video.textTracks[0]);
@@ -71,7 +71,7 @@ describe('SrtTextParser', () => {
71
71
  const data = BufferUtils.toUint8(StringUtils.toUTF8(text));
72
72
 
73
73
  const parser = new shaka.text.SrtTextParser();
74
- const result = parser.parseMedia(data, time);
74
+ const result = parser.parseMedia(data, time, null);
75
75
 
76
76
  const expected = cues.map((cue) => {
77
77
  if (cue.nestedCues) {
@@ -95,6 +95,7 @@ describe('TextEngine', () => {
95
95
  expect(mockParseMedia).toHaveBeenCalledOnceMoreWith([
96
96
  dummyData,
97
97
  {periodStart: 0, segmentStart: 0, segmentEnd: 3, vttOffset: 0},
98
+ undefined,
98
99
  ]);
99
100
 
100
101
  expect(mockDisplayer.appendSpy).toHaveBeenCalledOnceMoreWith([
@@ -110,6 +111,7 @@ describe('TextEngine', () => {
110
111
  expect(mockParseMedia).toHaveBeenCalledOnceMoreWith([
111
112
  dummyData,
112
113
  {periodStart: 0, segmentStart: 3, segmentEnd: 5, vttOffset: 0},
114
+ undefined,
113
115
  ]);
114
116
 
115
117
  expect(mockDisplayer.appendSpy).toHaveBeenCalledOnceMoreWith([
@@ -262,6 +264,7 @@ describe('TextEngine', () => {
262
264
  expect(mockParseMedia).toHaveBeenCalledOnceMoreWith([
263
265
  dummyData,
264
266
  {periodStart: 0, segmentStart: 0, segmentEnd: 3, vttOffset: 0},
267
+ undefined,
265
268
  ]);
266
269
  expect(mockDisplayer.appendSpy).toHaveBeenCalledOnceMoreWith([
267
270
  [
@@ -276,6 +279,7 @@ describe('TextEngine', () => {
276
279
  expect(mockParseMedia).toHaveBeenCalledOnceMoreWith([
277
280
  dummyData,
278
281
  {periodStart: 4, segmentStart: 4, segmentEnd: 7, vttOffset: 4},
282
+ undefined,
279
283
  ]);
280
284
  expect(mockDisplayer.appendSpy).toHaveBeenCalledOnceMoreWith([
281
285
  [
@@ -305,6 +309,7 @@ describe('TextEngine', () => {
305
309
  expect(mockParseMedia).toHaveBeenCalledOnceMoreWith([
306
310
  dummyData,
307
311
  {periodStart: 0, segmentStart: 0, segmentEnd: 3, vttOffset: 0},
312
+ undefined,
308
313
  ]);
309
314
 
310
315
  textEngine.setTimestampOffset(8);
@@ -314,6 +319,7 @@ describe('TextEngine', () => {
314
319
  expect(mockParseMedia).toHaveBeenCalledOnceMoreWith([
315
320
  dummyData,
316
321
  {periodStart: 8, segmentStart: 4, segmentEnd: 7, vttOffset: 4},
322
+ undefined,
317
323
  ]);
318
324
  });
319
325
  });
@@ -638,8 +638,8 @@ describe('TtmlTextParser', () => {
638
638
  id: 'subtitleArea',
639
639
  viewportAnchorX: 50,
640
640
  viewportAnchorY: 16,
641
- width: 100,
642
- height: 100,
641
+ width: 50,
642
+ height: 84,
643
643
  },
644
644
  startTime: 62.05,
645
645
  endTime: 3723.2,
@@ -666,8 +666,8 @@ describe('TtmlTextParser', () => {
666
666
  region: {
667
667
  viewportAnchorX: 50,
668
668
  viewportAnchorY: 16,
669
- width: 100,
670
- height: 100,
669
+ width: 50,
670
+ height: 84,
671
671
  },
672
672
  startTime: 62.05,
673
673
  endTime: 3723.2,
@@ -694,8 +694,8 @@ describe('TtmlTextParser', () => {
694
694
  region: {
695
695
  viewportAnchorX: 50,
696
696
  viewportAnchorY: 16,
697
- width: 100,
698
- height: 100,
697
+ width: 50,
698
+ height: 84,
699
699
  },
700
700
  startTime: 62.05,
701
701
  endTime: 3723.2,
@@ -872,8 +872,8 @@ describe('TtmlTextParser', () => {
872
872
  viewportAnchorY: 16,
873
873
  regionAnchorX: 0,
874
874
  regionAnchorY: 0,
875
- width: 100,
876
- height: 100,
875
+ width: 50,
876
+ height: 84,
877
877
  heightUnits: CueRegion.units.PERCENTAGE,
878
878
  widthUnits: CueRegion.units.PERCENTAGE,
879
879
  viewportAnchorUnits: CueRegion.units.PERCENTAGE,
@@ -945,8 +945,8 @@ describe('TtmlTextParser', () => {
945
945
  id: 'subtitleArea',
946
946
  viewportAnchorX: 50,
947
947
  viewportAnchorY: 16,
948
- width: 100,
949
- height: 100,
948
+ width: 50,
949
+ height: 84,
950
950
  },
951
951
  startTime: 62.05,
952
952
  endTime: 3723.2,
@@ -973,8 +973,8 @@ describe('TtmlTextParser', () => {
973
973
  region: {
974
974
  viewportAnchorX: 50,
975
975
  viewportAnchorY: 16,
976
- width: 100,
977
- height: 100,
976
+ width: 50,
977
+ height: 84,
978
978
  },
979
979
  startTime: 62.05,
980
980
  endTime: 3723.2,
@@ -1001,8 +1001,8 @@ describe('TtmlTextParser', () => {
1001
1001
  region: {
1002
1002
  viewportAnchorX: 50,
1003
1003
  viewportAnchorY: 16,
1004
- width: 100,
1005
- height: 100,
1004
+ width: 50,
1005
+ height: 84,
1006
1006
  },
1007
1007
  startTime: 62.05,
1008
1008
  endTime: 3723.2,
@@ -1032,8 +1032,8 @@ describe('TtmlTextParser', () => {
1032
1032
  id: 'subtitleArea',
1033
1033
  viewportAnchorX: 12.2,
1034
1034
  viewportAnchorY: 50.005,
1035
- width: 100,
1036
- height: 100,
1035
+ width: 87.8,
1036
+ height: 49.995,
1037
1037
  },
1038
1038
  startTime: 62.05,
1039
1039
  endTime: 3723.2,
@@ -1238,6 +1238,35 @@ describe('TtmlTextParser', () => {
1238
1238
  });
1239
1239
  });
1240
1240
 
1241
+ it('supports smpte:backgroundImage attribute with url', () => {
1242
+ verifyHelper(
1243
+ [
1244
+ {
1245
+ startTime: 62.05,
1246
+ endTime: 3723.2,
1247
+ payload: '',
1248
+ },
1249
+ ],
1250
+ '<tt ' +
1251
+ 'xmlns:ttm="http://www.w3.org/ns/ttml#metadata" ' +
1252
+ 'xmlns:smpte="http://www.smpte-ra.org/schemas/2052-1/2010/smpte-tt">' +
1253
+ '<metadata>' +
1254
+ '<smpte:image imageType="PNG" encoding="Base64" xml:id="img_0">' +
1255
+ 'base64EncodedImage</smpte:image>' +
1256
+ '</metadata>' +
1257
+ '<body><div smpte:backgroundImage="img_0.png">' +
1258
+ '<p begin="01:02.05" end="01:02:03.200"></p>' +
1259
+ '</div></body></tt>',
1260
+ {periodStart: 0, segmentStart: 60, segmentEnd: 3730, vttOffset: 0},
1261
+ {startTime: 62.05, endTime: 3723.2},
1262
+ {
1263
+ startTime: 62.05,
1264
+ endTime: 3723.2,
1265
+ backgroundImage: 'foo://bar/img_0.png',
1266
+ isContainer: false,
1267
+ });
1268
+ });
1269
+
1241
1270
  it('supports smpte:backgroundImage attribute in div element', () => {
1242
1271
  verifyHelper(
1243
1272
  [],
@@ -2060,7 +2089,8 @@ describe('TtmlTextParser', () => {
2060
2089
  function verifyHelper(cues, text, time, bodyProperties, divProperties) {
2061
2090
  const data =
2062
2091
  shaka.util.BufferUtils.toUint8(shaka.util.StringUtils.toUTF8(text));
2063
- const result = new shaka.text.TtmlTextParser().parseMedia(data, time);
2092
+ const result = new shaka.text.TtmlTextParser()
2093
+ .parseMedia(data, time, 'foo://bar');
2064
2094
  shaka.test.TtmlUtils.verifyHelper(
2065
2095
  cues, result, bodyProperties, divProperties);
2066
2096
  }
@@ -2087,7 +2117,8 @@ describe('TtmlTextParser', () => {
2087
2117
  expect(() => {
2088
2118
  new shaka.text.TtmlTextParser().parseMedia(
2089
2119
  shaka.util.BufferUtils.toUint8(data),
2090
- {periodStart: 0, segmentStart: 0, segmentEnd: 10, vttOffset: 0});
2120
+ {periodStart: 0, segmentStart: 0, segmentEnd: 10, vttOffset: 0},
2121
+ 'foo://bar');
2091
2122
  }).toThrow(error);
2092
2123
  }
2093
2124
  });
@@ -605,4 +605,13 @@ describe('UITextDisplayer', () => {
605
605
  (e) => e.nodeType == Node.ELEMENT_NODE);
606
606
  expect(childrenOfTwo.length).toBe(3);
607
607
  });
608
+
609
+ it('textDisplayer does not crash if destroy is called more than once', () => {
610
+ expect(videoContainer.childNodes.length).toBe(1);
611
+
612
+ textDisplayer.destroy();
613
+ textDisplayer.destroy();
614
+
615
+ expect(videoContainer.childNodes.length).toBe(0);
616
+ });
608
617
  });
@@ -207,30 +207,15 @@ describe('VttTextParser', () => {
207
207
  {
208
208
  startTime: 40,
209
209
  endTime: 50,
210
- payload: '',
210
+ payload: 'Test2',
211
211
  writingMode: Cue.writingMode.VERTICAL_LEFT_TO_RIGHT,
212
- nestedCues: [
213
- {
214
- startTime: 40,
215
- endTime: 50,
216
- payload: 'Test',
217
- writingMode: Cue.writingMode.VERTICAL_LEFT_TO_RIGHT,
218
- },
219
- {
220
- startTime: 40,
221
- endTime: 50,
222
- payload: '2',
223
- fontWeight: Cue.fontWeight.BOLD,
224
- writingMode: Cue.writingMode.VERTICAL_LEFT_TO_RIGHT,
225
- },
226
- ],
227
212
  },
228
213
  ],
229
214
  'WEBVTT\n\n' +
230
215
  '00:00:20.000 --> 00:00:40.000 vertical:rl\n' +
231
216
  'Test\n\n' +
232
217
  '00:00:40.000 --> 00:00:50.000 vertical:lr\n' +
233
- 'Test<b>2</b>',
218
+ 'Test2',
234
219
  {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
235
220
  });
236
221