milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3644 from dmitrylyzo/bump-jso

Browse source 
(cherry picked from commit a36f515b3089058fba1fecfd87e62b57950ac869)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
This commit is contained in:
Joshua M. Boniface 2022-05-15 22:10:42 -04:00 • committed by Joshua Boniface
parent 00c6d7e1a8
commit 7e0b442e38
4 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
package-lock.json generated
View file

@ -2471,6 +2471,11 @@
"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
"dev": true "dev": true
}, },
"@jellyfin/libass-wasm": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/@jellyfin/libass-wasm/-/libass-wasm-4.1.0.tgz",
"integrity": "sha512-2qOlszGw998SpB7GEFLXksHNAQHIDUye4WxfWRl7VmXfYILbvUM/tQN63KBrQzV0TJyyY84wpcnJN13Oi+JeOQ=="
},
"@jridgewell/resolve-uri": { "@jridgewell/resolve-uri": {
"version": "3.0.5", "version": "3.0.5",
"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
@ -8102,10 +8107,6 @@
"resolved": "https://registry.npmjs.org/libarchive.js/-/libarchive.js-1.3.0.tgz", "resolved": "https://registry.npmjs.org/libarchive.js/-/libarchive.js-1.3.0.tgz",
"integrity": "sha512-EkQfRXt9DhWwj6BnEA2TNpOf4jTnzSTUPGgE+iFxcdNqjktY8GitbDeHnx8qZA0/IukNyyBUR3oQKRdYkO+HFg==" "integrity": "sha512-EkQfRXt9DhWwj6BnEA2TNpOf4jTnzSTUPGgE+iFxcdNqjktY8GitbDeHnx8qZA0/IukNyyBUR3oQKRdYkO+HFg=="
}, },
"libass-wasm": {
"version": "git+https://github.com/jellyfin/JavascriptSubtitlesOctopus.git#f4625ac313b318bd5d2e0ae18679ff516370bae6",
"from": "libass-wasm@git+https://github.com/jellyfin/JavascriptSubtitlesOctopus.git#4.0.0-jf-4"
},
"lie": { "lie": {
"version": "3.1.1", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",

2
package.json
View file

@ -69,6 +69,7 @@
"@fontsource/noto-sans-jp": "4.5.2", "@fontsource/noto-sans-jp": "4.5.2",
"@fontsource/noto-sans-kr": "4.5.2", "@fontsource/noto-sans-kr": "4.5.2",
"@fontsource/noto-sans-sc": "4.5.2", "@fontsource/noto-sans-sc": "4.5.2",
"@jellyfin/libass-wasm": "4.1.0",
"@fontsource/noto-sans-tc": "4.5.2", "@fontsource/noto-sans-tc": "4.5.2",
"blurhash": "1.1.4", "blurhash": "1.1.4",
"classlist.js": "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz", "classlist.js": "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz",
@ -88,7 +89,6 @@
"jquery": "3.6.0", "jquery": "3.6.0",
"jstree": "3.3.12", "jstree": "3.3.12",
"libarchive.js": "1.3.0", "libarchive.js": "1.3.0",
"libass-wasm": "git+https://github.com/jellyfin/JavascriptSubtitlesOctopus.git#4.0.0-jf-4",
"lodash-es": "4.17.21", "lodash-es": "4.17.21",
"marked": "4.0.10", "marked": "4.0.10",
"material-design-icons-iconfont": "6.1.1", "material-design-icons-iconfont": "6.1.1",

10
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -1102,18 +1102,18 @@ function tryRemoveElement(elem) {
timeOffset: (this._currentPlayOptions.transcodingOffsetTicks || 0) / 10000000, timeOffset: (this._currentPlayOptions.transcodingOffsetTicks || 0) / 10000000,
// new octopus options; override all, even defaults // new octopus options; override all, even defaults
renderMode: 'blend', renderMode: 'wasm-blend',
dropAllAnimations: false, dropAllAnimations: false,
libassMemoryLimit: 40, libassMemoryLimit: 40,
libassGlyphLimit: 40, libassGlyphLimit: 40,
targetFps: 24, targetFps: 24,
prescaleTradeoff: 0.8, prescaleFactor: 0.8,
softHeightLimit: 1080, prescaleHeightLimit: 1080,
hardHeightLimit: 2160, maxRenderHeight: 2160,
resizeVariation: 0.2, resizeVariation: 0.2,
renderAhead: 90 renderAhead: 90
}; };
import('libass-wasm').then(({default: SubtitlesOctopus}) => { import('@jellyfin/libass-wasm').then(({default: SubtitlesOctopus}) => {
Promise.all([ Promise.all([
apiClient.getNamedConfiguration('encoding'), apiClient.getNamedConfiguration('encoding'),
// Worker in Tizen 5 doesn't resolve relative path with async request // Worker in Tizen 5 doesn't resolve relative path with async request

12
webpack.common.js
View file

@ -7,12 +7,12 @@ const { DefinePlugin } = require('webpack');
const Assets = [ const Assets = [
'native-promise-only/npo.js', 'native-promise-only/npo.js',
'libarchive.js/dist/worker-bundle.js', 'libarchive.js/dist/worker-bundle.js',
'libass-wasm/dist/js/subtitles-octopus-worker.js', '@jellyfin/libass-wasm/dist/js/subtitles-octopus-worker.js',
'libass-wasm/dist/js/subtitles-octopus-worker.data', '@jellyfin/libass-wasm/dist/js/subtitles-octopus-worker.data',
'libass-wasm/dist/js/subtitles-octopus-worker.wasm', '@jellyfin/libass-wasm/dist/js/subtitles-octopus-worker.wasm',
'libass-wasm/dist/js/subtitles-octopus-worker-legacy.js', '@jellyfin/libass-wasm/dist/js/subtitles-octopus-worker-legacy.js',
'libass-wasm/dist/js/subtitles-octopus-worker-legacy.data', '@jellyfin/libass-wasm/dist/js/subtitles-octopus-worker-legacy.data',
'libass-wasm/dist/js/subtitles-octopus-worker-legacy.js.mem', '@jellyfin/libass-wasm/dist/js/subtitles-octopus-worker-legacy.js.mem',
'pdfjs-dist/build/pdf.worker.js' 'pdfjs-dist/build/pdf.worker.js'
]; ];