shaka-player 4.4.3 → 4.6.0

package/test/hls/manifest_text_parser_unit.js

@@ -36,10 +36,7 @@ describe('ManifestTextParser', () => {
 
           // playlist text:
           '#EXTM3U\n' +
-          '#EXT-X-TARGETDURATION:6\n',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-TARGETDURATION:6\n');
     });
 
     it('parses a Master Playlist', () => {
@@ -60,10 +57,7 @@ describe('ManifestTextParser', () => {
           '#EXTM3U\n' +
           '#EXT-X-TARGETDURATION:6\n' +
           '#EXT-X-STREAM-INF:BANDWIDTH=2165224\n' +
-          'prog_index.m3u8',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          'prog_index.m3u8');
     });
 
     it('ignores comments', () => {
@@ -78,10 +72,7 @@ describe('ManifestTextParser', () => {
           // playlist text:
           '#EXTM3U\n' +
           '#Comment\n' +
-          '#EXT-X-TARGETDURATION:6',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-TARGETDURATION:6');
     });
 
     /**
@@ -94,7 +85,7 @@ describe('ManifestTextParser', () => {
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MANIFEST,
           code));
-      expect(() => parser.parsePlaylist(data, /* uri= */ '')).toThrow(error);
+      expect(() => parser.parsePlaylist(data)).toThrow(error);
     }
   });
 
@@ -110,10 +101,7 @@ describe('ManifestTextParser', () => {
 
           // playlist text:
           '#EXTM3U\n' +
-          '#EXT-X-INDEPENDENT-SEGMENTS',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-INDEPENDENT-SEGMENTS');
 
       verifyPlaylist(
           {
@@ -125,10 +113,7 @@ describe('ManifestTextParser', () => {
 
           // playlist text:
           '#EXTM3U\n' +
-          '#EXT-X-PLAYLIST-TYPE:VOD',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-PLAYLIST-TYPE:VOD');
 
       verifyPlaylist(
           {
@@ -140,10 +125,7 @@ describe('ManifestTextParser', () => {
 
           // playlist text:
           '#EXTM3U\n' +
-          '#EXT-X-MEDIA-SEQUENCE:1',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-MEDIA-SEQUENCE:1');
     });
 
     it('parses tags with attributes', () => {
@@ -158,10 +140,7 @@ describe('ManifestTextParser', () => {
 
           // playlist text:
           '#EXTM3U\n' +
-          '#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS');
 
       verifyPlaylist(
           {
@@ -177,10 +156,7 @@ describe('ManifestTextParser', () => {
 
           // playlist text:
           '#EXTM3U\n' +
-          '#EXT-X-MEDIA:URI="main.mp4",BYTERANGE="720@0"',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-MEDIA:URI="main.mp4",BYTERANGE="720@0"');
     });
 
     it('parses tags with commas in attribute values', () => {
@@ -197,10 +173,7 @@ describe('ManifestTextParser', () => {
 
           // playlist text:
           '#EXTM3U\n' +
-          '#EXT-X-MEDIA:CODECS="avc1.64002a,mp4a.40.2"',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-MEDIA:CODECS="avc1.64002a,mp4a.40.2"');
 
       verifyPlaylist(
           {
@@ -216,10 +189,7 @@ describe('ManifestTextParser', () => {
 
           // playlist text:
           '#EXTM3U\n' +
-          '#EXT-X-MEDIA:CODECS="avc1.64002a,mp4a.40.2,avc2.64000"',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-MEDIA:CODECS="avc1.64002a,mp4a.40.2,avc2.64000"');
 
       verifyPlaylist(
           {
@@ -236,10 +206,7 @@ describe('ManifestTextParser', () => {
 
           // playlist text:
           '#EXTM3U\n' +
-          '#EXT-X-MEDIA:CODECS="avc1.64002a,mp4a.40.2",AUDIO="a1,a2"',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-MEDIA:CODECS="avc1.64002a,mp4a.40.2",AUDIO="a1,a2"');
 
       verifyPlaylist(
           {
@@ -255,10 +222,7 @@ describe('ManifestTextParser', () => {
 
           // playlist text:
           '#EXTM3U\n' +
-          '#EXT-X-MEDIA:CODECS="av01.0.08M.08,mp4a.40.2"',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          '#EXT-X-MEDIA:CODECS="av01.0.08M.08,mp4a.40.2"');
     });
 
     it('rejects invalid tags', () => {
@@ -268,7 +232,7 @@ describe('ManifestTextParser', () => {
           shaka.util.Error.Code.INVALID_HLS_TAG,
           'invalid tag'));
       const text = shaka.util.StringUtils.toUTF8('#EXTM3U\ninvalid tag');
-      expect(() => parser.parsePlaylist(text, /* uri= */ '')).toThrow(error);
+      expect(() => parser.parsePlaylist(text)).toThrow(error);
     });
   });
 
@@ -307,7 +271,7 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 0, 'EXT-X-MEDIA-SEQUENCE', [], '1'),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/manifest.m3u8', 'https://test/test.mp4',
+              new shaka.hls.Segment('https://test/test.mp4',
                   [
                     new shaka.hls.Tag(/* id= */ 2, 'EXTINF', [], '5.99467'),
                   ]),
@@ -318,10 +282,7 @@ describe('ManifestTextParser', () => {
           '#EXTM3U\n' +
           '#EXT-X-MEDIA-SEQUENCE:1\n' +
           '#EXTINF:5.99467\n' +
-          'https://test/test.mp4\n',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          'https://test/test.mp4\n');
     });
 
     it('handles tags with both value and attributes', () => {
@@ -332,7 +293,7 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 0, 'EXT-X-MEDIA-SEQUENCE', [], '1'),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/manifest.m3u8', 'https://test/test.mp4', [
+              new shaka.hls.Segment('https://test/test.mp4', [
                 new shaka.hls.Tag(
                     /* id= */ 2,
                     'EXTINF',
@@ -346,10 +307,7 @@ describe('ManifestTextParser', () => {
           '#EXTM3U\n' +
           '#EXT-X-MEDIA-SEQUENCE:1\n' +
           '#EXTINF:5.99467,pid=180\n' +
-          'https://test/test.mp4\n',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          'https://test/test.mp4\n');
     });
 
     it('handles manifests with a segment tag before a playlist tag', () => {
@@ -360,7 +318,7 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 2, 'EXT-X-TARGETDURATION', [], '6'),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/manifest.m3u8', 'https://test/test.mp4',
+              new shaka.hls.Segment('https://test/test.mp4',
                   [
                     new shaka.hls.Tag(/* id= */ 1, 'EXT-X-KEY',
                         [
@@ -378,22 +336,18 @@ describe('ManifestTextParser', () => {
           '#EXT-X-KEY:METHOD="AES-128",URI="http://key.com",IV="123"\n' +
           '#EXT-X-TARGETDURATION:6\n' +
           '#EXTINF:5.99467\n' +
-          'https://test/test.mp4\n',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          'https://test/test.mp4\n');
     });
 
     it('tracks playlist URI', () => {
       verifyPlaylist(
           {
-            absoluteUri: 'https://test/manifest.m3u8',
             type: shaka.hls.PlaylistType.MEDIA,
             tags: [
               new shaka.hls.Tag(/* id= */ 0, 'EXT-X-MEDIA-SEQUENCE', [], '1'),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/manifest.m3u8', 'test.mp4',
+              new shaka.hls.Segment('test.mp4',
                   [
                     new shaka.hls.Tag(/* id= */ 2, 'EXTINF', [], '5.99467'),
                   ]),
@@ -404,10 +358,7 @@ describe('ManifestTextParser', () => {
           '#EXTM3U\n' +
           '#EXT-X-MEDIA-SEQUENCE:1\n' +
           '#EXTINF:5.99467\n' +
-          'test.mp4\n',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          'test.mp4\n');
     });
   });
 
@@ -427,17 +378,14 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 0, 'EXT-X-TARGETDURATION', [], '6'),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/manifest.m3u8', 'uri',
+              new shaka.hls.Segment('uri',
                   [new shaka.hls.Tag(2, 'EXTINF', [], '5')]),
-              new shaka.hls.Segment('https://test/manifest.m3u8', 'uri2',
+              new shaka.hls.Segment('uri2',
                   [new shaka.hls.Tag(3, 'EXTINF', [], '4')]),
             ],
           },
 
-          manifestText,
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          manifestText);
     });
 
     it('identifies playlist tags', () => {
@@ -449,19 +397,16 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 4, 'EXT-X-ENDLIST', []),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/manifest.m3u8', 'uri',
+              new shaka.hls.Segment('uri',
                   [new shaka.hls.Tag(2, 'EXTINF', [], '5')]),
-              new shaka.hls.Segment('https://test/manifest.m3u8', 'uri2',
+              new shaka.hls.Segment('uri2',
                   [new shaka.hls.Tag(3, 'EXTINF', [], '4')]),
             ],
           },
 
           // Append a playlist tag to the manifest text so it appears after
           // segment-related tags.
-          manifestText + '#EXT-X-ENDLIST',
-
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          manifestText + '#EXT-X-ENDLIST');
     });
 
     it('parses segments with partial segments', () => {
@@ -508,14 +453,12 @@ describe('ManifestTextParser', () => {
             ],
             segments: [
               new shaka.hls.Segment(
-                  /* absoluteMediaPlaylistUri= */ 'https://test/manifest.m3u8',
                   /* verbatimSegmentUri= */ 'uri',
                   /* tags= */ [
                     new shaka.hls.Tag(3, 'EXTINF', [], '5'),
                     mapTag,
                   ]),
               new shaka.hls.Segment(
-                  /* absoluteMediaPlaylistUri= */ 'https://test/manifest.m3u8',
                   /* verbatimSegmentUri= */ 'uri2',
                   /* tags= */ [
                     new shaka.hls.Tag(6, 'EXTINF', [], '2'),
@@ -523,15 +466,12 @@ describe('ManifestTextParser', () => {
                   ],
                   /* partialSegments= */ partialSegments1),
               new shaka.hls.Segment(
-                  /* absoluteMediaPlaylistUri= */ '',
                   /* verbatimSegmentUri= */ '',
                   /* tags= */ [mapTag],
                   /* partialSegments= */ partialSegments2),
             ],
           },
-          manifestTextWithPartialSegments,
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          manifestTextWithPartialSegments);
     });
 
     it('parses segments with preload hint segments', () => {
@@ -577,22 +517,18 @@ describe('ManifestTextParser', () => {
             ],
             segments: [
               new shaka.hls.Segment(
-                  /* absoluteMediaPlaylistUri= */ 'https://test/manifest.m3u8',
                   /* verbatimSegmentUri= */ 'uri',
                   /* tags= */ [
                     new shaka.hls.Tag(3, 'EXTINF', [], '5'),
                     mapTag,
                   ]),
               new shaka.hls.Segment(
-                  /* absoluteMediaPlaylistUri= */ '',
                   /* verbatimSegmentUri= */ '',
                   /* tags= */ [preloadMapTag],
                   /* partialSegments= */ preloadSegment),
             ],
           },
-          manifestTextWithPreloadSegments,
-          // manifest URI:
-          'https://test/manifest.m3u8');
+          manifestTextWithPreloadSegments);
     });
   });
 
@@ -600,13 +536,10 @@ describe('ManifestTextParser', () => {
   /**
    * @param {!Object} expectedPlaylist
    * @param {string} playlistText
-   * @param {string} absoluteManifestUri
    */
-  function verifyPlaylist(expectedPlaylist, playlistText, absoluteManifestUri) {
+  function verifyPlaylist(expectedPlaylist, playlistText) {
     const playlistBuffer = shaka.util.StringUtils.toUTF8(playlistText);
-    const actualPlaylist =
-        parser.parsePlaylist(playlistBuffer, absoluteManifestUri);
-
+    const actualPlaylist = parser.parsePlaylist(playlistBuffer);
     expect(actualPlaylist).toEqual(jasmine.objectContaining(expectedPlaylist));
   }
 });