Merge branch 'release/1.7.0'

Author: bbert

RELEASES NOTES.txt

@@ -1,3 +1,18 @@
+### Release Notes v1.7.0 (2016/11/28)
+* Add support for TTML origin defined with field 'c'
+* Bugs fixing:
+* - Fix compatibility issue with Smooth streaming Streams in CENC/PIFF1.3 format
+* - Fix subtitles being displayed by Firefox when using external display mode
+* - Fix issue on image subtitles display
+* - Fix namespace resolution for subtitles XML files
+* - Remove subtitles external <div> size setting (to be set by webapp)
+* - Workaround for missing 'cueExit' event not sent by Firefox when seeking
+* - Fix issue on track selection among tracks with identical language
+* - Correct FragmentInfo requests scheduling in Smooth Streaming DVR mode
+* - Stops Smooth Streaming DVR FragmentInfo requests in case of session reloading
+* - Fix TTML origin management if set on main div
+* - Correct TTML showbackground management to keep text alignment value
+
 ### Release Notes v1.6.0 (2016/10/04)
 * Handle Firefox's MSE and <video> timestamping based on CTS/PTS (and not DTS like on other browsers)
 * Add 'subType' information for tracks (MediaPlayer.getTracks()) to differentiate HoH subtitles

app/js/mss/MssFragmentController.js

@@ -297,8 +297,8 @@ Mss.dependencies.MssFragmentController = function() {
                 }
             }
 
-            // If protected content (sepiff box = Sample Encryption PIFF)
-            // => convert it into a senc box
+            // If protected content in PIFF1.1 format (sepiff box = Sample Encryption PIFF)
+            // => convert sepiff box it into a senc box
             // => create saio and saiz boxes (if not already present)
             sepiff = traf.getBoxByType("sepiff");
             if (sepiff !== null) {
@@ -353,7 +353,8 @@ Mss.dependencies.MssFragmentController = function() {
             trun.data_offset = fragment_size - mdat.size + 8; // 8 = 'size' + 'type' mdat fields length
 
             // Update saio box offset field according to new senc box offset
-            if (sepiff !== null) {
+            saio = traf.getBoxByType("saio");
+            if (saio !== null) {
                 moofPosInFragment = fragment.getBoxOffsetByType("moof");
                 trafPosInMoof = moof.getBoxOffsetByType("traf");
                 sencPosInTraf = traf.getBoxOffsetByType("senc");

app/js/streaming/BufferController.js

@@ -286,6 +286,7 @@ MediaPlayer.dependencies.BufferController = function() {
                     initializationData[quality] = data;
 
                     self.debug.info("[BufferController][" + type + "] Buffer initialization segment ", (request.url !== null) ? request.url : request.quality);
+                    //console.saveBinArray(data, type + "_init_" + request.quality + ".mp4");
                     appendToBuffer.call(self, data, request.quality).then(
                         function() {
                             // Load next media segment
@@ -355,7 +356,7 @@ MediaPlayer.dependencies.BufferController = function() {
                             }
                         }*/
 
-                    //console.saveBinArray(data, type + "_" + request.index + "_" + request.quality + ".mp4");
+                    //console.saveBinArray(data, request.url.substring(request.url.lastIndexOf('/') + 1));
                     data = deleteInbandEvents.call(self, data);
 
                     // Check if we need to override the current buffered segments (in case of language switch for example)
@@ -1406,16 +1407,13 @@ MediaPlayer.dependencies.BufferController = function() {
             this.debug.log("[BufferController][" + type + "] Update data");
 
             // Check if track has changed (in case of language switch for example)
-            //trackChanged = data === null ? true : (((data.lang !== null ? data.lang : data.id) !== ((newData.lang !== null ? newData.lang : newData.id))) ? true : false);
-            trackChanged = data === null ? false : (((data.lang !== null ? data.lang : data.id) !== ((newData.lang !== null ? newData.lang : newData.id))) ? true : false);
+            trackChanged = (data === null) ? false : ((data.id !==  newData.id) || (data.lang !==  newData.lang) || (data.subType !==  newData.subType));
 
             // Set the new data
             data = newData;
             periodInfo = newPeriodInfo;
             dataChanged = true;
 
-            // Check if track has changed (in case of language switch for example)
-            //if (data === null ? true : (((data.lang !== null ? data.lang : data.id) !== ((newData.lang !== null ? newData.lang : newData.id))) ? true : false);
             if (trackChanged) {
                 this.debug.log("[BufferController][" + type + "] Track changed");
 

app/js/streaming/FragmentInfoController.js

@@ -29,7 +29,8 @@ MediaPlayer.dependencies.FragmentInfoController = function() {
         segmentDownloadFailed = false,
         segmentDownloadErrorCount = 0,
         reloadTimeout = null,
-        startLoadingDate = null,
+        startFragmentInfoDate = null,
+        startTimeStampValue = null,
         deltaTime = 0,
 
         segmentDuration = NaN,
@@ -51,6 +52,9 @@ MediaPlayer.dependencies.FragmentInfoController = function() {
                 return;
             }
 
+            startFragmentInfoDate = new Date().getTime();
+            startTimeStampValue = _fragmentInfoTime;
+
             this.debug.info("[FragmentInfoController][" + type + "] startPlayback");
 
             // Start buffering process
@@ -94,6 +98,9 @@ MediaPlayer.dependencies.FragmentInfoController = function() {
             clearTimeout(bufferTimeout);
             started = false;
 
+            startFragmentInfoDate = null;
+            startTimeStampValue = null;
+
             // Stop reload timeout
             clearTimeout(reloadTimeout);
             reloadTimeout = null;
@@ -106,7 +113,9 @@ MediaPlayer.dependencies.FragmentInfoController = function() {
         },
 
         onBytesLoaded = function(request, response) {
-            var data;
+            var data,
+                deltaDate,
+                deltaTimeStamp;
 
             segmentDuration = request.duration;
 
@@ -120,9 +129,13 @@ MediaPlayer.dependencies.FragmentInfoController = function() {
                 data = this.fragmentController.process(response.data, request, _bufferController.getAvailableRepresentations());
                 this.debug.info("[FragmentInfoController][" + type + "] Buffer segment from url ", request.url);
 
-                deltaTime = new Date().getTime() - startLoadingDate;
+                deltaDate = (new Date().getTime() - startFragmentInfoDate) / 1000;
+
+                deltaTimeStamp = (_fragmentInfoTime + segmentDuration) - startTimeStampValue;
 
-                delayLoadNextFragmentInfo.call(this, (segmentDuration - (deltaTime / 1000)));
+                deltaTime = (deltaTimeStamp - deltaDate) > 0 ? (deltaTimeStamp - deltaDate) : 0;
+
+                delayLoadNextFragmentInfo.call(this, deltaTime);
             } catch (e) {
                 this.errHandler.sendError(MediaPlayer.dependencies.ErrorHandler.prototype.INTERNAL_ERROR, "Internal error while processing fragment info segment", e.message);
             }
@@ -216,8 +229,6 @@ MediaPlayer.dependencies.FragmentInfoController = function() {
 
             self.debug.log("[FragmentInfoController][" + type + "] Start buffering process...");
 
-            startLoadingDate = new Date().getTime();
-
             // Get next segment time
             segmentTime = _fragmentInfoTime;
 

app/js/streaming/MediaPlayer.js

@@ -341,6 +341,9 @@ MediaPlayer = function () {
         return null;
     };
 
+    var _isSameTrack = function (track1, track2) {
+        return (track1.id === track2.id) && (track1.lang === track2.lang) && (track1.subType === track2.subType);
+    };
 
     // parse the arguments of load function to make an object
     var _parseLoadArguments = function () {
@@ -1206,7 +1209,7 @@ MediaPlayer = function () {
          * @memberof MediaPlayer#
          * @see [getTracks]{@link MediaPlayer#getTracks}
          * @param {String} type - the stream type according to MediaPlayer.TRACKS_TYPE (see @link MediaPlayer#TRACKS_TYPE)
-         * @param {Track} track - the track to select
+         * @param {Track} track - the track to select, as returned by the [getTracks]{@link MediaPlayer#getTracks} method
          *
          */
         selectTrack: function (type, track) {
@@ -1217,8 +1220,8 @@ MediaPlayer = function () {
                 throw new Error('MediaPlayer Invalid Argument - "type" should be defined and shoud be kind of MediaPlayer.TRACKS_TYPE');
             }
 
-            if (!track || !(track.id || track.lang)) {
-                throw new Error('MediaPlayer.selectTrack(): track parameter is unknown');
+            if (!track || !(track.id || track.lang || track.subType)) {
+                throw new Error('MediaPlayer.selectTrack(): track parameter is not in valid');
             }
 
             var _tracks = _getTracksFromType(type);
@@ -1227,19 +1230,15 @@ MediaPlayer = function () {
                 this.debug.error("[MediaPlayer] No available track for type " + type);
                 return;
             }
-
             var selectedTrack = _getSelectedTrackFromType(type);
 
-            if (selectedTrack &&
-                ((track.id && track.id === selectedTrack.id) ||
-                 (track.lang && track.lang === selectedTrack.lang))) {
+            if (selectedTrack && _isSameTrack(selectedTrack, track)) {
                 this.debug.log("[MediaPlayer] " + type + " track [" + track.id + " - " + track.lang + "] is already selected");
                 return;
             }
 
             for (var i = 0; i < _tracks.length; i += 1) {
-                if ((track.id && track.id === _tracks[i].id) ||
-                    (track.lang && track.lang === _tracks[i].lang)) {
+                if (_isSameTrack(_tracks[i], track)) {
                     _selectTrackFromType(type, _tracks[i]);
                     return;
                 }
@@ -1269,7 +1268,8 @@ MediaPlayer = function () {
 
             return {
                 id: _track.id,
-                lang: _track.lang
+                lang: _track.lang,
+                subType: _track.subType
             };
         },
 //#endregion

app/js/streaming/Mp4Processor.js

@@ -396,7 +396,12 @@ MediaPlayer.dependencies.Mp4Processor = function() {
             }
 
             avc1.data_reference_index = 1; //To DO... ??
-            avc1.compressorname = "AVC Coding"; //is a name, for informative purposes. It is formatted in a fixed 32-byte field, with the first
+            avc1.compressorname = [0x0A, 0x41, 0x56, 0x43, 0x20, 0x43, 0x6F, 0x64,
+                                   0x69, 0x6E, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
+            // = "AVC Coding";
+            //is a name, for informative purposes. It is formatted in a fixed 32-byte field, with the first
             //byte set to the number of bytes to be displayed, followed by that number of bytes of displayable data,
             //and then padding to complete 32 bytes total (including the size byte). The field may be set to 0.
             avc1.depth = 0x0018; //takes one of the following values 0x0018 – images are in colour with no alpha.

app/js/streaming/SourceBufferExtensions.js

@@ -223,6 +223,15 @@ MediaPlayer.dependencies.SourceBufferExtensions.prototype = {
                 if ((start >= 0) && (start < duration) && (end > start) && (mediaSource.readyState !== "ended")) {
                     buffer.remove(start, end);
                 }
+                
+                //workaround in order to remove all the cues in the textTrack from the video element.
+                //end parameter equals the video.duration. The use case of a dash stream with a full TTML subtitles file has an issue because video duration could be NaN. It occurs
+                //after the manifest has been parsed, a call to MediaSource.setDuration is made but after a few ms, a duration change event occurs with a value of NaN. The origin of this issue may be
+                //that no media segments have been pushed.
+                //So, all the buffer is removed. 
+                if (isNaN(end) && (mediaSource.readyState !== "ended")) {
+                    buffer.remove(start);   
+                }
 
                 if (sync) {
                     deferred.resolve();

app/js/streaming/Stream.js

@@ -955,6 +955,7 @@ MediaPlayer.dependencies.Stream = function() {
                     reloadTimeout = null;
                     //pause.call(self);
                     self.system.notify("manifestUpdate", true);
+                    stopFragmentInfoControllers.call(self);
                 }, delay * 1000);
             } else {
                 // For VOD streams, we seek at recovery time
@@ -1249,8 +1250,10 @@ MediaPlayer.dependencies.Stream = function() {
                             streamsComposed.call(this);
                         }
                         // show subtitle here => useful for full TTML file
-                        if (track && track.mode !== 'showing') {
+                        if (track && track.kind !== 'metadata' && track.mode !== 'showing') {
                             track.mode = "showing";
+                        }else if (track) {
+                            track.mode = "hidden";
                         }
                     } else {
                         if (fragmentInfoTextController) {

app/js/streaming/VideoModel.js

@@ -152,8 +152,6 @@ MediaPlayer.models.VideoModel = function () {
             TTMLRenderingDiv.style.pointerEvents = 'none';
             TTMLRenderingDiv.style.top = 0;
             TTMLRenderingDiv.style.left = 0;
-            TTMLRenderingDiv.style.width = '100%';
-            TTMLRenderingDiv.style.height = '100%';
         },
 
         stallStream: stallStream