A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: add language specific font support and framerate targets
aminnausindbe4a2dd6d59
diff --git a/public/fonts/NotoSans-Regular.ttf b/public/fonts/NotoSans-Regular.ttfnew file mode 100644index 00000000..4bac02f2Binary files /dev/null and b/public/fonts/NotoSans-Regular.ttf differdiff --git a/public/fonts/NotoSansSC-Regular.ttf b/public/fonts/NotoSansSC-Regular.ttfnew file mode 100644index 00000000..9c21fd3fBinary files /dev/null and b/public/fonts/NotoSansSC-Regular.ttf differdiff --git a/public/fonts/NotoSansTC-Regular.ttf b/public/fonts/NotoSansTC-Regular.ttfnew file mode 100644index 00000000..807c2af1Binary files /dev/null and b/public/fonts/NotoSansTC-Regular.ttf differdiff --git a/public/fonts/NotoSansThai-Regular.ttf b/public/fonts/NotoSansThai-Regular.ttfnew file mode 100644index 00000000..54f3e29aBinary files /dev/null and b/public/fonts/NotoSansThai-Regular.ttf differdiff --git a/public/fonts/Roboto-Medium.ttf b/public/fonts/Roboto-Medium.ttfdeleted file mode 100644index d629e984..00000000Binary files a/public/fonts/Roboto-Medium.ttf and /dev/null differdiff --git a/resources/js/components/video/subtitles/OctopusRenderer.ts b/resources/js/components/video/subtitles/OctopusRenderer.tsindex 96ac4ac6..ba0f7375 100644--- a/resources/js/components/video/subtitles/OctopusRenderer.ts+++ b/resources/js/components/video/subtitles/OctopusRenderer.ts@@ -1,26 +1,32 @@import type { SubtitlesOctopusOptions } from '@jellyfin/libass-wasm';import type SubtitlesOctopus from '@jellyfin/libass-wasm';+import { ref } from 'vue';export default function useOctopusRenderer() {const assInstance = ref<SubtitlesOctopus | null>(null);- const instantiateOctopus = async (subUrl: string) => {+ const instantiateOctopus = async (subUrl: string, language?: string, frameRate?: number) => {clearOctopus();const video = document.getElementById('video-source') as HTMLVideoElement;if (!video) return;+ const baseFonts = ['/fonts/Rubik-Regular.ttf']; // Latin, Arabic, Cyrillic+ const supplementalFonts = generateLanguageFonts(language);+import('@jellyfin/libass-wasm').then(({ default: SubtitlesOctopus }) => {const options: SubtitlesOctopusOptions = {video,subUrl,- fonts: ['/fonts/Roboto-Medium.ttf', '/fonts/Rubik-Regular.ttf', '/fonts/KleeOne-Regular.ttf'],+ fonts: [...baseFonts, ...supplementalFonts],workerUrl: '/build/lib/subtitles-octopus/subtitles-octopus-worker.js',- fallbackFont: '/fonts/DejaVuSans.ttf',+ fallbackFont: '/fonts/NotoSans-Regular.ttf',onError(e?: any) {console.log('Subtitles failed', e);clearOctopus();},+ targetFps: frameRate || 24,+ renderAhead: 60,};assInstance.value = new SubtitlesOctopus(options);});@@ -28,15 +34,40 @@ export default function useOctopusRenderer() {const clearOctopus = () => {if (assInstance.value?.worker) {+ // Supposedly the jellyfin version disposes itself on error?assInstance.value.dispose();- assInstance.value = null;}+ assInstance.value = null;};const resizeOctopus = () => {if (assInstance.value?.worker) assInstance.value.resize();};+ /**+ * Generates a list of language specific fonts based on a predetermined list of files+ *+ * Supports Thai, Japanese, Chinese+ *+ * @param language Language code+ * @returns string[] Language specific fonts+ */+ const generateLanguageFonts = (language?: string): string[] => {+ switch (language?.toLowerCase()) {+ case 'tha':+ return ['/fonts/NotoSansThai-Regular.ttf'];+ case 'jpn':+ return ['/fonts/KleeOne-Regular.ttf'];+ case 'cn':+ case 'chi':+ case 'tc':+ case 'sc':+ return ['/fonts/NotoSansSC-Regular.ttf', '/fonts/NotoSansTC-Regular.ttf'];+ default:+ return [];+ }+ };+return {instantiateOctopus,clearOctopus,diff --git a/resources/js/components/video/subtitles/PlayerSubtitles.vue b/resources/js/components/video/subtitles/PlayerSubtitles.vueindex 659a06eb..dadba8d9 100644--- a/resources/js/components/video/subtitles/PlayerSubtitles.vue+++ b/resources/js/components/video/subtitles/PlayerSubtitles.vue@@ -128,7 +128,7 @@ const handleSubtitles = async (track?: SubtitleResource) => {if (nextTrack?.codec === 'ass') {const languageTag = nextTrack.track_id === 0 ? `.${nextTrack.language}` : '';- instantiateOctopus(`/data/subtitles/${nextTrack.metadata_uuid}/${nextTrack.track_id}${languageTag}.ass`);+ instantiateOctopus(`/data/subtitles/${nextTrack.metadata_uuid}/${nextTrack.track_id}${languageTag}.ass`, nextTrack.language, stateVideo.value.metadata?.frame_rate);hideAllTracks();return;}diff --git a/resources/js/types/subtitles-octopus.d.ts b/resources/js/types/subtitles-octopus.d.tsindex a1df9198..237fbb8e 100644--- a/resources/js/types/subtitles-octopus.d.ts+++ b/resources/js/types/subtitles-octopus.d.ts@@ -22,6 +22,7 @@ declare module '@jellyfin/libass-wasm' {debug?: boolean;targetFps?: number;+ renderAhead?: number;onError?: () => void;}