A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: use a getter instead of video.property for setting initial subtitles time
aminnausine1a1f7a1b2ce
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex f1f14708..e39d0a76 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -1522,6 +1522,7 @@ defineExpose({ref="player-subtitles":video-button-offset="videoButtonOffset":using-player-modern-u-i="usingPlayerModernUI"+ :get-current-time="getCurrentTime":title="keyBinds.subtitles"/><VideoPopoverdiff --git a/resources/js/components/video/subtitles/OctopusRenderer.ts b/resources/js/components/video/subtitles/OctopusRenderer.tsindex cec5a5c2..dfdf6e13 100644--- a/resources/js/components/video/subtitles/OctopusRenderer.ts+++ b/resources/js/components/video/subtitles/OctopusRenderer.ts@@ -9,7 +9,7 @@ export default function useOctopusRenderer() {const assInstance = ref<SubtitlesOctopus | null>(null);const abortController = ref<AbortController | null>(null);- const instantiateOctopus = async (nextTrack: SubtitleResource, currentTime: number, frameRate?: number) => {+ const instantiateOctopus = async (nextTrack: SubtitleResource, getCurrentTime: () => number, frameRate?: number) => {const video = document.getElementById('video-source') as HTMLVideoElement;if (!video) return;if (assInstance.value) clearOctopus();@@ -54,10 +54,10 @@ export default function useOctopusRenderer() {clearOctopus();},targetFps: frameRate || 24,+ renderAhead: 90,};assInstance.value = new SubtitlesOctopus(options);-- assInstance.value.setCurrentTime(currentTime);+ assInstance.value.setCurrentTime(getCurrentTime());});} catch (e) {if (e instanceof DOMException && e.name === 'AbortError') return;diff --git a/resources/js/components/video/subtitles/PlayerSubtitles.vue b/resources/js/components/video/subtitles/PlayerSubtitles.vueindex 35a7d056..3b52bc9b 100644--- a/resources/js/components/video/subtitles/PlayerSubtitles.vue+++ b/resources/js/components/video/subtitles/PlayerSubtitles.vue@@ -22,6 +22,7 @@ import LucideCaptions from '~icons/lucide/captions';interface PlayerSubtitlesProps {videoButtonOffset: number;usingPlayerModernUI?: boolean;+ getCurrentTime: () => number;}const { instantiateOctopus, clearOctopus, resizeOctopus } = useOctopusRenderer();@@ -127,9 +128,7 @@ const handleSubtitles = async (track?: SubtitleResource) => {currentSubtitleTrack.value = nextTrack;if (nextTrack?.codec === 'ass') {- console.log(player.value.currentTime);-- instantiateOctopus(nextTrack, player.value.currentTime, stateVideo.value.metadata?.frame_rate);+ instantiateOctopus(nextTrack, props.getCurrentTime, stateVideo.value.metadata?.frame_rate);hideAllTracks();return;}