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

Fallback to empty fonts list when server doesn't send MediaAttachments.

Browse source
This commit is contained in:
Andrew Mahone 2019-11-08 08:38:21 -05:00
parent 1927c2eb9b
commit 0880f36dab
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1038,10 +1038,11 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
} }
function renderWithSubtitlesOctopus(videoElement, track, item) { function renderWithSubtitlesOctopus(videoElement, track, item) {
var attachments = self._currentPlayOptions.mediaSource.MediaAttachments || [];
var options = { var options = {
video: videoElement, video: videoElement,
subUrl: getTextTrackUrl(track, item), subUrl: getTextTrackUrl(track, item),
fonts: self._currentPlayOptions.mediaSource.MediaAttachments.map(i => i.DeliveryUrl), fonts: attachments.map(i => i.DeliveryUrl),
workerUrl: appRouter.baseUrl() + "/node_modules/libass-wasm/dist/subtitles-octopus-worker.js", workerUrl: appRouter.baseUrl() + "/node_modules/libass-wasm/dist/subtitles-octopus-worker.js",
onError: function() { onError: function() {
htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror') htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror')

5
yarn.lock
View file

@ -2510,6 +2510,11 @@ levn@^0.3.0, levn@~0.3.0:
prelude-ls "~1.1.2" prelude-ls "~1.1.2"
type-check "~0.3.2" type-check "~0.3.2"
libass-wasm@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/libass-wasm/-/libass-wasm-2.1.1.tgz#f12f4fdb9579dd422dcbc348bc3bd61097f4d07d"
integrity sha512-d45bHQ7tFVsLW3QstQDrDog2m+0D6Cja4GTrkGi70R9A5+aeLunPSUz3G4CVB+sKffNgiWjK4QI5NZLHQKZ9oQ==
libjass@^0.11.0: libjass@^0.11.0:
version "0.11.0" version "0.11.0"
resolved "https://registry.yarnpkg.com/libjass/-/libjass-0.11.0.tgz#bff1f464a2428c3bddfb68e4503b2d52afe3d6e6" resolved "https://registry.yarnpkg.com/libjass/-/libjass-0.11.0.tgz#bff1f464a2428c3bddfb68e4503b2d52afe3d6e6"