From 64a8a82904431a1d311a087b070d7af298c7c6c6 Mon Sep 17 00:00:00 2001 From: rart Date: Thu, 20 Sep 2018 18:25:35 +0200 Subject: [PATCH 1/3] Adding missing manifest information on to segments (EXT-X-PROGRAM-DATE-TIME) --- src/segment-loader.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/segment-loader.js b/src/segment-loader.js index 7d68e6caa..3655cfebc 100644 --- a/src/segment-loader.js +++ b/src/segment-loader.js @@ -1371,6 +1371,8 @@ export default class SegmentLoader extends videojs.EventTarget { const Cue = window.WebKitDataCue || window.VTTCue; const value = { + dateTimeObject: segment.dateTimeObject || null, + dateTimeString: segment.dateTimeString || null, bandwidth: segmentInfo.playlist.attributes.BANDWIDTH, resolution: segmentInfo.playlist.attributes.RESOLUTION, codecs: segmentInfo.playlist.attributes.CODECS, From 45260fff87b5c0963654c08392926419bab49990 Mon Sep 17 00:00:00 2001 From: rart Date: Thu, 20 Sep 2018 18:31:16 +0200 Subject: [PATCH 2/3] Adding missing manifest information on to segments (EXT-X-PROGRAM-DATE-TIME) --- src/segment-loader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/segment-loader.js b/src/segment-loader.js index 3655cfebc..f55fd4273 100644 --- a/src/segment-loader.js +++ b/src/segment-loader.js @@ -1371,8 +1371,8 @@ export default class SegmentLoader extends videojs.EventTarget { const Cue = window.WebKitDataCue || window.VTTCue; const value = { - dateTimeObject: segment.dateTimeObject || null, - dateTimeString: segment.dateTimeString || null, + dateTimeObject: (segment && segment.dateTimeObject) || null, + dateTimeString: (segment && segment.dateTimeString) || null, bandwidth: segmentInfo.playlist.attributes.BANDWIDTH, resolution: segmentInfo.playlist.attributes.RESOLUTION, codecs: segmentInfo.playlist.attributes.CODECS, From 707810e48e6e98d49b311231cb2063430ed8116f Mon Sep 17 00:00:00 2001 From: rart Date: Thu, 20 Sep 2018 18:56:27 +0200 Subject: [PATCH 3/3] Adding missing manifest information on to segments (EXT-X-PROGRAM-DATE-TIME); Missed test file update during commit. --- test/segment-loader.test.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/segment-loader.test.js b/test/segment-loader.test.js index 5a69bb8db..10e4920cd 100644 --- a/test/segment-loader.test.js +++ b/test/segment-loader.test.js @@ -450,7 +450,9 @@ QUnit.module('SegmentLoader: M2TS', function(hooks) { bandwidth: 3500000, resolution: '1920x1080', codecs: 'mp4a.40.5,avc1.42001e', - byteLength: 10 + byteLength: 10, + dateTimeObject: null, + dateTimeString: null }; assert.equal(track.cues.length, 1, 'one cue added for segment'); @@ -471,7 +473,9 @@ QUnit.module('SegmentLoader: M2TS', function(hooks) { bandwidth: 3500000, resolution: '1920x1080', codecs: 'mp4a.40.5,avc1.42001e', - byteLength: 10 + byteLength: 10, + dateTimeObject: null, + dateTimeString: null }; assert.equal(track.cues.length, 2, 'one cue added for segment'); @@ -492,7 +496,9 @@ QUnit.module('SegmentLoader: M2TS', function(hooks) { bandwidth: 3500000, resolution: '1920x1080', codecs: 'mp4a.40.5,avc1.42001e', - byteLength: 10 + byteLength: 10, + dateTimeObject: null, + dateTimeString: null }; assert.equal(track.cues.length, 3, 'one cue added for segment'); @@ -515,7 +521,9 @@ QUnit.module('SegmentLoader: M2TS', function(hooks) { bandwidth: 3500000, resolution: '1920x1080', codecs: 'mp4a.40.5,avc1.42001e', - byteLength: 10 + byteLength: 10, + dateTimeObject: null, + dateTimeString: null }; assert.equal(track.cues.length, 3, 'overlapped cue removed, new one added');