Skip to content

brainfood / videojs-contrib-hls

Go to a project
Toggle navigation
Toggle navigation pinning
a2ff61a5 by David LaPalomento
Options

Trim attribute list key-value pairs 

It's not valid according to the spec, but bipbop has whitespace after the commas in its key-value pair lists. Strip leading and trailing whitespace before splitting the key and value when parsing now. Update one of the manifests to use the bad format. Add differentiated media playlists.
1 parent 50efd48c
Inline Side-by-side
Showing 5 changed files with 35 additions and 7 deletions
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
16 attr; 16 attr;
17 while (i--) { 17 while (i--) {
18 attr = attrs[i].split('='); 18 attr = attrs[i].split('=');
19 attr[0] = attr[0].replace(/^\s+|\s+$/g, '');
20 attr[1] = attr[1].replace(/^\s+|\s+$/g, '');
19 result[attr[0]] = attr[1]; 21 result[attr[0]] = attr[1];
20 } 22 }
21 return result; 23 return result;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 "PROGRAM-ID": 1, 16 "PROGRAM-ID": 1,
17 "BANDWIDTH": 40000 17 "BANDWIDTH": 40000
18 }, 18 },
19 "uri": "media.m3u8" 19 "uri": "media1.m3u8"
20 }, { 20 }, {
21 "attributes": { 21 "attributes": {
22 "PROGRAM-ID": 1, 22 "PROGRAM-ID": 1,
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 "height": 224 26 "height": 224
27 } 27 }
28 }, 28 },
29 "uri": "media.m3u8" 29 "uri": "media2.m3u8"
30 }, { 30 }, {
31 "attributes": { 31 "attributes": {
32 "PROGRAM-ID": 1, 32 "PROGRAM-ID": 1,
...@@ -36,6 +36,6 @@ ...@@ -36,6 +36,6 @@
36 "height": 540 36 "height": 540
37 } 37 }
38 }, 38 },
39 "uri": "media.m3u8" 39 "uri": "media3.m3u8"
40 }] 40 }]
41 } 41 }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
2 #EXTM3U 2 #EXTM3U
3 #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=240000,RESOLUTION=396x224 3 #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=240000,RESOLUTION=396x224
4 media.m3u8 4 media.m3u8
5 #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=40000 5 #EXT-X-STREAM-INF:PROGRAM-ID=1, BANDWIDTH=40000
6 media.m3u8 6 media1.m3u8
7 #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=440000,RESOLUTION=396x224 7 #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=440000,RESOLUTION=396x224
8 media.m3u8 8 media2.m3u8
9 #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=1928000,RESOLUTION=960x540 9 #EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=1928000,RESOLUTION=960x540
10 media.m3u8 10 media3.m3u8
......
1 #EXTM3U
2 #EXT-X-PLAYLIST-TYPE:VOD
3 #EXT-X-TARGETDURATION:10
4 #EXTINF:10,
5 00001.ts
6 #EXTINF:10,
7 00002.ts
8 #EXTINF:10,
9 00003.ts
10 #EXTINF:10,
11 00004.ts
12 #ZEN-TOTAL-DURATION:57.9911
13 #EXT-X-ENDLIST
1 #EXTM3U
2 #EXT-X-PLAYLIST-TYPE:VOD
3 #EXT-X-TARGETDURATION:10
4 #EXTINF:10,
5 00001.ts
6 #EXTINF:10,
7 00002.ts
8 #EXTINF:10,
9 00003.ts
10 #EXTINF:10,
11 00004.ts
12 #ZEN-TOTAL-DURATION:57.9911
13 #EXT-X-ENDLIST