feat: use serverControl and preloadSegment llhls features behind a flag #1078
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,62 @@ import {TIME_FUDGE_FACTOR} from './ranges.js'; | |
|
|
||
| const {createTimeRange} = videojs; | ||
|
|
||
| /** | ||
| * A function to get a combined list of parts and segments with durations | ||
| * and indexes. | ||
| * | ||
| * @param {Playlist} playlist the playlist to get the list for. | ||
| * | ||
| * @return {Array} The part/segment list. | ||
| */ | ||
| const getPartsAndSegments = (playlist) => (playlist.segments || []).reduce((acc, segment, si) => { | ||
| if (segment.parts) { | ||
| segment.parts.forEach(function(part, pi) { | ||
| acc.push({duration: part.duration, segmentIndex: si, partIndex: pi}); | ||
| }); | ||
| } else { | ||
| acc.push({duration: segment.duration, segmentIndex: si, partIndex: null}); | ||
| } | ||
| return acc; | ||
| }, []); | ||
|
|
||
| /** | ||
| * Get the number of seconds to delay from the end of a | ||
| * live playlist. | ||
| * | ||
| * @param {Playlist} master the master playlist | ||
| * @param {Playlist} media the media playlist | ||
| * @return {number} the hold back in seconds. | ||
| */ | ||
| export const liveEdgeDelay = (master, media) => { | ||
| if (media.endList) { | ||
| return 0; | ||
| } | ||
|
|
||
| // dash suggestedPresentationDelay trumps everything | ||
| if (master && master.suggestedPresentationDelay) { | ||
| return master.suggestedPresentationDelay; | ||
|
Comment on lines
+44
to
+46
There was a problem hiding this comment. Might be worth pulling this up to short circuit the rest of the function. |
||
| } | ||
|
|
||
| const lastSegment = media.segments && media.segments.length && media.segments[media.segments.length - 1]; | ||
| const hasParts = lastSegment && lastSegment.parts && lastSegment.parts.length; | ||
|
|
||
| // look for "part" delays from ll-hls first | ||
| if (hasParts && media.serverControl && media.serverControl.partHoldBack) { | ||
| return media.serverControl.partHoldBack; | ||
| } else if (hasParts && media.partTargetDuration) { | ||
| return media.partTargetDuration * 3; | ||
|
|
||
| // finally look for full segment delays | ||
| } else if (media.serverControl && media.serverControl.holdBack) { | ||
| return media.serverControl.holdBack; | ||
| } else if (media.targetDuration) { | ||
brandonocasey marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return media.targetDuration * 3; | ||
|
There was a problem hiding this comment. This was changed in main via #1105 |
||
| } | ||
|
|
||
| return 0; | ||
| }; | ||
|
|
||
| /** | ||
| * walk backward until we find a duration we can use | ||
| * or return a failure | ||
|
|
@@ -252,17 +308,9 @@ export const playlistEnd = function(playlist, expired, useSafeLiveEnd, liveEdgeP | |
| expired | ||
| ); | ||
|
|
||
| if (useSafeLiveEnd) { | ||
| liveEdgePadding = typeof liveEdgePadding === 'number' ? liveEdgePadding : liveEdgeDelay(null, playlist); | ||
| lastSegmentTime -= liveEdgePadding; | ||
| } | ||
|
|
||
| // don't return a time less than zero | ||
|
|
@@ -314,31 +362,34 @@ export const getMediaInfoForTime = function( | |
| startIndex, | ||
| startTime | ||
| ) { | ||
|
|
||
| const partsAndSegments = getPartsAndSegments(playlist); | ||
| let time = currentTime - startTime; | ||
|
|
||
| if (time < 0) { | ||
| // Walk backward from startIndex in the playlist, adding durations | ||
| // until we find a segment that contains `time` and return it | ||
| if (startIndex > 0) { | ||
| for (let i = startIndex - 1; i >= 0; i--) { | ||
| const segment = partsAndSegments[i]; | ||
|
|
||
| time += (segment.duration + TIME_FUDGE_FACTOR); | ||
|
|
||
| if (time > 0) { | ||
| return { | ||
| mediaIndex: segment.segmentIndex, | ||
| startTime: startTime - sumDurations(playlist, startIndex, segment.segmentIndex), | ||
| partIndex: segment.partIndex | ||
| }; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // We were unable to find a good segment within the playlist | ||
| // so select the first segment | ||
| return { | ||
| mediaIndex: partsAndSegments[0] && partsAndSegments[0].segmentIndex || 0, | ||
| partIndex: partsAndSegments[0] && partsAndSegments[0].partIndex || null, | ||
| startTime: currentTime | ||
| }; | ||
| } | ||
|
|
@@ -347,11 +398,11 @@ export const getMediaInfoForTime = function( | |
| // adding target durations. If we "run out of time" before getting to | ||
| // the first segment, return the first segment | ||
| if (startIndex < 0) { | ||
| for (let i = startIndex; i < 0; i++) { | ||
| time -= playlist.targetDuration; | ||
| if (time < 0) { | ||
| return { | ||
| mediaIndex: partsAndSegments[0].segmentIndex, | ||
| startTime: currentTime | ||
| }; | ||
| } | ||
|
|
@@ -361,20 +412,24 @@ export const getMediaInfoForTime = function( | |
|
|
||
| // Walk forward from startIndex in the playlist, subtracting durations | ||
| // until we find a segment that contains `time` and return it | ||
| for (let i = startIndex; i < partsAndSegments.length; i++) { | ||
| const partSegment = partsAndSegments[i]; | ||
|
|
||
| time -= partSegment.duration + TIME_FUDGE_FACTOR; | ||
|
|
||
| if (time < 0) { | ||
| return { | ||
| mediaIndex: partSegment.segmentIndex, | ||
| startTime: startTime + sumDurations(playlist, startIndex, partSegment.segmentIndex), | ||
| partIndex: partSegment.partIndex | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| // We are out of possible candidates so load the last one... | ||
| return { | ||
| mediaIndex: partsAndSegments[partsAndSegments.length - 1].segmentIndex, | ||
| partIndex: partsAndSegments[partsAndSegments.length - 1].partIndex, | ||
| startTime: currentTime | ||
| }; | ||
| }; | ||
|
|
@@ -510,6 +565,7 @@ export const isLowestEnabledRendition = (master, media) => { | |
|
|
||
| // exports | ||
| export default { | ||
| liveEdgeDelay, | ||
| duration, | ||
| seekable, | ||
| getMediaInfoForTime, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use partTargetDuration or targetDuration