Merge branch 'release/1.15.0'

Author: bbert

RELEASES NOTES.txt

@@ -1,3 +1,8 @@
+### Release Notes v1.15.0 (2018/07/20)
+* [MSS] Add support for live streams with infinite DVR window size [#233]
+* Bugs fixing:
+* - [MSS] Fix static manifest parsing if attribute 'd' is not defined for 1st segment [#235]
+
 ### Release Notes v1.14.2 (2018/04/09)
 * Bugs fixing:
 * - Fix reset process for protected streams (patch for MediaKeySession.close()) [#225]

app/js/mss/MssFragmentController.js

@@ -328,6 +328,7 @@ Mss.dependencies.MssParser = function() {
                        } else {
                            prevSegment.d = segment.t - prevSegment.t;
                        }
+                       duration += prevSegment.d;
                     }
                     // Set segment absolute timestamp if not set in manifest
                     if (!segment.t) {
@@ -340,7 +341,9 @@ Mss.dependencies.MssParser = function() {
                     }
                 }
 
-                duration += segment.d;
+                if (segment.d) {
+                    duration += segment.d;
+                }
 
                 // Create new segment
                 segments.push(segment);
@@ -567,7 +570,12 @@ Mss.dependencies.MssParser = function() {
             mpd.timescale = timescale ? parseFloat(timescale) : DEFAULT_TIME_SCALE;
             var isLive = this.domParser.getAttributeValue(smoothNode, 'IsLive');
             mpd.type = (isLive !== null && isLive.toLowerCase() === 'true') ? 'dynamic' : 'static';
-            mpd.timeShiftBufferDepth = parseFloat(this.domParser.getAttributeValue(smoothNode, 'DVRWindowLength')) / mpd.timescale;
+            var canSeek = this.domParser.getAttributeValue(smoothNode, 'CanSeek');
+            var dvrWindowLength = parseFloat(this.domParser.getAttributeValue(smoothNode, 'DVRWindowLength'));
+            if (dvrWindowLength === 0 && canSeek !== null && canSeek.toLowerCase() === 'true') {
+                dvrWindowLength = Infinity;
+            }
+            mpd.timeShiftBufferDepth = dvrWindowLength / mpd.timescale;
             var duration = parseFloat(this.domParser.getAttributeValue(smoothNode, 'Duration'));
 
             // If live manifest with Duration, we consider it as a start-over manifest
@@ -585,7 +593,7 @@ Mss.dependencies.MssParser = function() {
             mpd.minBufferTime = MediaPlayer.dependencies.BufferExtensions.DEFAULT_MIN_BUFFER_TIME;
 
             // In case of live streams, set availabilityStartTime property according to DVRWindowLength
-            if (mpd.type === "dynamic") {
+            if (mpd.type === "dynamic" && mpd.timeShiftBufferDepth < Infinity ) {
                 mpd.availabilityStartTime = new Date(manifestLoadedTime.getTime() - (mpd.timeShiftBufferDepth * 1000));
             }
 
@@ -647,8 +655,13 @@ Mss.dependencies.MssParser = function() {
                 }
 
                 if (mpd.type === "dynamic") {
+                    // set availabilityStartTime for infinite DVR Window from segment timeline duration
+                    if (mpd.timeShiftBufferDepth === Infinity) {
+                        mpd.availabilityStartTime = new Date(manifestLoadedTime.getTime() - (adaptations[1].SegmentTemplate.SegmentTimeline.duration * 1000));
+                    }
                     // Match timeShiftBufferDepth to video segment timeline duration
                     if (mpd.timeShiftBufferDepth > 0 &&
+                        mpd.timeShiftBufferDepth !== Infinity &&
                         adaptations[i].contentType === 'video' &&
                         mpd.timeShiftBufferDepth > adaptations[i].SegmentTemplate.SegmentTimeline.duration) {
                         mpd.timeShiftBufferDepth = adaptations[i].SegmentTemplate.SegmentTimeline.duration;
@@ -765,4 +778,4 @@ Mss.dependencies.MssParser = function() {
 
 Mss.dependencies.MssParser.prototype = {
     constructor: Mss.dependencies.MssParser
-};
+};

app/js/mss/MssParser.js

@@ -1,6 +1,6 @@
 {
   "name": "hasplayer.js",
-  "version": "1.14.2",
+  "version": "1.15.0",
   "scripts": {
     "dev": "cd build && gulp watch",
     "build": "cd build && gulp",