mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Fix .ASS offset when seeking a progressive stream
This is needed because progressive stream is actually restarted upon each seek
This commit is contained in:
parent
93f4edd6bb
commit
7ea82f6124
1 changed files with 7 additions and 2 deletions
|
@ -602,7 +602,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
// if .ass currently rendering
|
// if .ass currently rendering
|
||||||
if (currentSubtitlesOctopus) {
|
if (currentSubtitlesOctopus) {
|
||||||
updateCurrentTrackOffset(offsetValue);
|
updateCurrentTrackOffset(offsetValue);
|
||||||
currentSubtitlesOctopus.timeOffset = offsetValue;
|
currentSubtitlesOctopus.timeOffset = (self._currentPlayOptions.transcodingOffsetTicks || 0) / 10000000 + offsetValue;
|
||||||
} else {
|
} else {
|
||||||
var trackElement = getTextTrack();
|
var trackElement = getTextTrack();
|
||||||
// if .vtt currently rendering
|
// if .vtt currently rendering
|
||||||
|
@ -860,7 +860,11 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
loading.hide();
|
loading.hide();
|
||||||
|
|
||||||
htmlMediaHelper.seekOnPlaybackStart(self, e.target, self._currentPlayOptions.playerStartPositionTicks, function () {
|
htmlMediaHelper.seekOnPlaybackStart(self, e.target, self._currentPlayOptions.playerStartPositionTicks, function () {
|
||||||
if (currentSubtitlesOctopus) currentSubtitlesOctopus.resize();
|
if (currentSubtitlesOctopus) {
|
||||||
|
currentSubtitlesOctopus.timeOffset = (self._currentPlayOptions.transcodingOffsetTicks || 0) / 10000000 + currentTrackOffset;
|
||||||
|
currentSubtitlesOctopus.resize();
|
||||||
|
currentSubtitlesOctopus.resetRenderAheadCache(false);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (self._currentPlayOptions.fullscreen) {
|
if (self._currentPlayOptions.fullscreen) {
|
||||||
|
@ -1066,6 +1070,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
onError: function() {
|
onError: function() {
|
||||||
htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror');
|
htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror');
|
||||||
},
|
},
|
||||||
|
timeOffset: (self._currentPlayOptions.transcodingOffsetTicks || 0) / 10000000,
|
||||||
|
|
||||||
// new octopus options; override all, even defaults
|
// new octopus options; override all, even defaults
|
||||||
renderMode: 'blend',
|
renderMode: 'blend',
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue