From 16057cdef792daf2168b3bf23f9466e57d8abe52 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Sat, 14 May 2022 06:36:38 -0500 Subject: [PATCH 1/4] only use jellyfin-ffmpeg for amd64 --- docker/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1e8de13a2..b1b91a65f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -79,12 +79,13 @@ RUN apt-get -qq update \ && apt-get -qq install --no-install-recommends --no-install-suggests -y \ # coral drivers libedgetpu1-max python3-tflite-runtime python3-pycoral \ - jellyfin-ffmpeg \ && pip3 install -U /wheels/*.whl \ - # amd64 specific packages + # arch specific packages && if [ "${TARGETARCH}" = "amd64" ]; then \ - apt-get -qq install --no-install-recommends -y \ - mesa-va-drivers; \ + apt-get -qq install --no-install-recommends --no-install-suggests -y \ + mesa-va-drivers jellyfin-ffmpeg; else \ + apt-get -qq install --no-install-recommends --no-install-suggests -y \ + ffmpeg; \ fi \ && rm -rf /wheels \ && apt-get remove gnupg apt-transport-https -y \ From 4e8ce289489978e7a6143cdb6baffdd3cc57a31d Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Sat, 14 May 2022 06:37:06 -0500 Subject: [PATCH 2/4] center portrait thumbnails --- web/src/routes/Events.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/routes/Events.jsx b/web/src/routes/Events.jsx index 4c8423210..f32f4ac32 100644 --- a/web/src/routes/Events.jsx +++ b/web/src/routes/Events.jsx @@ -388,7 +388,7 @@ export default function Events({ path, ...props }) { onClick={() => (viewEvent === event.id ? setViewEvent(null) : setViewEvent(event.id))} >
Date: Mon, 2 May 2022 15:07:20 -0500 Subject: [PATCH 3/4] Add 16x Playback rate to VideoPlayer.jsx --- web/src/components/VideoPlayer.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/VideoPlayer.jsx b/web/src/components/VideoPlayer.jsx index 24ba747b5..55ca3b212 100644 --- a/web/src/components/VideoPlayer.jsx +++ b/web/src/components/VideoPlayer.jsx @@ -8,7 +8,7 @@ import 'videojs-seek-buttons/dist/videojs-seek-buttons.css'; const defaultOptions = { controls: true, - playbackRates: [0.5, 1, 2, 4, 8], + playbackRates: [0.5, 1, 2, 4, 8, 16], fluid: true, }; const defaultSeekOptions = { From 90bff605fa2e96a16be032f6cbd0a7672ecc2e55 Mon Sep 17 00:00:00 2001 From: Carlos Gustavo Sarmiento Date: Mon, 2 May 2022 16:16:50 -0500 Subject: [PATCH 4/4] Only include 16x if browser is not Firefox --- web/src/components/VideoPlayer.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/src/components/VideoPlayer.jsx b/web/src/components/VideoPlayer.jsx index 55ca3b212..df75ad5e4 100644 --- a/web/src/components/VideoPlayer.jsx +++ b/web/src/components/VideoPlayer.jsx @@ -8,7 +8,7 @@ import 'videojs-seek-buttons/dist/videojs-seek-buttons.css'; const defaultOptions = { controls: true, - playbackRates: [0.5, 1, 2, 4, 8, 16], + playbackRates: [0.5, 1, 2, 4, 8], fluid: true, }; const defaultSeekOptions = { @@ -18,7 +18,11 @@ const defaultSeekOptions = { export default function VideoPlayer({ children, options, seekOptions = {}, onReady = () => {}, onDispose = () => {} }) { const playerRef = useRef(); - + + if (!videojs.browser.IS_FIREFOX) { + defaultOptions.playbackRates.push(16); + } + useEffect(() => { const player = videojs(playerRef.current, { ...defaultOptions, ...options }, () => { onReady(player);