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

Merge pull request #624 from redSpoutnik/fix-subtitle-sync-firefox

Browse source 
Fix subtitle sync firefox
This commit is contained in:
dkanada 2020-01-12 04:14:18 +09:00 • committed by GitHub
commit aa3e414ba1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/components/htmlvideoplayer/plugin.js
View file

@ -584,6 +584,19 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
return showTrackOffset; return showTrackOffset;
} }
function getTextTrack() {
var videoElement = self._mediaElement;
if (videoElement) {
return Array.from(videoElement.textTracks)
.find(function(trackElement) {
// get showing .vtt textTack
return trackElement.mode === 'showing';
});
} else {
return null;
}
}
self.setSubtitleOffset = function(offset) { self.setSubtitleOffset = function(offset) {
var offsetValue = parseFloat(offset); var offsetValue = parseFloat(offset);
@ -592,28 +605,15 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
if (currentAssRenderer) { if (currentAssRenderer) {
updateCurrentTrackOffset(offsetValue); updateCurrentTrackOffset(offsetValue);
} else { } else {
var videoElement = self._mediaElement; var trackElement = getTextTrack();
var mediaStreamTextTracks = getMediaStreamTextTracks(self._currentPlayOptions.mediaSource); // if .vtt currently rendering
if (trackElement) {
Array.from(videoElement.textTracks) setTextTrackSubtitleOffset(trackElement, offsetValue);
.filter(function(trackElement) { } else if (currentTrackEvents) {
// get showing .vtt textTacks setTrackEventsSubtitleOffset(currentTrackEvents, offsetValue);
return trackElement.mode === 'showing'; } else {
}) console.log("No available track, cannot apply offset: ", offsetValue);
.forEach(function(trackElement) { }
var track = customTrackIndex === -1 ? null : mediaStreamTextTracks.filter(function (t) {
return t.Index === customTrackIndex;
})[0];
if (track) {
offsetValue = updateCurrentTrackOffset(offsetValue);
setVttSubtitleOffset(trackElement, offsetValue);
} else {
console.log("No available track, cannot apply offset : " + offsetValue);
}
});
} }
}; };
@ -629,16 +629,27 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
return relativeOffset; return relativeOffset;
} }
function setVttSubtitleOffset(currentTrack, offsetValue) { function setTextTrackSubtitleOffset(currentTrack, offsetValue) {
if (currentTrack.cues) { if (currentTrack.cues) {
offsetValue = updateCurrentTrackOffset(offsetValue);
Array.from(currentTrack.cues) Array.from(currentTrack.cues)
.forEach(function(cue) { .forEach(function(cue) {
cue.startTime -= offsetValue; cue.startTime -= offsetValue;
cue.endTime -= offsetValue; cue.endTime -= offsetValue;
}); });
} }
}
function setTrackEventsSubtitleOffset(trackEvents, offsetValue) {
if (Array.isArray(trackEvents)) {
offsetValue = updateCurrentTrackOffset(offsetValue);
trackEvents.forEach(function(trackEvent) {
trackEvent.StartPositionTicks -= offsetValue;
trackEvent.EndPositionTicks -= offsetValue;
});
}
} }
self.getSubtitleOffset = function() { self.getSubtitleOffset = function() {
@ -1033,6 +1044,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
return; return;
} }
self.resetSubtitleOffset();
var item = self._currentPlayOptions.item; var item = self._currentPlayOptions.item;
destroyCustomTrack(videoElement); destroyCustomTrack(videoElement);