shaka-player 4.3.9 → 4.4.0

package/test/hls/hls_parser_unit.js

@@ -10,6 +10,10 @@ describe('HlsParser', () => {
   const Util = shaka.test.Util;
   const originalAlwaysWarn = shaka.log.alwaysWarn;
 
+  const videoInitSegmentUri = '/base/test/test/assets/sintel-video-init.mp4';
+  const videoSegmentUri = '/base/test/test/assets/sintel-video-segment.mp4';
+  const videoTsSegmentUri = '/base/test/test/assets/video.ts';
+
   const vttText = [
     'WEBVTT\n',
     '\n',
@@ -34,52 +38,33 @@ describe('HlsParser', () => {
   /** @type {!Uint8Array} */
   let segmentData;
   /** @type {!Uint8Array} */
+  let tsSegmentData;
+  /** @type {!Uint8Array} */
   let selfInitializingSegmentData;
   /** @type {!Uint8Array} */
   let aes128Key;
+  /** @type {!boolean} */
+  let sequenceMode;
 
   afterEach(() => {
     shaka.log.alwaysWarn = originalAlwaysWarn;
     parser.stop();
   });
 
-  beforeEach(() => {
-    // TODO: use StreamGenerator?
-    initSegmentData = new Uint8Array([
-      0x00, 0x00, 0x00, 0x30, // size (48)
-      0x6D, 0x6F, 0x6F, 0x76, // type (moov)
-      0x00, 0x00, 0x00, 0x28, // trak size (40)
-      0x74, 0x72, 0x61, 0x6B, // type (trak)
-      0x00, 0x00, 0x00, 0x20, // mdia size (32)
-      0x6D, 0x64, 0x69, 0x61, // type (mdia)
-
-      0x00, 0x00, 0x00, 0x18, // mdhd size (24)
-      0x6D, 0x64, 0x68, 0x64, // type (mdhd)
-      0x00, 0x00, 0x00, 0x00, // version and flags
-
-      0x00, 0x00, 0x00, 0x00, // creation time (0)
-      0x00, 0x00, 0x00, 0x00, // modification time (0)
-      0x00, 0x00, 0x03, 0xe8, // timescale (1000)
+  beforeEach(async () => {
+    const responses = await Promise.all([
+      shaka.test.Util.fetch(videoInitSegmentUri),
+      shaka.test.Util.fetch(videoSegmentUri),
+      shaka.test.Util.fetch(videoTsSegmentUri),
     ]);
-
-    segmentData = new Uint8Array([
-      0x00, 0x00, 0x00, 0x24, // size (36)
-      0x6D, 0x6F, 0x6F, 0x66, // type (moof)
-      0x00, 0x00, 0x00, 0x1C, // traf size (28)
-      0x74, 0x72, 0x61, 0x66, // type (traf)
-
-      0x00, 0x00, 0x00, 0x14, // tfdt size (20)
-      0x74, 0x66, 0x64, 0x74, // type (tfdt)
-      0x01, 0x00, 0x00, 0x00, // version and flags
-
-      0x00, 0x00, 0x00, 0x00, // baseMediaDecodeTime first 4 bytes (0)
-      0x00, 0x00, 0x00, 0x00,  // baseMediaDecodeTime last 4 bytes (0)
-    ]);
-    // segment starts at 0s.
+    initSegmentData = responses[0];
+    segmentData = responses[1];
 
     selfInitializingSegmentData =
         shaka.util.Uint8ArrayUtils.concat(initSegmentData, segmentData);
 
+    tsSegmentData = responses[2];
+
     aes128Key = new Uint8Array([
       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
@@ -88,6 +73,7 @@ describe('HlsParser', () => {
     fakeNetEngine = new shaka.test.FakeNetworkingEngine();
 
     config = shaka.util.PlayerConfiguration.createDefault().manifest;
+    sequenceMode = config.hls.sequenceMode;
     onEventSpy = jasmine.createSpy('onEvent');
     newDrmInfoSpy = jasmine.createSpy('newDrmInfo');
     playerInterface = {
@@ -129,6 +115,7 @@ describe('HlsParser', () => {
         .setResponseText('test:/main.vtt', vttText)
         .setResponseValue('test:/init.mp4', initSegmentData)
         .setResponseValue('test:/init2.mp4', initSegmentData)
+        .setResponseValue('test:/init.test', initSegmentData)
         .setResponseValue('test:/main.mp4', segmentData)
         .setResponseValue('test:/main2.mp4', segmentData)
         .setResponseValue('test:/main.test', segmentData)
@@ -163,7 +150,7 @@ describe('HlsParser', () => {
     const master = [
       '#EXTM3U\n',
       '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="eng",',
-      'CHANNELS="16/JOC",URI="audio"\n',
+      'CHANNELS="16/JOC",SAMPLE-RATE="48000",URI="audio"\n',
       '#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="sub1",LANGUAGE="eng",',
       'URI="text"\n',
       '#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="sub2",LANGUAGE="es",',
@@ -191,7 +178,8 @@ describe('HlsParser', () => {
     ].join('');
 
     const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.language = 'en';
@@ -203,18 +191,22 @@ describe('HlsParser', () => {
         });
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'en';
+          stream.originalLanguage = 'eng';
           stream.channelsCount = 16;
+          stream.audioSamplingRate = 48000;
           stream.spatialAudio = true;
           stream.mime('audio/mp4', 'mp4a');
         });
       });
       manifest.addPartialTextStream((stream) => {
         stream.language = 'en';
+        stream.originalLanguage = 'eng';
         stream.kind = TextStreamKind.SUBTITLE;
         stream.mime('text/vtt', '');
       });
       manifest.addPartialTextStream((stream) => {
         stream.language = 'es';
+        stream.originalLanguage = 'es';
         stream.kind = TextStreamKind.SUBTITLE;
         stream.mime('text/vtt', '');
       });
@@ -267,7 +259,8 @@ describe('HlsParser', () => {
     ].join('');
 
     const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.language = 'en';
@@ -279,6 +272,7 @@ describe('HlsParser', () => {
         });
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'en';
+          stream.originalLanguage = 'eng';
           stream.channelsCount = 16;
           stream.spatialAudio = true;
           stream.mime('audio/mp4', 'mp4a');
@@ -286,11 +280,13 @@ describe('HlsParser', () => {
       });
       manifest.addPartialTextStream((stream) => {
         stream.language = 'en';
+        stream.originalLanguage = 'eng';
         stream.kind = TextStreamKind.SUBTITLE;
         stream.mime('text/vtt', '');
       });
       manifest.addPartialTextStream((stream) => {
         stream.language = 'es';
+        stream.originalLanguage = 'es';
         stream.kind = TextStreamKind.SUBTITLE;
         stream.mime('text/vtt', '');
       });
@@ -339,7 +335,8 @@ describe('HlsParser', () => {
           stream.size(960, 540);
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -377,7 +374,8 @@ describe('HlsParser', () => {
           stream.mime('video/mp4', 'avc1.4d001e');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -407,7 +405,8 @@ describe('HlsParser', () => {
           stream.mime('video/mp4', 'avc1');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -436,7 +435,8 @@ describe('HlsParser', () => {
           stream.mime('video/mp4', 'avc1');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -468,7 +468,8 @@ describe('HlsParser', () => {
           stream.mime('video/mp4', 'avc1');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -497,7 +498,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', 'mp4a');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -532,7 +534,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', 'mp4a');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -564,10 +567,11 @@ describe('HlsParser', () => {
           stream.mime('video/mp4', 'avc1');
         });
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
-          stream.mime('audio/mp4', '');
+          stream.mime('audio/mp4', 'mp4a.40.34');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -592,10 +596,11 @@ describe('HlsParser', () => {
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
-          stream.mime('audio/aac', '');
+          stream.mime('audio/aac', 'mp4a.40.2');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -619,10 +624,11 @@ describe('HlsParser', () => {
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
-          stream.mime('audio/mpeg', '');
+          stream.mime('audio/mpeg', 'mp4a.40.34');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -658,7 +664,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', 'flac');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -694,7 +701,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', 'opus');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -733,7 +741,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', 'mp4a');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -770,7 +779,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', 'mp4a');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -801,7 +811,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', 'mp4a');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -831,7 +842,8 @@ describe('HlsParser', () => {
           stream.mime('video/mp4', 'avc1,mp4a');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -861,7 +873,8 @@ describe('HlsParser', () => {
           stream.mime('video/mp4', /** @type {?} */ (jasmine.any(String)));
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -896,7 +909,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', /** @type {?} */ (jasmine.any(String)));
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -927,7 +941,8 @@ describe('HlsParser', () => {
           stream.mime('video/mp4', /** @type {?} */ (jasmine.any(String)));
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -958,7 +973,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', /** @type {?} */ (jasmine.any(String)));
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -998,6 +1014,7 @@ describe('HlsParser', () => {
         });
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'en';
+          stream.originalLanguage = 'eng';
         });
       });
       manifest.addPartialVariant((variant) => {
@@ -1008,9 +1025,11 @@ describe('HlsParser', () => {
         });
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'fr';
+          stream.originalLanguage = 'fr';
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -1044,6 +1063,7 @@ describe('HlsParser', () => {
         variant.addPartialStream(ContentType.VIDEO);
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'en';
+          stream.originalLanguage = 'en';
         });
       });
       manifest.addPartialVariant((variant) => {
@@ -1051,9 +1071,11 @@ describe('HlsParser', () => {
         variant.addPartialStream(ContentType.VIDEO);
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'fr';
+          stream.originalLanguage = 'fr';
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -1203,6 +1225,7 @@ describe('HlsParser', () => {
         variant.addPartialStream(ContentType.VIDEO);
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'en';
+          stream.originalLanguage = 'en';
         });
       });
       manifest.addPartialVariant((variant) => {
@@ -1210,13 +1233,15 @@ describe('HlsParser', () => {
         variant.addPartialStream(ContentType.VIDEO);
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'en';
+          stream.originalLanguage = 'en';
           stream.roles = [
             'public.accessibility.describes-video',
             'public.accessibility.describes-music-and-sound',
           ];
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -1281,7 +1306,8 @@ describe('HlsParser', () => {
           'public.accessibility.describes-music-and-sound',
         ];
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine.setResponseText('test:/master', master);
@@ -1336,7 +1362,8 @@ describe('HlsParser', () => {
           'public.accessibility.describes-music-and-sound',
         ];
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -1401,7 +1428,8 @@ describe('HlsParser', () => {
           'public.accessibility.describes-music-and-sound',
         ];
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine.setResponseText('test:/master', master);
@@ -1437,7 +1465,8 @@ describe('HlsParser', () => {
           stream.mime('video/mp4', 'avc1');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     // The extra parameters should be stripped by the parser.
@@ -1491,11 +1520,13 @@ describe('HlsParser', () => {
       });
       manifest.addPartialTextStream((stream) => {
         stream.language = 'en';
+        stream.originalLanguage = 'eng';
         stream.forced = true;
         stream.kind = TextStreamKind.SUBTITLE;
         stream.mime('text/vtt', '');
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -1558,15 +1589,18 @@ describe('HlsParser', () => {
       });
       manifest.addPartialTextStream((stream) => {
         stream.language = 'en';
+        stream.originalLanguage = 'eng';
         stream.kind = TextStreamKind.SUBTITLE;
         stream.mime('text/vtt', '');
       });
       manifest.addPartialTextStream((stream) => {
         stream.language = 'es';
+        stream.originalLanguage = 'es';
         stream.kind = TextStreamKind.SUBTITLE;
         stream.mime('text/vtt', '');
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -1628,7 +1662,8 @@ describe('HlsParser', () => {
         stream.kind = TextStreamKind.SUBTITLE;
         stream.mime('application/mp4', '');
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -1689,11 +1724,13 @@ describe('HlsParser', () => {
       });
       manifest.addPartialTextStream((stream) => {
         stream.language = 'en';
+        stream.originalLanguage = 'eng';
         stream.forced = true;
         stream.kind = TextStreamKind.SUBTITLE;
         stream.mime('text/vtt', '');
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -1756,7 +1793,8 @@ describe('HlsParser', () => {
         stream.kind = TextStreamKind.SUBTITLE;
         stream.mime('text/vtt', '');
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -2442,9 +2480,11 @@ describe('HlsParser', () => {
       });
       manifest.addPartialTextStream((stream) => {
         stream.language = 'en';
+        stream.originalLanguage = 'eng';
         stream.mime('application/mp4', 'stpp.ttml.im1t');
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -2488,7 +2528,8 @@ describe('HlsParser', () => {
         stream.language = 'en';
         stream.mime('application/mp4', 'wvtt');
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -2539,7 +2580,8 @@ describe('HlsParser', () => {
       manifest.addPartialTextStream((stream) => {
         stream.mime('text/vtt', 'vtt');
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -2583,7 +2625,8 @@ describe('HlsParser', () => {
       manifest.addPartialTextStream((stream) => {
         stream.kind = TextStreamKind.SUBTITLE;
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -2652,7 +2695,8 @@ describe('HlsParser', () => {
             stream.segmentIndex = new shaka.media.SegmentIndex(segments);
           });
         });
-        manifest.sequenceMode = true;
+        manifest.sequenceMode = sequenceMode;
+        manifest.type = shaka.media.ManifestParser.HLS;
       });
 
       fakeNetEngine
@@ -2752,8 +2796,8 @@ describe('HlsParser', () => {
         '#EXTINF:5,\n',
         'main.mp4\n',
         '#EXT-X-PROGRAM-DATE-TIME:2000-01-01T00:00:15.00Z\n',
-        '#EXT-X-PART:DURATION=2.5,URI="main.mp4"\n',
-        '#EXT-X-PART:DURATION=2.5,URI="main.mp4"\n',
+        '#EXT-X-PART:DURATION=2.5,URI="main.mp4",INDEPENDENT=YES\n',
+        '#EXT-X-PART:DURATION=2.5,URI="main.mp4",INDEPENDENT=YES\n',
         '#EXTINF:5,\n',
         'main.mp4\n',
         '#EXT-X-PROGRAM-DATE-TIME:2000-01-01T00:00:20.00Z\n',
@@ -2796,7 +2840,8 @@ describe('HlsParser', () => {
       manifest.addPartialVariant((variant) => {
         variant.addPartialStream(ContentType.VIDEO);
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -2835,7 +2880,8 @@ describe('HlsParser', () => {
       manifest.addPartialVariant((variant) => {
         variant.addPartialStream(ContentType.VIDEO);
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -2879,7 +2925,8 @@ describe('HlsParser', () => {
         });
         variant.addPartialStream(ContentType.AUDIO);
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -2965,7 +3012,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', 'mp4a');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -3083,6 +3131,7 @@ describe('HlsParser', () => {
         });
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'en';
+          stream.originalLanguage = 'eng';
         });
       });
       manifest.addPartialVariant((variant) => {
@@ -3103,7 +3152,8 @@ describe('HlsParser', () => {
           stream.language = 'de';
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -3237,7 +3287,8 @@ describe('HlsParser', () => {
           });
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -3278,7 +3329,8 @@ describe('HlsParser', () => {
           });
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -3316,7 +3368,8 @@ describe('HlsParser', () => {
           });
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -3351,7 +3404,8 @@ describe('HlsParser', () => {
           stream.addDrmInfo('org.w3.clearkey');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -3385,7 +3439,8 @@ describe('HlsParser', () => {
           stream.addDrmInfo('org.w3.clearkey');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -3421,7 +3476,8 @@ describe('HlsParser', () => {
             });
           });
         });
-        manifest.sequenceMode = true;
+        manifest.sequenceMode = sequenceMode;
+        manifest.type = shaka.media.ManifestParser.HLS;
       });
 
       fakeNetEngine.setResponseText('test:/master', master);
@@ -3453,7 +3509,8 @@ describe('HlsParser', () => {
             });
           });
         });
-        manifest.sequenceMode = true;
+        manifest.sequenceMode = sequenceMode;
+        manifest.type = shaka.media.ManifestParser.HLS;
       });
 
       fakeNetEngine.setResponseText('test:/master', master);
@@ -3482,7 +3539,8 @@ describe('HlsParser', () => {
             });
           });
         });
-        manifest.sequenceMode = true;
+        manifest.sequenceMode = sequenceMode;
+        manifest.type = shaka.media.ManifestParser.HLS;
       });
 
       fakeNetEngine.setResponseText('test:/master', master);
@@ -3509,7 +3567,8 @@ describe('HlsParser', () => {
             stream.addDrmInfo('org.w3.clearkey');
           });
         });
-        manifest.sequenceMode = true;
+        manifest.sequenceMode = sequenceMode;
+        manifest.type = shaka.media.ManifestParser.HLS;
       });
 
       fakeNetEngine.setResponseText('test:/master', master);
@@ -3535,7 +3594,8 @@ describe('HlsParser', () => {
             stream.addDrmInfo('org.w3.clearkey');
           });
         });
-        manifest.sequenceMode = true;
+        manifest.sequenceMode = sequenceMode;
+        manifest.type = shaka.media.ManifestParser.HLS;
       });
 
       fakeNetEngine.setResponseText('test:/master', master);
@@ -3573,7 +3633,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', 'mp4a');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine.setHeaders(
@@ -4017,6 +4078,7 @@ describe('HlsParser', () => {
         });
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'en';
+          stream.originalLanguage = 'en';
         });
       });
       manifest.addPartialVariant((variant) => {
@@ -4026,6 +4088,7 @@ describe('HlsParser', () => {
         });
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'fr';
+          stream.originalLanguage = 'fr';
         });
       });
       manifest.addPartialVariant((variant) => {
@@ -4035,6 +4098,7 @@ describe('HlsParser', () => {
         });
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'en';
+          stream.originalLanguage = 'en';
         });
       });
       manifest.addPartialVariant((variant) => {
@@ -4044,9 +4108,11 @@ describe('HlsParser', () => {
         });
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.language = 'fr';
+          stream.originalLanguage = 'fr';
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     await testHlsParser(master, media, manifest);
@@ -4096,7 +4162,8 @@ describe('HlsParser', () => {
           stream.size(1920, 1080);
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     const actual = await testHlsParser(master, media, manifest, media2);
@@ -4148,7 +4215,8 @@ describe('HlsParser', () => {
           stream.mime('audio/mp4', 'mp4a');
         });
       });
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
     });
 
     fakeNetEngine
@@ -4335,7 +4403,8 @@ describe('HlsParser', () => {
             stream.mime('audio/mp4', 'mp4a');
           });
         });
-        manifest.sequenceMode = true;
+        manifest.sequenceMode = sequenceMode;
+        manifest.type = shaka.media.ManifestParser.HLS;
       });
 
       await testHlsParser(master, media, manifest);
@@ -4373,7 +4442,8 @@ describe('HlsParser', () => {
             stream.mime('audio/mp4', 'mp4a');
           });
         });
-        manifest.sequenceMode = true;
+        manifest.sequenceMode = sequenceMode;
+        manifest.type = shaka.media.ManifestParser.HLS;
       });
 
       await testHlsParser(master, media, manifest);
@@ -4412,7 +4482,8 @@ describe('HlsParser', () => {
             stream.mime('audio/mp4', 'mp4a');
           });
         });
-        manifest.sequenceMode = true;
+        manifest.sequenceMode = sequenceMode;
+        manifest.type = shaka.media.ManifestParser.HLS;
       });
 
       await testHlsParser(master, media, manifest);
@@ -4452,7 +4523,8 @@ describe('HlsParser', () => {
             stream.mime('audio/mp4', 'mp4a');
           });
         });
-        manifest.sequenceMode = true;
+        manifest.sequenceMode = sequenceMode;
+        manifest.type = shaka.media.ManifestParser.HLS;
       });
 
       await testHlsParser(master, media, manifest);
@@ -4495,11 +4567,12 @@ describe('HlsParser', () => {
     ].join('');
 
     const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.addPartialStream(ContentType.VIDEO, (stream) => {
-          stream.mime('video/mp2t', 'avc1.42E01E, mp4a.40.2');
+          stream.mime('video/mp4', 'avc1.42C01E');
         });
       });
     });
@@ -4509,22 +4582,64 @@ describe('HlsParser', () => {
     expect(actualManifest.presentationTimeline.getDuration()).toBe(5);
   });
 
-  it('honors hls.mediaPlaylistFullMimeType', async () => {
+  it('parses #EXT-X-BITRATE', async () => {
     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',
+      '#EXT-X-BITRATE:385\n',
+      'main.mp4\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      'main.mp4\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      'main.mp4\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      '#EXT-X-BITRATE:340\n',
+      'main.mp4\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BITRATE:300\n',
       'main.mp4',
     ].join('');
 
+    const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
+      manifest.anyTimeline();
+      manifest.addPartialVariant((variant) => {
+        variant.bandwidth = 359000;
+        variant.addPartialStream(ContentType.VIDEO, (stream) => {
+          stream.mime('video/mp4', 'avc1.42C01E');
+          stream.bandwidth = 359000;
+        });
+      });
+    });
+
+    await testHlsParser(media, '', manifest);
+  });
+
+  it('honors hls.mediaPlaylistFullMimeType', async () => {
+    const media = [
+      '#EXTM3U\n',
+      '#EXT-X-PLAYLIST-TYPE:VOD\n',
+      '#EXT-X-MAP:URI="init.test",BYTERANGE="616@0"\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      'main.test',
+    ].join('');
+
     const config = shaka.util.PlayerConfiguration.createDefault().manifest;
     config.hls.mediaPlaylistFullMimeType = 'audio/webm; codecs="vorbis"';
     parser.configure(config);
 
     const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
@@ -4550,7 +4665,8 @@ describe('HlsParser', () => {
     parser.configure(config);
 
     const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
@@ -4576,7 +4692,8 @@ describe('HlsParser', () => {
     parser.configure(config);
 
     const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
@@ -4626,7 +4743,8 @@ describe('HlsParser', () => {
     ].join('');
 
     const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-      manifest.sequenceMode = true;
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.language = 'en';
@@ -4783,7 +4901,9 @@ describe('HlsParser', () => {
 
     // Before loading, all MIME types agree, and are defaulted to audio/mp4.
     expect(actualAudio0.mimeType).toBe('audio/mp4');
+    expect(actualAudio0.codecs).toBe('mp4a');
     expect(actualAudio1.mimeType).toBe('audio/mp4');
+    expect(actualAudio1.codecs).toBe('mp4a');
 
     await actualAudio0.createSegmentIndex();
 
@@ -4792,8 +4912,29 @@ describe('HlsParser', () => {
     // This is how we avoid having the unloaded tracks filtered out during
     // startup.
     expect(actualAudio0.mimeType).toBe('audio/aac');
-    expect(actualAudio0.codecs).toBe('');
+    expect(actualAudio0.codecs).toBe('mp4a');
     expect(actualAudio1.mimeType).toBe('audio/aac');
-    expect(actualAudio1.codecs).toBe('');
+    expect(actualAudio1.codecs).toBe('mp4a');
+  });
+
+  it('parses media playlists directly', async () => {
+    const mediaPlaylist = [
+      '#EXTM3U\n',
+      '#EXT-X-TARGETDURATION:5\n',
+      '#EXTINF:5,\n',
+      'video1.ts\n',
+    ].join('');
+
+    fakeNetEngine
+        .setResponseText('test:/master', mediaPlaylist)
+        .setResponseValue('test:/video1.ts', tsSegmentData);
+
+    const actualManifest = await parser.start('test:/master', playerInterface);
+    expect(actualManifest.variants.length).toBe(1);
+
+    const video = actualManifest.variants[0].video;
+
+    expect(video.width).toBe(256);
+    expect(video.height).toBe(110);
   });
 });