shaka-player 4.3.8 → 4.3.9

package/lib/util/stream_utils.js

@@ -437,48 +437,62 @@ shaka.util.StreamUtils = class {
     manifest.variants = manifest.variants.filter((variant) => {
       // See: https://github.com/shaka-project/shaka-player/issues/3860
       const video = variant.video;
+
       const ContentType = shaka.util.ManifestParserUtils.ContentType;
       const Capabilities = shaka.media.Capabilities;
+      const ManifestParserUtils = shaka.util.ManifestParserUtils;
+      const MimeUtils = shaka.util.MimeUtils;
+      const StreamUtils = shaka.util.StreamUtils;
+
       if (video) {
-        let videoCodecs =
-            shaka.util.StreamUtils.getCorrectVideoCodecs_(video.codecs);
+        let videoCodecs = StreamUtils.getCorrectVideoCodecs_(video.codecs);
+
         // For multiplexed streams. Here we must check the audio of the
         // stream to see if it is compatible.
         if (video.codecs.includes(',')) {
           const allCodecs = video.codecs.split(',');
-          videoCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+
+          videoCodecs = ManifestParserUtils.guessCodecs(
               ContentType.VIDEO, allCodecs);
-          videoCodecs =
-              shaka.util.StreamUtils.getCorrectVideoCodecs_(videoCodecs);
-          let audioCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+          videoCodecs = StreamUtils.getCorrectVideoCodecs_(videoCodecs);
+
+          let audioCodecs = ManifestParserUtils.guessCodecs(
               ContentType.AUDIO, allCodecs);
-          audioCodecs =
-              shaka.util.StreamUtils.getCorrectAudioCodecs_(audioCodecs);
-          const audioFullType = shaka.util.MimeUtils.getFullOrConvertedType(
+          audioCodecs = StreamUtils.getCorrectAudioCodecs_(audioCodecs);
+
+          const audioFullType = MimeUtils.getFullOrConvertedType(
               video.mimeType, audioCodecs, ContentType.AUDIO);
+
           if (!Capabilities.isTypeSupported(audioFullType)) {
             return false;
           }
+
           // Update the codec string with the (possibly) converted codecs.
           videoCodecs = [videoCodecs, audioCodecs].join(',');
         }
-        const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
+
+        const fullType = MimeUtils.getFullOrConvertedType(
             video.mimeType, videoCodecs, ContentType.VIDEO);
+
         if (!Capabilities.isTypeSupported(fullType)) {
           return false;
         }
+
         // Update the codec string with the (possibly) converted codecs.
         video.codecs = videoCodecs;
       }
+
       const audio = variant.audio;
+
       if (audio) {
-        const codecs =
-            shaka.util.StreamUtils.getCorrectAudioCodecs_(audio.codecs);
-        const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
+        const codecs = StreamUtils.getCorrectAudioCodecs_(audio.codecs);
+        const fullType = MimeUtils.getFullOrConvertedType(
             audio.mimeType, codecs, ContentType.AUDIO);
+
         if (!Capabilities.isTypeSupported(fullType)) {
           return false;
         }
+
         // Update the codec string with the (possibly) converted codecs.
         audio.codecs = codecs;
       }
@@ -490,7 +504,7 @@ shaka.util.StreamUtils = class {
           (video.codecs.includes('avc1.') ||
           video.codecs.includes('avc3.'))) {
         shaka.log.debug('Dropping variant - not compatible with platform',
-            shaka.util.StreamUtils.getVariantSummaryString_(variant));
+            StreamUtils.getVariantSummaryString_(variant));
         return false;
       }
 
@@ -500,7 +514,7 @@ shaka.util.StreamUtils = class {
       // Filter out all unsupported variants.
       if (!supported) {
         shaka.log.debug('Dropping variant - not compatible with platform',
-            shaka.util.StreamUtils.getVariantSummaryString_(variant));
+            StreamUtils.getVariantSummaryString_(variant));
       }
       return supported;
     });
@@ -564,7 +578,11 @@ shaka.util.StreamUtils = class {
   static getDecodingConfigs_(variant, usePersistentLicenses, srcEquals) {
     const audio = variant.audio;
     const video = variant.video;
+
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
+    const ManifestParserUtils = shaka.util.ManifestParserUtils;
+    const MimeUtils = shaka.util.MimeUtils;
+    const StreamUtils = shaka.util.StreamUtils;
 
     /** @type {!MediaDecodingConfiguration} */
     const mediaDecodingConfig = {
@@ -573,19 +591,23 @@ shaka.util.StreamUtils = class {
 
     if (video) {
       let videoCodecs = video.codecs;
+
       // For multiplexed streams with audio+video codecs, the config should have
       // AudioConfiguration and VideoConfiguration.
       if (video.codecs.includes(',')) {
         const allCodecs = video.codecs.split(',');
-        videoCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+
+        videoCodecs = ManifestParserUtils.guessCodecs(
             ContentType.VIDEO, allCodecs);
-        videoCodecs =
-            shaka.util.StreamUtils.getCorrectVideoCodecs_(videoCodecs);
-        const audioCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+        videoCodecs = StreamUtils.getCorrectVideoCodecs_(videoCodecs);
+
+        let audioCodecs = ManifestParserUtils.guessCodecs(
             ContentType.AUDIO, allCodecs);
+        audioCodecs = StreamUtils.getCorrectAudioCodecs_(audioCodecs);
 
-        const audioFullType = shaka.util.MimeUtils.getFullOrConvertedType(
+        const audioFullType = MimeUtils.getFullOrConvertedType(
             video.mimeType, audioCodecs, ContentType.AUDIO);
+
         mediaDecodingConfig.audio = {
           contentType: audioFullType,
           channels: 2,
@@ -594,9 +616,11 @@ shaka.util.StreamUtils = class {
           spatialRendering: false,
         };
       }
-      videoCodecs = shaka.util.StreamUtils.getCorrectVideoCodecs_(videoCodecs);
-      const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
+
+      videoCodecs = StreamUtils.getCorrectVideoCodecs_(videoCodecs);
+      const fullType = MimeUtils.getFullOrConvertedType(
           video.mimeType, videoCodecs, ContentType.VIDEO);
+
       // VideoConfiguration
       mediaDecodingConfig.video = {
         contentType: fullType,
@@ -629,9 +653,8 @@ shaka.util.StreamUtils = class {
       }
     }
     if (audio) {
-      const codecs =
-          shaka.util.StreamUtils.getCorrectAudioCodecs_(audio.codecs);
-      const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
+      const codecs = StreamUtils.getCorrectAudioCodecs_(audio.codecs);
+      const fullType = MimeUtils.getFullOrConvertedType(
           audio.mimeType, codecs, ContentType.AUDIO);
 
       // AudioConfiguration
@@ -762,6 +785,20 @@ shaka.util.StreamUtils = class {
    * @private
    */
   static getCorrectAudioCodecs_(codecs) {
+    // According to RFC 6381 section 3.3, 'fLaC' is actually the correct
+    // codec string. We still need to map it to 'flac', as some browsers
+    // currently don't support 'fLaC', while 'flac' is supported by most
+    // major browsers.
+    // See https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
+    if (codecs === 'fLaC') {
+      return 'flac';
+    }
+
+    // The same is true for 'Opus'.
+    if (codecs === 'Opus') {
+      return 'opus';
+    }
+
     // Some Tizen devices seem to misreport AC-3 support, but correctly
     // report EC-3 support.  So query EC-3 as a fallback for AC-3.
     // See https://github.com/shaka-project/shaka-player/issues/2989 for
@@ -1240,6 +1277,9 @@ shaka.util.StreamUtils = class {
     if (textTrack.kind == 'captions') {
       track.mimeType = CLOSED_CAPTION_MIMETYPE;
     }
+    if (textTrack.kind == 'subtitles') {
+      track.mimeType = 'text/vtt';
+    }
     if (textTrack.kind) {
       track.roles = [textTrack.kind];
     }
@@ -1287,13 +1327,15 @@ shaka.util.StreamUtils = class {
    * @private
    */
   static html5TrackToGenericShakaTrack_(html5Track) {
+    const language = html5Track.language;
+
     /** @type {shaka.extern.Track} */
     const track = {
       id: shaka.util.StreamUtils.html5TrackId(html5Track),
       active: false,
       type: '',
       bandwidth: 0,
-      language: shaka.util.LanguageUtils.normalize(html5Track.language),
+      language: shaka.util.LanguageUtils.normalize(language || 'und'),
       label: html5Track.label,
       kind: html5Track.kind,
       width: null,
@@ -1323,6 +1365,7 @@ shaka.util.StreamUtils = class {
       originalAudioId: null,
       originalTextId: null,
       originalImageId: null,
+      originalLanguage: language,
     };
 
     return track;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.3.8",
+  "version": "4.3.9",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -42,7 +42,7 @@
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",
-    "karma-local-wd-launcher": "^1.6.2",
+    "karma-local-wd-launcher": "^1.6.4",
     "karma-opera-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.34",

package/test/cast/cast_utils_unit.js

@@ -171,7 +171,10 @@ describe('CastUtils', () => {
       }
     });
 
-    describe('TimeRanges', () => {
+    // Disable because these tests are flakey on ChromeLinux, and this whole
+    // module will be removed in
+    // https://github.com/shaka-project/shaka-player/issues/4214
+    xdescribe('TimeRanges', () => {
       /** @type {!HTMLVideoElement} */
       let video;
       /** @type {!shaka.util.EventManager} */

package/test/hls/hls_parser_unit.js

@@ -628,6 +628,78 @@ describe('HlsParser', () => {
     await testHlsParser(master, media, manifest);
   });
 
+  it('accepts fLaC codec as audio/mp4', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=1000000,CODECS="fLaC"\n',
+      'audio\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=1000000,CODECS="flac"\n',
+      'audio2\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.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'fLaC');
+        });
+      });
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'flac');
+        });
+      });
+      manifest.sequenceMode = true;
+    });
+
+    await testHlsParser(master, media, manifest);
+  });
+
+  it('accepts Opus codec as audio/mp4', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=128000,CODECS="Opus"\n',
+      'audio\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=128000,CODECS="opus"\n',
+      'audio2\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.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'Opus');
+        });
+      });
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'opus');
+        });
+      });
+      manifest.sequenceMode = true;
+    });
+
+    await testHlsParser(master, media, manifest);
+  });
+
   it('parses audio+video variant with closed captions', async () => {
     const master = [
       '#EXTM3U\n',

package/test/media/adaptation_set_unit.js

@@ -218,6 +218,7 @@ describe('AdaptationSet', () => {
       forced: false,
       trickModeVideo: null,
       type: '',
+      external: false,
     };
   }
 });

package/test/media/drm_engine_integration.js

@@ -244,7 +244,7 @@ describe('DrmEngine', () => {
           /* hasClosedCaptions= */ false);
 
       expect(video.buffered.end(0)).toBeGreaterThan(0);
-      video.play();
+      await video.play();
 
       const waiter = new shaka.test.Waiter(eventManager).timeoutAfter(15);
       waiter.setMediaSourceEngine(mediaSourceEngine);
@@ -327,7 +327,7 @@ describe('DrmEngine', () => {
           /* hasClosedCaptions= */ false);
 
       expect(video.buffered.end(0)).toBeGreaterThan(0);
-      video.play();
+      await video.play();
 
       const waiter = new shaka.test.Waiter(eventManager).timeoutAfter(15);
       waiter.setMediaSourceEngine(mediaSourceEngine);

package/test/media/media_source_engine_unit.js

@@ -1262,7 +1262,7 @@ describe('MediaSourceEngine', () => {
     });
 
     it('destroys text engines', async () => {
-      mediaSourceEngine.reinitText('text/vtt', false);
+      mediaSourceEngine.reinitText('text/vtt', false, false);
 
       await mediaSourceEngine.destroy();
       expect(mockTextEngine).toBeTruthy();

package/test/media/segment_index_unit.js

@@ -974,9 +974,9 @@ describe('SegmentIndex', /** @suppress {accessControls} */ () => {
           return [newRefs.shift()];
         });
       });
-      // Wait long enough for all three new refs to be appended.
-      // Or for all of the new refs to be passed out.
-      await Promise.race([shaka.test.Util.delay(1), done]);
+
+      // Wait for the new refs to be appended.
+      await done;
 
       expect(Array.from(metaIndex)).toEqual(oldRefs.concat(inputRefs2));
     });

package/test/media/streaming_engine_integration.js

@@ -57,6 +57,9 @@ describe('StreamingEngine', () => {
   beforeEach(() => {
     config = shaka.util.PlayerConfiguration.createDefault().streaming;
 
+    // Disable stall detection, which can interfere with playback tests.
+    config.stallEnabled = false;
+
     onError = jasmine.createSpy('onError');
     onError.and.callFake(fail);
     onEvent = jasmine.createSpy('onEvent');
@@ -279,7 +282,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
       // 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
@@ -299,7 +302,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
 
       // Wait for playback to begin before increasing the playback rate.  This
       // improves test reliability on slow platforms like Chromecast.
@@ -313,7 +316,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
 
       // After 35 seconds seek back 10 seconds into the first Period.
       await waiter.timeoutAfter(80).waitUntilPlayheadReaches(video, 35);
@@ -325,7 +328,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 20);
       video.currentTime = 40;
       await waiter.timeoutAfter(60).waitForEnd(video);
@@ -353,7 +356,7 @@ describe('StreamingEngine', () => {
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
 
-      video.play();
+      await video.play();
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 305);
 
       const segmentType = shaka.net.NetworkingEngine.RequestType.SEGMENT;
@@ -373,7 +376,7 @@ describe('StreamingEngine', () => {
       // Seek outside the availability window right away. The playhead
       // should adjust the video's current time.
       video.currentTime = segmentAvailability.end + 120;
-      video.play();
+      await video.play();
 
       // Wait until the repositioning is complete so we don't
       // immediately hit this case.
@@ -398,7 +401,7 @@ describe('StreamingEngine', () => {
       video.currentTime = segmentAvailability.start - 120;
       expect(video.currentTime).toBeGreaterThan(0);
 
-      video.play();
+      await video.play();
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 305);
 
       // We are playing close to the beginning of the availability window.
@@ -426,7 +429,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
 
       await waiter.timeoutAfter(5).waitUntilPlayheadReaches(video, 0.01);
       expect(video.buffered.length).toBeGreaterThan(0);
@@ -441,7 +444,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
 
       await waiter.timeoutAfter(5).waitUntilPlayheadReaches(video, 0.01);
       expect(video.buffered.length).toBeGreaterThan(0);
@@ -460,7 +463,7 @@ describe('StreamingEngine', () => {
       await waiter.timeoutAfter(5).waitForEvent(video, 'loadeddata');
 
       video.currentTime = 8;
-      video.play();
+      await video.play();
 
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 23);
       // Should be close enough to still have the gap buffered.
@@ -477,7 +480,7 @@ describe('StreamingEngine', () => {
       await waiter.timeoutAfter(5).waitForEvent(video, 'loadeddata');
 
       video.currentTime = 8;
-      video.play();
+      await video.play();
 
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 23);
       // Should be close enough to still have the gap buffered.

package/test/offline/manifest_convert_unit.js

@@ -316,6 +316,7 @@ describe('ManifestConverter', () => {
       audioSamplingRate: null,
       spatialAudio: false,
       closedCaptions: null,
+      external: false,
     };
 
     return streamDB;
@@ -389,6 +390,7 @@ describe('ManifestConverter', () => {
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: undefined,
+      external: false,
     };
   }
 
@@ -438,6 +440,7 @@ describe('ManifestConverter', () => {
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: undefined,
+      external: false,
     };
   }
 
@@ -486,6 +489,7 @@ describe('ManifestConverter', () => {
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: undefined,
+      external: false,
     };
   }
 
@@ -531,6 +535,7 @@ describe('ManifestConverter', () => {
       spatialAudio: streamDb.spatialAudio,
       closedCaptions: streamDb.closedCaptions,
       tilesLayout: streamDb.tilesLayout,
+      external: streamDb.external,
     };
 
     expect(stream).toEqual(expectedStream);

package/test/offline/offline_integration.js

@@ -33,6 +33,9 @@ filterDescribe('Offline', supportsStorage, () => {
     player = new shaka.Player(video);
     player.addEventListener('error', fail);
 
+    // Disable stall detection, which can interfere with playback tests.
+    player.configure('streaming.stallEnabled', false);
+
     eventManager = new shaka.util.EventManager();
     waiter = new shaka.test.Waiter(eventManager);
     waiter.setPlayer(player);
@@ -67,7 +70,7 @@ filterDescribe('Offline', supportsStorage, () => {
 
     await player.load(contentUri);
 
-    video.play();
+    await video.play();
     await playTo(/* end= */ 3, /* timeout= */ 20);
     await player.unload();
     await storage.remove(contentUri);
@@ -103,7 +106,7 @@ filterDescribe('Offline', supportsStorage, () => {
 
         await player.load(contentUri);
 
-        video.play();
+        await video.play();
         await playTo(/* end= */ 3, /* timeout= */ 20);
         await player.unload();
         await storage.remove(contentUri);
@@ -146,7 +149,7 @@ filterDescribe('Offline', supportsStorage, () => {
 
         await player.load(contentUri);
 
-        video.play();
+        await video.play();
         await playTo(/* end= */ 3, /* timeout= */ 20);
         await player.unload();
         await storage.remove(contentUri);

package/test/player_external.js

@@ -36,6 +36,24 @@ describe('Player', () => {
   beforeEach(() => {
     player = new compiledShaka.Player(video);
 
+    // Make sure we are playing the lowest res available to avoid test flake
+    // based on network issues.  Note that disabling ABR and setting a low
+    // abr.defaultBandwidthEstimate would not be sufficient, because it
+    // would only affect the choice of track on the first period.  When we
+    // cross a period boundary, the default bandwidth estimate will no
+    // longer be in effect, and AbrManager may choose higher res tracks for
+    // the new period.  Using abr.restrictions.maxHeight will let us force
+    // AbrManager to the lowest resolution, which is its fallback when these
+    // soft restrictions cannot be met.
+    player.configure('abr.restrictions.maxHeight', 1);
+
+    // Make sure that live streams are synced against a good clock.
+    player.configure('manifest.dash.clockSyncUri',
+        'https://shaka-player-demo.appspot.com/time.txt');
+
+    // Disable stall detection, which can interfere with playback tests.
+    player.configure('streaming.stallEnabled', false);
+
     // Grab event manager from the uncompiled library:
     eventManager = new shaka.util.EventManager();
     waiter = new shaka.test.Waiter(eventManager);
@@ -92,21 +110,6 @@ describe('Player', () => {
           }
         }
 
-        // Make sure we are playing the lowest res available to avoid test flake
-        // based on network issues.  Note that disabling ABR and setting a low
-        // abr.defaultBandwidthEstimate would not be sufficient, because it
-        // would only affect the choice of track on the first period.  When we
-        // cross a period boundary, the default bandwidth estimate will no
-        // longer be in effect, and AbrManager may choose higher res tracks for
-        // the new period.  Using abr.restrictions.maxHeight will let us force
-        // AbrManager to the lowest resolution, which is its fallback when these
-        // soft restrictions cannot be met.
-        player.configure('abr.restrictions.maxHeight', 1);
-
-        // Make sure that live streams are synced against a good clock.
-        player.configure('manifest.dash.clockSyncUri',
-            'https://shaka-player-demo.appspot.com/time.txt');
-
         // Add asset-specific configuration.
         player.configure(asset.getConfiguration());
 
@@ -125,7 +128,7 @@ describe('Player', () => {
           const isLive = asset.features.includes(Feature.LIVE);
           expect(player.isLive()).toBe(isLive);
         }
-        video.play();
+        await video.play();
 
         // Wait for the video to start playback.  If it takes longer than 20
         // seconds, fail the test.