support EXT-X-DISCONTINUITY-SEQUENCE

related to https://github.com/dailymotion/hls.js/issues/809
ivatsa · Nov 14, 2016 · d1a1cd6 · d1a1cd6
1 parent 2da2afa
commit d1a1cd6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -144,6 +144,7 @@ All HLS resources must be delivered with [CORS headers](https://developer.mozill
   - `#EXT-X-MEDIA-SEQUENCE`
   - `#EXT-X-TARGETDURATION`
   - `#EXT-X-DISCONTINUITY`
+  - `#EXT-X-DISCONTINUITY-SEQUENCE`  
   - `#EXT-X-BYTERANGE`
   - `#EXT-X-KEY` (https://tools.ietf.org/html/draft-pantos-http-live-streaming-08#section-3.4.4)
   - `#EXT-X-PROGRAM-DATE-TIME` (https://tools.ietf.org/html/draft-pantos-http-live-streaming-18#section-4.3.2.6)

diff --git a/src/loader/playlist-loader.js b/src/loader/playlist-loader.js
@@ -213,7 +213,7 @@ class PlaylistLoader extends EventHandler {
         byteRangeStartOffset = null,
         tagList = [];
 
-    regexp = /(?:(?:#(EXTM3U))|(?:#EXT-X-(PLAYLIST-TYPE):(.+))|(?:#EXT-X-(MEDIA-SEQUENCE): *(\d+))|(?:#EXT-X-(TARGETDURATION): *(\d+))|(?:#EXT-X-(KEY):(.+))|(?:#EXT-X-(START):(.+))|(?:#EXT(INF): *(\d+(?:\.\d+)?)(?:,(.*))?)|(?:(?!#)()(\S.+))|(?:#EXT-X-(BYTERANGE): *(\d+(?:@\d+(?:\.\d+)?)?)|(?:#EXT-X-(ENDLIST))|(?:#EXT-X-(DIS)CONTINUITY))|(?:#EXT-X-(PROGRAM-DATE-TIME):(.+))|(?:#EXT-X-(VERSION):(\d+))|(?:(#)(.*):(.*))|(?:(#)(.*)))(?:.*)\r?\n?/g;
+    regexp = /(?:(?:#(EXTM3U))|(?:#EXT-X-(PLAYLIST-TYPE):(.+))|(?:#EXT-X-(MEDIA-SEQUENCE): *(\d+))|(?:#EXT-X-(TARGETDURATION): *(\d+))|(?:#EXT-X-(KEY):(.+))|(?:#EXT-X-(START):(.+))|(?:#EXT(INF): *(\d+(?:\.\d+)?)(?:,(.*))?)|(?:(?!#)()(\S.+))|(?:#EXT-X-(BYTERANGE): *(\d+(?:@\d+(?:\.\d+)?)?)|(?:#EXT-X-(ENDLIST))|(?:#EXT-X-(DISCONTINUITY-SEQ)UENCE:(\d+))|(?:#EXT-X-(DIS)CONTINUITY))|(?:#EXT-X-(PROGRAM-DATE-TIME):(.+))|(?:#EXT-X-(VERSION):(\d+))|(?:(#)(.*):(.*))|(?:(#)(.*)))(?:.*)\r?\n?/g;
     while ((result = regexp.exec(string)) !== null) {
       result.shift();
       result = result.filter(function(n) { return (n !== undefined); });
@@ -239,6 +239,9 @@ class PlaylistLoader extends EventHandler {
           cc++;
           tagList.push(result);
           break;
+        case 'DISCONTINUITY-SEQ':
+          cc = parseInt(result[1]);
+          break;
         case 'BYTERANGE':
           var params = result[1].split('@');
           if (params.length === 1) {

diff --git a/tests/unit/loader/playlist-loader.js b/tests/unit/loader/playlist-loader.js
@@ -403,6 +403,34 @@ lo007ts`;
     assert.strictEqual(result.fragments[3].cc, 1); //continuity counter should increase around discontinuity
   });
 
+  it('parses correctly EXT-X-DISCONTINUITY-SEQUENCE and increases continuity counter', () => {
+    var level = `#EXTM3U
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:10
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-DISCONTINUITY-SEQUENCE:20
+#EXTINF:10,
+0001.ts
+#EXTINF:10,
+0002.ts
+#EXTINF:5,
+0003.ts
+#EXT-X-DISCONTINUITY
+#EXTINF:10,
+0005.ts
+#EXTINF:10,
+0006.ts
+#EXT-X-ENDLIST
+    `;
+    var result = new PlaylistLoader({on : function() { }}).parseLevelPlaylist(level, 'http://video.example.com/disc.m3u8',0);
+    assert.strictEqual(result.fragments.length, 5);
+    assert.strictEqual(result.totalduration, 45);
+    assert.strictEqual(result.fragments[0].cc, 20);
+    assert.strictEqual(result.fragments[2].cc, 20);
+    assert.strictEqual(result.fragments[3].cc, 21); //continuity counter should increase around discontinuity
+  });
+
   it('parses manifest with one audio track', () => {
     var manifest = `#EXTM3U
 #EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="600k",LANGUAGE="eng",NAME="Audio",AUTOSELECT=YES,DEFAULT=YES,URI="/videos/ZakEbrahim_2014/audio/600k.m3u8?qr=true&preroll=Blank",BANDWIDTH=614400`;