Merge branch 'release/1.14.2'

Author: bbert

.travis.yml

@@ -5,7 +5,7 @@ addons:
   browserstack:
     username: "bertrandberthelo1"
     access_key:
-      secure: "kB8iXiydT+xheyHox2zwq/1k75uUmF+F2b9k76Nhbb001Mh5608kzhH9xXFM+BUyM1pm3LImF+vYcSfKMYlDn/KBB7s9p8TJfwC/obbmtWJucSjtRiVo9aOOa7Ox2M+ACb0rsLpvzFRiHtYo0HZNFVkIfvqZN389Imm6UCOXsyo="
+      secure: "FSJvfvEX6C4OAM6ZF/bQdS718N/IOCeErBljObyWlJ6NoLakIsIp9ssYiNcVQHtUdTuuHOuIdLxjPqMoxQkZtoHS2oZ1wg7veaN/wl+5HuxeaOvHxahNlxT7Z0FzQgxiHDFTHsXP2a+vDtEGjCIdvvcurR/2cK2gkfSFJ5NeeXY="
 branches:
   only:
     - master

README.md

@@ -183,7 +183,7 @@ function onPlayBitrateChanged(e) {
 
 ## Documentation
 
-Full [API Documentation](http://orange-opensource.github.io/hasplayer.js/development/doc/index.html) is available describing MediaPlayer public methods and events.
+Full [API Documentation](http://orange-opensource.github.io/hasplayer.js/development/doc/jsdoc/index.html) is available describing MediaPlayer public methods and events.
 
 This API documentation can be generated using following gulp command:
 ```

RELEASES NOTES.txt

@@ -1,3 +1,11 @@
+### Release Notes v1.14.2 (2018/04/09)
+* Bugs fixing:
+* - Fix reset process for protected streams (patch for MediaKeySession.close()) [#225]
+* - Fix bug when configuring robustness rules for key system access [#224]
+* - [MSS] Correct support for specific timescales (at <SmoothStreamingMedia> and <StreamIndex> levels) [#229, #230]
+* - [MSS] Correct 'subs' box writing [#231]
+* - [HLS] Correct start time support in case of HLS native playback on Safari [#223]
+
 ### Release Notes v1.14.1 (2018/02/15)
 * Bugs fixing:
 * - [HLS] Correct key error ('webkitkeyerror') handler (native HLS+FP on Safari/OSx use case)

app/js/hls/HlsStream.js

@@ -488,6 +488,9 @@ Hls.dependencies.HlsStream = function() {
         },
 
         load: function(url) {
+            if (initialStartTime >= 0) {
+                url += '#t=' + initialStartTime;
+            }
             this.videoModel.setSource(url);
         },
 

app/js/mss/MssParser.js

@@ -22,7 +22,7 @@ if (!Number.MAX_SAFE_INTEGER) {
 Mss.dependencies.MssParser = function() {
     "use strict";
 
-    var TIME_SCALE_100_NANOSECOND_UNIT = 10000000.0,
+    var DEFAULT_TIME_SCALE = 10000000.0,
         SUPPORTED_CODECS = ["AAC", "AACL", "AVC1", "H264", "TTML", "DFXP"],
         samplingFrequencyIndex = {
             96000: 0x0,
@@ -47,7 +47,7 @@ Mss.dependencies.MssParser = function() {
         xmlDoc = null,
         baseURL = null,
 
-        mapPeriod = function() {
+        mapPeriod = function(timescale) {
             var period = {},
                 adaptations = [],
                 adaptation,
@@ -59,7 +59,7 @@ Mss.dependencies.MssParser = function() {
             // For each StreamIndex node, create an AdaptationSet element
             for (i = 0; i < smoothNode.childNodes.length; i++) {
                 if (smoothNode.childNodes[i].nodeName === "StreamIndex") {
-                    adaptation = mapAdaptationSet.call(this, smoothNode.childNodes[i]);
+                    adaptation = mapAdaptationSet.call(this, smoothNode.childNodes[i], timescale);
                     if (adaptation !== null) {
                         adaptations.push(adaptation);
                     }
@@ -74,7 +74,7 @@ Mss.dependencies.MssParser = function() {
             return period;
         },
 
-        mapAdaptationSet = function(streamIndex) {
+        mapAdaptationSet = function(streamIndex, timescale) {
 
             var adaptationSet = {},
                 representations = [],
@@ -98,7 +98,7 @@ Mss.dependencies.MssParser = function() {
             }
 
             // Create a SegmentTemplate with a SegmentTimeline
-            segmentTemplate = mapSegmentTemplate.call(this, streamIndex);
+            segmentTemplate = mapSegmentTemplate.call(this, streamIndex, timescale);
 
             qualityLevels = this.domParser.getChildNodes(streamIndex, "QualityLevel");
             // For each QualityLevel node, create a Representation element
@@ -265,23 +265,27 @@ Mss.dependencies.MssParser = function() {
             return "mp4a.40." + objectType;
         },
 
-        mapSegmentTemplate = function(streamIndex) {
+        mapSegmentTemplate = function(streamIndex, timescale) {
 
             var segmentTemplate = {},
-                mediaUrl;
+                mediaUrl,
+                streamIndexTimeScale;
 
             mediaUrl = this.domParser.getAttributeValue(streamIndex, "Url").replace('{bitrate}', '$Bandwidth$');
             mediaUrl = mediaUrl.replace('{start time}', '$Time$');
 
+            streamIndexTimeScale = this.domParser.getAttributeValue(streamIndex, "TimeScale");
+            streamIndexTimeScale = streamIndexTimeScale ? parseFloat(streamIndexTimeScale) : timescale;
+
             segmentTemplate.media = mediaUrl;
-            segmentTemplate.timescale = TIME_SCALE_100_NANOSECOND_UNIT;
+            segmentTemplate.timescale = streamIndexTimeScale;
 
-            segmentTemplate.SegmentTimeline = mapSegmentTimeline.call(this, streamIndex);
+            segmentTemplate.SegmentTimeline = mapSegmentTimeline.call(this, streamIndex, segmentTemplate.timescale);
 
             return segmentTemplate;
         },
 
-        mapSegmentTimeline = function(streamIndex) {
+        mapSegmentTimeline = function(streamIndex, timescale) {
 
             var segmentTimeline = {},
                 chunks = this.domParser.getChildNodes(streamIndex, "c"),
@@ -361,7 +365,7 @@ Mss.dependencies.MssParser = function() {
 
             segmentTimeline.S = segments;
             segmentTimeline.S_asArray = segments;
-            segmentTimeline.duration = duration / TIME_SCALE_100_NANOSECOND_UNIT;
+            segmentTimeline.duration = duration / timescale;
 
             return segmentTimeline;
         },
@@ -559,22 +563,24 @@ Mss.dependencies.MssParser = function() {
             // Set mpd node properties
             mpd.name = 'MSS';
             mpd.profiles = "urn:mpeg:dash:profile:isoff-live:2011";
+            var timescale = this.domParser.getAttributeValue(smoothNode, 'TimeScale');
+            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')) / TIME_SCALE_100_NANOSECOND_UNIT;
+            mpd.timeShiftBufferDepth = parseFloat(this.domParser.getAttributeValue(smoothNode, 'DVRWindowLength')) / mpd.timescale;
             var duration = parseFloat(this.domParser.getAttributeValue(smoothNode, 'Duration'));
 
             // If live manifest with Duration, we consider it as a start-over manifest
             if (mpd.type === "dynamic" && duration > 0) {
                 mpd.type = "static";
                 mpd.startOver = true;
                 // We set timeShiftBufferDepth to initial duration, to be used by MssFragmentController to update segment timeline
-                mpd.timeShiftBufferDepth = duration / TIME_SCALE_100_NANOSECOND_UNIT;
+                mpd.timeShiftBufferDepth = duration / mpd.timescale;
                 // Duration will be set according to current segment timeline duration (see below)
             }
 
             // Complete manifest/mpd initialization
-            mpd.mediaPresentationDuration = (duration === 0) ? Infinity : (duration / TIME_SCALE_100_NANOSECOND_UNIT);
+            mpd.mediaPresentationDuration = (duration === 0) ? Infinity : (duration / mpd.timescale);
             mpd.BaseURL = baseURL;
             mpd.minBufferTime = MediaPlayer.dependencies.BufferExtensions.DEFAULT_MIN_BUFFER_TIME;
 
@@ -584,7 +590,7 @@ Mss.dependencies.MssParser = function() {
             }
 
             // Map period node to manifest root node
-            mpd.Period = mapPeriod.call(this);
+            mpd.Period = mapPeriod.call(this, mpd.timescale);
             mpd.Period_asArray = [mpd.Period];
 
             period = mpd.Period;
@@ -674,7 +680,7 @@ Mss.dependencies.MssParser = function() {
                     for (i = 0; i < adaptations.length; i++) {
                         if (adaptations[i].contentType === 'audio' || adaptations[i].contentType === 'video') {
                             segments = adaptations[i].SegmentTemplate.SegmentTimeline.S_asArray;
-                            startTime = segments[0].t;
+                            startTime = segments[0].t / adaptations[i].SegmentTemplate.timescale;
                             if (timestampOffset === undefined) {
                                 timestampOffset = startTime;
                             }
@@ -695,13 +701,13 @@ Mss.dependencies.MssParser = function() {
                             if (!segments[j].tManifest) {
                                 segments[j].tManifest = segments[j].t;
                             }
-                            segments[j].t -= timestampOffset;
+                            segments[j].t -= (timestampOffset * adaptations[i].SegmentTemplate.timescale);
                         }
                         if (adaptations[i].contentType === 'audio' || adaptations[i].contentType === 'video') {
                             period.start = Math.max(segments[0].t, period.start);
                         }
                     }
-                    period.start /= TIME_SCALE_100_NANOSECOND_UNIT;
+                    period.start /= mpd.timescale;
                 }
             }
 

app/js/streaming/MediaPlayer.js

@@ -1141,6 +1141,9 @@ MediaPlayer = function () {
          */
         getVideoBitrates: function () {
             _isPlayerInitialized();
+            if (!videoBitrates) {
+                return [];
+            }
             return videoBitrates.slice();
         },
 

app/js/streaming/MetricsExtensions.js

@@ -104,6 +104,10 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             i = 0,
             adaptation;
 
+        if (!manifest) {
+            return null;
+        }
+
         for (i = 0; i < manifest.Period.AdaptationSet.length; i++) {
             adaptation = manifest.Period.AdaptationSet[i];
             if (adaptation.type === type) {
@@ -120,6 +124,10 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             i = 0,
             adaptation;
 
+        if (!manifest) {
+            return null;
+        }
+
         for (i = 0; i < manifest.Period.AdaptationSet.length; i++) {
             adaptation = manifest.Period.AdaptationSet[i];
             if (adaptation.type === type || adaptation.contentType === type) {
@@ -137,19 +145,16 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             representation,
             periodArray;
 
-        if (manifest) {
-            periodArray = manifest.Period_asArray;
-
-            representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
-
-            if (representation === null) {
-                return null;
-            }
+        if (!manifest) {
+            return null;
+        }
 
-            return representation.width;
-        } else {
+        periodArray = manifest.Period_asArray;
+        representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
+        if (representation === null) {
             return null;
         }
+        return representation.width;
     };
 
     rslt.getVideoHeightForRepresentation = function(representationId) {
@@ -158,19 +163,16 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             representation,
             periodArray;
 
-        if (manifest) {
-            periodArray = manifest.Period_asArray;
-
-            representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
-
-            if (representation === null) {
-                return null;
-            }
+        if (!manifest) {
+            return null;
+        }
 
-            return representation.height;
-        } else {
+        periodArray = manifest.Period_asArray;
+        representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
+        if (representation === null) {
             return null;
         }
+        return representation.height;
     };
 
     rslt.getCodecsForRepresentation = function(representationId) {
@@ -179,12 +181,14 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             representation,
             periodArray = manifest.Period_asArray;
 
-        representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
+        if (!manifest) {
+            return null;
+        }
 
+        representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
         if (representation === null) {
             return null;
         }
-
         return representation.codecs;
     };
 
@@ -213,7 +217,7 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             representationArrayIndex,
             bitrateArray = [];
 
-        if (((manifest === null) || (manifest === undefined)) && ((data === null) || (data === undefined))) {
+        if (!manifest) {
             return null;
         }
 
@@ -262,7 +266,7 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             representationArrayIndex,
             bitrateArray = [];
 
-        if ((manifest === null) || (manifest === undefined)) {
+        if (!manifest) {
             return null;
         }
 

app/js/streaming/StreamController.js

@@ -404,6 +404,7 @@ MediaPlayer.dependencies.StreamController = function() {
                 stream.setDefaultAudioLang(defaultAudioLang);
                 stream.setDefaultSubtitleLang(defaultSubtitleLang);
                 stream.enableSubtitles(subtitlesEnabled);
+                stream.setInitialStartTime(source.startTime);
                 streams.push(stream);
                 activeStream = stream;
                 attachVideoEvents.call(this, activeStream.getVideoModel());

app/js/streaming/protection/ProtectionModel_21Jan2015.js

@@ -293,6 +293,7 @@ MediaPlayer.models.ProtectionModel_21Jan2015 = function () {
             var session,
                 nbSessions = sessions.length,
                 i,
+                closeTimeout,
                 self = this;
 
             this.debug.log("[DRM][PM_21Jan2015] Teardown");
@@ -305,9 +306,15 @@ MediaPlayer.models.ProtectionModel_21Jan2015 = function () {
                     removeSession(session);
                     if (i >= (nbSessions - 1)) {
                         mediaKeys = null;
+                        clearTimeout(closeTimeout);
                         self.notify(MediaPlayer.models.ProtectionModel.eventList.ENAME_TEARDOWN_COMPLETE);
                     }
                 };
+                var close = function () {
+                    for (i = 0; i < nbSessions; i++) {
+                        done(sessions[i]);
+                    }
+                };
 
                 if (nbSessions === 0) {
                     mediaKeys = null;
@@ -329,6 +336,9 @@ MediaPlayer.models.ProtectionModel_21Jan2015 = function () {
                         });
                     })(session);
                 }
+                // Patch for MediaKeySession.close() that may never resolve returned promise
+                // (for example after license request failure)
+                closeTimeout = setTimeout(close, 1000);
             } else {
                 // If license persistence is enabled, then keep usable sessions data and MediaKeys instance
                 for (i = 0; i < sessions.length; i++) {

app/js/streaming/protection/drm/KeySystem_Widevine.js

@@ -40,7 +40,7 @@ MediaPlayer.dependencies.protection.KeySystem_Widevine = function() {
 
     var keySystemStr = "com.widevine.alpha",
         keySystemUUID = "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed",
-        protData = null,
+        protData,
 
         doGetInitData = function(cpData) {
             return MediaPlayer.dependencies.protection.CommonEncryption.parseInitDataFromContentProtection(cpData);
@@ -49,10 +49,10 @@ MediaPlayer.dependencies.protection.KeySystem_Widevine = function() {
         doGetKeySystemConfigurations = function(videoCodec, audioCodec, sessionType) {
             var ksConfigurations = MediaPlayer.dependencies.protection.CommonEncryption.getKeySystemConfigurations(videoCodec, audioCodec, sessionType);
             if (protData) {
-                if (protData.audioRobustness) {
+                if (protData.audioRobustness && ksConfigurations[0].audioCapabilities.length > 0) {
                     ksConfigurations[0].audioCapabilities[0].robustness = protData.audioRobustness;
                 }
-                if (protData.videoRobustness) {
+                if (protData.videoRobustness && ksConfigurations[0].videoCapabilities.length > 0) {
                     ksConfigurations[0].videoCapabilities[0].robustness = protData.videoRobustness;
                 }
             }
@@ -74,11 +74,9 @@ MediaPlayer.dependencies.protection.KeySystem_Widevine = function() {
         sessionType: "temporary",
 
         init: function(protectionData) {
-            if (protectionData) {
-                protData = protectionData;
-                if (protData.sessionType) {
-                    this.sessionType = protData.sessionType;
-                }
+            protData = protectionData;
+            if (protData && protData.sessionType) {
+                this.sessionType = protData.sessionType;
             }
         },