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

Add vtt and ass subtitle-offset in videoplayer

Browse source
This commit is contained in:
redSpoutnik 2019-03-30 22:11:39 +01:00
parent 9677981344
commit 91241ceea1
5 changed files with 157 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -188,6 +188,8 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
var currentAssRenderer;
var customTrackIndex = -1;
var currentTrackOffset;
var videoSubtitlesElem;
var currentTrackEvents;
@ -543,6 +545,65 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
setCurrentTrackElement(index);
};
self.setSubtitleOffset = function(offset) {
var offsetValue = parseFloat(offset);
var videoElement = self._mediaElement;
var mediaStreamTextTracks = getMediaStreamTextTracks(self._currentPlayOptions.mediaSource);
Array.from(videoElement.textTracks)
.filter(trackElement => {
if (customTrackIndex === -1 ) {
// get showing .vtt textTacks
return trackElement.mode === 'showing';
} else {
// get current .ass textTrack
return ("textTrack" + customTrackIndex) === trackElement.id;
}
})
.forEach(trackElement => {
var track = mediaStreamTextTracks.filter(stream => {
return ("textTrack" + stream.Index) === trackElement.id;
})[0];
if(track) {
offsetValue = updateCurrentTrackOffset(offsetValue);
var format = (track.Codec || '').toLowerCase();
if (format !== 'ass' && format !== 'ssa') {
setVttSubtitleOffset(trackElement, offsetValue);
}
} else {
console.log("No available track, cannot apply offset : " + offsetValue);
}
});
};
function updateCurrentTrackOffset(offsetValue) {
var relativeOffset = offsetValue;
var newTrackOffset = offsetValue;
if(currentTrackOffset){
relativeOffset -= currentTrackOffset;
}
currentTrackOffset = newTrackOffset;
// relative to currentTrackOffset
return relativeOffset;
}
function setVttSubtitleOffset(currentTrack, offsetValue) {
if(currentTrack.cues) {
Array.from(currentTrack.cues)
.forEach(cue => {
cue.startTime -= offsetValue;
cue.endTime -= offsetValue;
});
}
}
function isAudioStreamSupported(stream, deviceProfile) {
var codec = (stream.Codec || '').toLowerCase();
@ -1167,6 +1228,11 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
function updateSubtitleText(timeMs) {
// handle offset for ass tracks
if(currentTrackOffset) {
timeMs += (currentTrackOffset * 1000);
}
var clock = currentClock;
if (clock) {
try {

22
src/components/playback/playbackmanager.js
View file

@ -1635,6 +1635,28 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
getPlayerData(player).subtitleStreamIndex = index;
};
self.supportSubtitleOffset = function(player) {
player = player || self._currentPlayer;
return 'setSubtitleOffset' in player;
}
self.isSubtitleStreamExternal = function(index, player) {
var stream = getSubtitleStream(player, index);
return stream ? getDeliveryMethod(stream) === 'External' : false;
}
self.setSubtitleOffset = function (sliderValue, player) {
player = player || self._currentPlayer;
player.setSubtitleOffset(self.getOffsetFromSliderValue(sliderValue));
};
self.getOffsetFromSliderValue = function(value) {
var offset = (value - 50) / 50;
// multiply by offset min/max range value (-x to +x) :
offset *= 30;
return offset.toFixed(1);
};
self.seek = function (ticks, player) {
ticks = Math.max(0, ticks);