From ea89164b7d6b54d28a7ba766e12a057d4a5424dd Mon Sep 17 00:00:00 2001 From: david-winder-kaltura Date: Tue, 11 Jun 2019 16:23:07 +0300 Subject: [PATCH] SUP-18414 dvr clip from (#613) * Add clipFrom when moving from preview to allow_all * Keep minimum of minDurationForPlaybackInSec when starting DVR --- lib/entry/LiveEntry.js | 6 ++++++ lib/playlistGenerator/PlaylistGenerator.js | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/lib/entry/LiveEntry.js b/lib/entry/LiveEntry.js index cee9b84b..c0edcd57 100644 --- a/lib/entry/LiveEntry.js +++ b/lib/entry/LiveEntry.js @@ -302,6 +302,7 @@ LiveEntry.prototype.entryObjectUpdated = function(entry) && origViewMode != kalturaTypes.KalturaViewMode.ALLOW_ALL) { this._startDVR(entry); + this._setClipFrom((entry.updatedAt - config.get('minDurationForPlaybackInSec')) * 1000, false); this._removeClipTo().then (()=>{this._updateIsPlayableUser(true)}); } if (entry.viewMode == kalturaTypes.KalturaViewMode.PREVIEW @@ -342,6 +343,11 @@ LiveEntry.prototype._startDVR = function(entry) this.playlistGenerator.setDVRDuration(newPlayWindow); } +LiveEntry.prototype._setClipFrom = function(clipToTimeMs, overrideExist = true) +{ + this.playlistGenerator.setClipFrom(clipToTimeMs, overrideExist); +} + LiveEntry.prototype._setClipTo = function(clipToTimeMs) { this.playlistGenerator.setClipTo(clipToTimeMs); diff --git a/lib/playlistGenerator/PlaylistGenerator.js b/lib/playlistGenerator/PlaylistGenerator.js index a7acb8a8..c1774972 100644 --- a/lib/playlistGenerator/PlaylistGenerator.js +++ b/lib/playlistGenerator/PlaylistGenerator.js @@ -258,6 +258,17 @@ PlaylistGenerator.prototype.setClipTo = function(clipTo) { this.isDirty = true; } +PlaylistGenerator.prototype.setClipFrom = function(clipFrom, overrideExist = true) { + if (clipFrom) { + if (overrideExist || !this.playlistImp.inner.clipFrom) { + this.playlistImp.inner.clipFrom = clipFrom; + } + } else { + delete this.playlistImp.inner.clipFrom; + } + this.isDirty = true; +} + var removeFile = function (pathToDelete) { var that = this;