mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Prevent skipping when seeking back to segment

Browse source
This commit is contained in:
Bill Thornton 2024-10-13 03:42:45 -04:00
parent 9942fb7856
commit aef9482824
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/apps/stable/features/playback/utils/mediaSegmentManager.ts
View file

@ -18,7 +18,9 @@ import { MediaSegmentAction } from '../constants/mediaSegmentAction';
class MediaSegmentManager extends PlaybackSubscriber { class MediaSegmentManager extends PlaybackSubscriber {
private hasSegments = false; private hasSegments = false;
private lastIndex = 0; private isLastSegmentIgnored = false;
private lastSegmentIndex = 0;
private lastTime = -1;
private mediaSegmentTypeActions: Record<Partial<MediaSegmentType>, MediaSegmentAction> | undefined; private mediaSegmentTypeActions: Record<Partial<MediaSegmentType>, MediaSegmentAction> | undefined;
private mediaSegments: MediaSegmentDto[] = []; private mediaSegments: MediaSegmentDto[] = [];
@ -43,17 +45,24 @@ class MediaSegmentManager extends PlaybackSubscriber {
const action = this.mediaSegmentTypeActions[mediaSegment.Type]; const action = this.mediaSegmentTypeActions[mediaSegment.Type];
if (action === MediaSegmentAction.Skip) { if (action === MediaSegmentAction.Skip) {
// Perform skip // Ignore segment if playback progress has passed the segment's start time
if (mediaSegment.EndTicks) { if (mediaSegment.StartTicks !== undefined && this.lastTime > mediaSegment.StartTicks) {
console.info('[MediaSegmentManager] ignoring skipping segment that has been seeked back into', mediaSegment);
this.isLastSegmentIgnored = true;
return;
} else if (mediaSegment.EndTicks) {
// If there is an end time, seek to it
// Do not skip if duration < 1s to avoid slow stream changes // Do not skip if duration < 1s to avoid slow stream changes
if (mediaSegment.StartTicks && mediaSegment.EndTicks - mediaSegment.StartTicks < TICKS_PER_SECOND) { if (mediaSegment.StartTicks && mediaSegment.EndTicks - mediaSegment.StartTicks < TICKS_PER_SECOND) {
console.info('[MediaSegmentManager] ignoring skipping segment with duration <1s', mediaSegment); console.info('[MediaSegmentManager] ignoring skipping segment with duration <1s', mediaSegment);
this.isLastSegmentIgnored = true;
return; return;
} }
console.debug('[MediaSegmentManager] skipping to %s ms', mediaSegment.EndTicks / TICKS_PER_MILLISECOND); console.debug('[MediaSegmentManager] skipping to %s ms', mediaSegment.EndTicks / TICKS_PER_MILLISECOND);
this.playbackManager.seek(mediaSegment.EndTicks, this.player); this.playbackManager.seek(mediaSegment.EndTicks, this.player);
} else { } else {
// If there is no end time, skip to the next track
console.debug('[MediaSegmentManager] skipping to next item in queue'); console.debug('[MediaSegmentManager] skipping to next item in queue');
this.playbackManager.nextTrack(this.player); this.playbackManager.nextTrack(this.player);
} }
@ -61,7 +70,9 @@ class MediaSegmentManager extends PlaybackSubscriber {
} }
onPlayerPlaybackStart(_e: Event, state: PlayerState) { onPlayerPlaybackStart(_e: Event, state: PlayerState) {
this.lastIndex = 0; this.isLastSegmentIgnored = false;
this.lastSegmentIndex = 0;
this.lastTime = -1;
this.hasSegments = !!state.MediaSource?.HasSegments; this.hasSegments = !!state.MediaSource?.HasSegments;
const itemId = state.MediaSource?.Id; const itemId = state.MediaSource?.Id;
@ -96,16 +107,23 @@ class MediaSegmentManager extends PlaybackSubscriber {
onPlayerTimeUpdate() { onPlayerTimeUpdate() {
if (this.hasSegments && this.mediaSegments.length) { if (this.hasSegments && this.mediaSegments.length) {
const time = this.playbackManager.currentTime(this.player) * TICKS_PER_MILLISECOND; const time = this.playbackManager.currentTime(this.player) * TICKS_PER_MILLISECOND;
const currentSegmentDetails = findCurrentSegment(this.mediaSegments, time, this.lastIndex); const currentSegmentDetails = findCurrentSegment(this.mediaSegments, time, this.lastSegmentIndex);
if (currentSegmentDetails) { if (
// The current time falls within a segment
currentSegmentDetails
// and the last segment is not ignored or the segment index has changed
&& (!this.isLastSegmentIgnored || this.lastSegmentIndex !== currentSegmentDetails.index)
) {
console.debug( console.debug(
'[MediaSegmentManager] found %s segment at %s ms', '[MediaSegmentManager] found %s segment at %s ms',
currentSegmentDetails.segment.Type, currentSegmentDetails.segment.Type,
time / TICKS_PER_MILLISECOND, time / TICKS_PER_MILLISECOND,
currentSegmentDetails); currentSegmentDetails);
this.isLastSegmentIgnored = false;
this.performAction(currentSegmentDetails.segment); this.performAction(currentSegmentDetails.segment);
this.lastIndex = currentSegmentDetails.index; this.lastSegmentIndex = currentSegmentDetails.index;
} }
this.lastTime = time;
} }
} }
} }