Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix internal seek #3536

Merged
merged 2 commits into from
Mar 2, 2021
Merged

Fix internal seek #3536

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35862c3
When doing internal seek, re-enable 'seeking' listener once currentTi…
Feb 15, 2021
43ab774
for internal seek, do not disable 'seeking' listener, but simply igno…
Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/streaming/controllers/PlaybackController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ function PlaybackController() {
lastLivePlaybackTime,
availabilityStartTime,
seekTarget,
internalSeek,
isLowLatencySeekingInProgress,
playbackStalled,
minPlaybackRateChange,
Expand All @@ -80,6 +81,7 @@ function PlaybackController() {
playbackStalled = false;
streamSwitch = periodSwitch === true;
streamSeekTime = seekTime;
internalSeek = false;

const ua = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase() : '';

Expand Down Expand Up @@ -176,24 +178,20 @@ function PlaybackController() {
return streamInfo && videoModel ? videoModel.isSeeking() : null;
}

function seek(time, stickToBuffered, internalSeek) {
function seek(time, stickToBuffered, internal) {
if (!streamInfo || !videoModel) return;

let currentTime = !isNaN(seekTarget) ? seekTarget : videoModel.getTime();
if (time === currentTime) return;

if (internalSeek === true) {
// Internal seek = seek video model only (disable 'seeking' listener)
// buffer(s) are already appended at requested time
videoModel.removeEventListener('seeking', onPlaybackSeeking);
logger.info('Requesting internal seek to time: ' + time);
videoModel.setCurrentTime(time, stickToBuffered);
} else {
internalSeek = (internal === true);

if (!internalSeek) {
seekTarget = time;
eventBus.trigger(Events.PLAYBACK_SEEK_ASKED);
logger.info('Requesting seek to time: ' + time);
videoModel.setCurrentTime(time, stickToBuffered);
}
logger.info('Requesting seek to time: ' + time + (internalSeek ? ' (internal)' : ''));
videoModel.setCurrentTime(time, stickToBuffered);
}

function seekToLive() {
Expand Down Expand Up @@ -482,6 +480,12 @@ function PlaybackController() {
}

function onPlaybackSeeking() {
// Check if internal seeking to be ignored
if (internalSeek) {
internalSeek = false;
return;
}

let seekTime = getTime();
// On some browsers/devices, in case of live streams, setting current time on video element fails when there is no buffered data at requested time
// Then re-set seek target time and video element will be seeked afterwhile once data is buffered (see BufferContoller)
Expand All @@ -498,8 +502,6 @@ function PlaybackController() {
function onPlaybackSeeked() {
logger.info('Native video element event: seeked');
eventBus.trigger(Events.PLAYBACK_SEEKED);
// Reactivate 'seeking' event listener (see seek())
videoModel.addEventListener('seeking', onPlaybackSeeking);
}

function onPlaybackTimeUpdated() {
Expand Down