014577a9 by Gary Katsevman

Make ts segments be playlist specific

1 parent 1624f3ab
...@@ -5,21 +5,21 @@ ...@@ -5,21 +5,21 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "uri": "00001.ts" 8 "uri": "media-00001.ts"
9 }, 9 },
10 { 10 {
11 "duration": 10, 11 "duration": 10,
12 "uri": "00002.ts" 12 "uri": "media-00002.ts"
13 }, 13 },
14 { 14 {
15 "duration": 10, 15 "duration": 10,
16 "uri": "00003.ts" 16 "uri": "media-00003.ts"
17 }, 17 },
18 { 18 {
19 "duration": 10, 19 "duration": 10,
20 "uri": "00004.ts" 20 "uri": "media-00004.ts"
21 } 21 }
22 ], 22 ],
23 "targetDuration": 10, 23 "targetDuration": 10,
24 "endList": true 24 "endList": true
25 }
...\ No newline at end of file ...\ No newline at end of file
25 }
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
2 #EXT-X-PLAYLIST-TYPE:VOD 2 #EXT-X-PLAYLIST-TYPE:VOD
3 #EXT-X-TARGETDURATION:10 3 #EXT-X-TARGETDURATION:10
4 #EXTINF:10, 4 #EXTINF:10,
5 00001.ts 5 media-00001.ts
6 #EXTINF:10, 6 #EXTINF:10,
7 00002.ts 7 media-00002.ts
8 #EXTINF:10, 8 #EXTINF:10,
9 00003.ts 9 media-00003.ts
10 #EXTINF:10, 10 #EXTINF:10,
11 00004.ts 11 media-00004.ts
12 #ZEN-TOTAL-DURATION:57.9911 12 #ZEN-TOTAL-DURATION:57.9911
13 #EXT-X-ENDLIST 13 #EXT-X-ENDLIST
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
2 #EXT-X-PLAYLIST-TYPE:VOD 2 #EXT-X-PLAYLIST-TYPE:VOD
3 #EXT-X-TARGETDURATION:10 3 #EXT-X-TARGETDURATION:10
4 #EXTINF:10, 4 #EXTINF:10,
5 00001.ts 5 media1-00001.ts
6 #EXTINF:10, 6 #EXTINF:10,
7 00002.ts 7 media1-00002.ts
8 #EXTINF:10, 8 #EXTINF:10,
9 00003.ts 9 media1-00003.ts
10 #EXTINF:10, 10 #EXTINF:10,
11 00004.ts 11 media1-00004.ts
12 #ZEN-TOTAL-DURATION:57.9911 12 #ZEN-TOTAL-DURATION:57.9911
13 #EXT-X-ENDLIST 13 #EXT-X-ENDLIST
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
2 #EXT-X-PLAYLIST-TYPE:VOD 2 #EXT-X-PLAYLIST-TYPE:VOD
3 #EXT-X-TARGETDURATION:10 3 #EXT-X-TARGETDURATION:10
4 #EXTINF:10, 4 #EXTINF:10,
5 00001.ts 5 media3-00001.ts
6 #EXTINF:10, 6 #EXTINF:10,
7 00002.ts 7 media3-00002.ts
8 #EXTINF:10, 8 #EXTINF:10,
9 00003.ts 9 media3-00003.ts
10 #EXTINF:10, 10 #EXTINF:10,
11 00004.ts 11 media3-00004.ts
12 #ZEN-TOTAL-DURATION:57.9911 12 #ZEN-TOTAL-DURATION:57.9911
13 #EXT-X-ENDLIST 13 #EXT-X-ENDLIST
......
...@@ -260,7 +260,7 @@ test('starts downloading a segment on loadedmetadata', function() { ...@@ -260,7 +260,7 @@ test('starts downloading a segment on loadedmetadata', function() {
260 strictEqual(requests[1].url, 260 strictEqual(requests[1].url,
261 window.location.origin + 261 window.location.origin +
262 window.location.pathname.split('/').slice(0, -1).join('/') + 262 window.location.pathname.split('/').slice(0, -1).join('/') +
263 '/manifest/00001.ts', 263 '/manifest/media-00001.ts',
264 'the first segment is requested'); 264 'the first segment is requested');
265 }); 265 });
266 266
...@@ -364,7 +364,7 @@ test('downloads media playlists after loading the master', function() { ...@@ -364,7 +364,7 @@ test('downloads media playlists after loading the master', function() {
364 strictEqual(requests[2].url, 364 strictEqual(requests[2].url,
365 window.location.origin + 365 window.location.origin +
366 window.location.pathname.split('/').slice(0, -1).join('/') + 366 window.location.pathname.split('/').slice(0, -1).join('/') +
367 '/manifest/00001.ts', 367 '/manifest/media-00001.ts',
368 'first segment requested'); 368 'first segment requested');
369 }); 369 });
370 370
...@@ -399,7 +399,7 @@ test('downloads a second media playlist before playback, if bandwidth is high', ...@@ -399,7 +399,7 @@ test('downloads a second media playlist before playback, if bandwidth is high',
399 strictEqual(requests[3].url, 399 strictEqual(requests[3].url,
400 window.location.origin + 400 window.location.origin +
401 window.location.pathname.split('/').slice(0, -1).join('/') + 401 window.location.pathname.split('/').slice(0, -1).join('/') +
402 '/manifest/00001.ts', 402 '/manifest/media1-00001.ts',
403 'first segment requested'); 403 'first segment requested');
404 }); 404 });
405 405
...@@ -710,7 +710,7 @@ test('downloads the next segment if the buffer is getting low', function() { ...@@ -710,7 +710,7 @@ test('downloads the next segment if the buffer is getting low', function() {
710 strictEqual(requests[2].url, 710 strictEqual(requests[2].url,
711 window.location.origin + 711 window.location.origin +
712 window.location.pathname.split('/').slice(0, -1).join('/') + 712 window.location.pathname.split('/').slice(0, -1).join('/') +
713 '/manifest/00002.ts', 713 '/manifest/media-00002.ts',
714 'made segment request'); 714 'made segment request');
715 }); 715 });
716 716
......