playlist-loader: parses playlists with #EXT-X-PROGRAM-DATE-TIME after…

… #EXTINF before fragment URL related to https://github.com/dailymotion/hls.js/issues/460
shacharz · Jun 9, 2016 · 82c18aa · 82c18aa
1 parent fe0e38a
commit 82c18aa
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/loader/playlist-loader.js b/src/loader/playlist-loader.js
@@ -260,6 +260,10 @@ class PlaylistLoader extends EventHandler {
         case 'PROGRAM-DATE-TIME':
           programDateTime = new Date(Date.parse(result[1]));
           tagList.push(result);
+          if (frag && !frag.url && result.length >= 3) {
+            frag.url = this.resolve(result[2], baseurl);
+            frag.programDateTime = programDateTime;
+          }
           break;
         default:
           tagList.push(result);

diff --git a/tests/unit/loader/playlist-loader.js b/tests/unit/loader/playlist-loader.js
@@ -440,4 +440,29 @@ http://dummy.url.com/hls/live/segment/segment_022916_164500865_719935.ts`;
     assert.strictEqual(result.fragments[8].url, 'http://dummy.url.com/hls/live/segment/segment_022916_164500865_719934.ts');
   });
 
+  it('parses playlists with #EXT-X-PROGRAM-DATE-TIME after #EXTINF before fragment URL', () => {
+    var level = `#EXTM3U
+#EXT-X-VERSION:2
+#EXT-X-TARGETDURATION:10
+#EXT-X-MEDIA-SEQUENCE:69844067
+#EXTINF:10, no desc
+#EXT-X-PROGRAM-DATE-TIME:2016-05-27T16:34:44Z
+Rollover38803/20160525T064049-01-69844067.ts
+#EXTINF:10, no desc
+#EXT-X-PROGRAM-DATE-TIME:2016-05-27T16:34:54Z
+Rollover38803/20160525T064049-01-69844068.ts
+#EXTINF:10, no desc
+#EXT-X-PROGRAM-DATE-TIME:2016-05-27T16:35:04Z
+Rollover38803/20160525T064049-01-69844069.ts
+    `;
+    var result = new PlaylistLoader({on : function() { }}).parseLevelPlaylist(level, 'http://video.example.com/disc.m3u8',0);
+    assert.strictEqual(result.fragments.length, 3);
+    assert.strictEqual(result.totalduration, 30);
+    assert.strictEqual(result.fragments[0].url, 'http://video.example.com/Rollover38803/20160525T064049-01-69844067.ts');
+    assert.strictEqual(result.fragments[0].programDateTime.getTime(), 1464366884000);
+    assert.strictEqual(result.fragments[1].url, 'http://video.example.com/Rollover38803/20160525T064049-01-69844068.ts');
+    assert.strictEqual(result.fragments[1].programDateTime.getTime(), 1464366894000);
+    assert.strictEqual(result.fragments[2].url, 'http://video.example.com/Rollover38803/20160525T064049-01-69844069.ts');
+    assert.strictEqual(result.fragments[2].programDateTime.getTime(), 1464366904000);
+  });
 });