A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: fading ambient mode
aminnausin352d56c13dc2
diff --git a/resources/js/components/video/VideoAmbientPlayer.vue b/resources/js/components/video/VideoAmbientPlayer.vueindex 6666d9c4..081dfc73 100755--- a/resources/js/components/video/VideoAmbientPlayer.vue+++ b/resources/js/components/video/VideoAmbientPlayer.vue@@ -12,17 +12,41 @@ const { stateVideo } = storeToRefs(useContentStore());const container = ref<null | HTMLElement>(null);const player = ref<null | HTMLVideoElement>(null);const canvas = ref<null | HTMLCanvasElement>(null);-const step = ref<undefined | number>(undefined);const ctx = ref<null | CanvasRenderingContext2D>(null);-const adjustTimeout = ref<null | number>(null);+const adjustTimeout = ref<null | number>(null); //timeout for resizing canvas+const drawInterval = ref<null | number>(null); //interval for fading between framesconst videoPlayer = useTemplateRef('video-player');const isAudio = ref(false);const isDrawing = ref(false);+const prevFrame = ref<null | ImageData>(null);+const blendStrength = ref(0.03);+const drawDelay = ref(50); //ms between each draw call for fading between frames+const draw = () => {if (!ctx.value || !player.value || !canvas.value) return;- ctx.value.drawImage(player.value, 0, 0, canvas.value.width, canvas.value.height);++ const { width, height } = canvas.value;++ ctx.value.drawImage(player.value, 0, 0, width, height);++ const newFrame = ctx.value.getImageData(0, 0, width, height);++ if (prevFrame.value) {+ const newData = newFrame.data;+ const prevData = prevFrame.value.data;++ for (let i = 0; i < newData.length; i += 4) {+ newData[i] = newData[i] * blendStrength.value + prevData[i] * (1 - blendStrength.value); // R+ newData[i + 1] = newData[i + 1] * blendStrength.value + prevData[i + 1] * (1 - blendStrength.value); // G+ newData[i + 2] = newData[i + 2] * blendStrength.value + prevData[i + 2] * (1 - blendStrength.value); // B+ }++ ctx.value.putImageData(newFrame, 0, 0);+ }++ prevFrame.value = newFrame;};const drawStart = () => {@@ -33,32 +57,51 @@ const drawStart = () => {};const drawLoop = () => {- if (!player.value || lightMode.value || !canvas.value || !ambientMode.value) {- drawPause();- return;- }+ drawPause();++ if (!player.value || lightMode.value || !canvas.value || !ambientMode.value) return;- draw();- step.value = window.requestAnimationFrame(drawLoop);+ // draw();+ drawInterval.value = window.setInterval(draw, drawDelay.value);};const drawPause = () => {isDrawing.value = false;- if (!step.value) return;- window.cancelAnimationFrame(step.value);- step.value = undefined;+ if (drawInterval.value !== null) {+ clearInterval(drawInterval.value);+ drawInterval.value = null;+ }};const adjustOverlayDiv = () => {if (!ambientMode.value || !container.value || !player.value || !canvas.value) return;- const parentWidth = container.value.offsetWidth;- const parentHeight = container.value.offsetHeight;- canvas.value.style.width = `${parentWidth - 16}px`;- canvas.value.style.height = `${parentHeight - 16}px`;- canvas.value.style.top = '8px';- canvas.value.style.left = '8px';+ if (isAudio.value) {+ canvas.value.style.width = '0';+ canvas.value.style.height = '0';+ return;+ }++ const { videoWidth, videoHeight, offsetWidth, offsetHeight } = player.value;++ const elementAspect = offsetWidth / offsetHeight;+ const videoAspect = videoWidth / videoHeight;+ const sizeOffset = -16;++ let width, height;++ if (elementAspect > videoAspect) {+ height = offsetHeight;+ width = height * videoAspect;+ } else {+ width = offsetWidth;+ height = width / videoAspect;+ }++ canvas.value.style = `width: ${width + sizeOffset}px !important; height: ${height + sizeOffset}px; !important`;++ prevFrame.value = null;};const onLoadedMetadata = async () => {@@ -74,7 +117,9 @@ const onLoadedMetadata = async () => {onMounted(() => {window.addEventListener('resize', adjustOverlayDiv);adjustOverlayDiv(); // Adjust initially in case video metadata is already loaded- if (canvas.value) ctx.value = canvas.value.getContext('2d');++ if (canvas.value) ctx.value = canvas.value.getContext('2d', { willReadFrequently: true });+player.value = document.getElementById('vid-source') as HTMLVideoElement;});@@ -85,7 +130,7 @@ onUnmounted(() => {});watch(- () => ambientMode.value,+ () => [ambientMode.value, lightMode.value],() => {if (!ambientMode.value) {drawPause();@@ -113,24 +158,43 @@ watch(<template><section class="w-full h-fit relative" ref="container">- <canvas- v-cloak- v-show="!lightMode && ambientMode && !isAudio"- width="6"- :height="isAudio ? '6' : '4'"- aria-hidden="true"- tabindex="-1"- class="absolute opacity-100 blur-xl pointer-events-none w-full h-full"- ref="canvas"- >- </canvas>+ <span class="pointer-events-none absolute w-full h-full flex">+ <Transition enter-to-class="opacity-100" enter-from-class="opacity-0" leave-from-class="opacity-100" leave-to-class="opacity-0">+ <canvas+ v-cloak+ v-show="!lightMode && ambientMode && !isAudio"+ width="6"+ :height="isAudio ? '6' : '4'"+ aria-hidden="true"+ tabindex="-1"+ class="blur-xl mx-auto my-auto transition-opacity duration-700"+ ref="canvas"+ >+ </canvas>+ </Transition>+ </span><!-- This is in place of an ambient background because audio does not have video to use for the effect -->- <img- v-show="isAudio && ambientMode"- class="absolute opacity-100 blur pointer-events-none w-full h-full object-cover"- :src="videoPlayer?.audioPoster ?? ''"- alt="Video Poster"- />++ <Transition enter-to-class="opacity-100" enter-from-class="opacity-0" leave-from-class="opacity-100" leave-to-class="opacity-0">+ <img+ v-show="isAudio && ambientMode"+ class="absolute transition-opacity duration-300 ease-in-out blur pointer-events-none w-full h-full object-cover"+ :src="videoPlayer?.audioPoster ?? ''"+ alt="Video Poster"+ />+ </Transition><VideoPlayer ref="video-player" class="w-full" @seeked="draw" @play="drawStart" @pause="drawPause" @ended="drawPause" @loaded-metadata="onLoadedMetadata" />++ <svg class="w-0 h-0" v-if="!ambientMode && false">+ <filter id="blur-and-scale" color-interpolation-filters="sRGB" y="-50%" x="-50%" width="200%" height="200%">+ <feGaussianBlur in="SourceGraphic" stdDeviation="12" result="blurred" />+ <feComposite in="SourceGraphic" in2="blurred" operator="over" />+ </filter>+ </svg></section></template>+<style lang="css" scoped>+.filter-blur {+ filter: url(#blur-and-scale);+}+</style>diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex abcdf39e..c8fc683c 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -851,7 +851,7 @@ defineExpose({<template><div- :class="`relative ${isFullScreen ? '' : 'rounded-xl overflow-clip '}video-player`"+ :class="`relative${isFullScreen ? '' : ' rounded-xl'} video-player overflow-clip`"ref="video-container"@mousemove="playerMouseActivity"@contextmenu="@@ -895,7 +895,6 @@ defineExpose({<track kind="captions" />Your browser does not support the video tag.</video>-<section style="z-index: 4" :class="`player-controls text-white pointer-events-none ${controls ? 'cursor-auto' : 'cursor-none'}`"><!-- Video Stats (Z-6) --><section class="absolute p-1 sm:p-4 top-0 left-0 text-xs font-mono pointer-events-auto" v-show="isShowingStats" style="z-index: 6">@@ -1247,7 +1246,6 @@ defineExpose({><p v-show="isChangingVolume" class="text-transparent pointer-events-none select-none px-2 py-1 rounded-full">{{ Math.round(currentVolume * 100) }}%</p></Transition>- <span class="w-full h-1/5 sm:h-1/6 absolute top-0 pointer-events-auto"></span><span class="w-full h-1/6 absolute bottom-0 pointer-events-auto"></span></span><spandiff --git a/resources/js/layouts/LayoutBase.vue b/resources/js/layouts/LayoutBase.vueindex bd4bfdb4..5c3e3aa5 100755--- a/resources/js/layouts/LayoutBase.vue+++ b/resources/js/layouts/LayoutBase.vue@@ -73,7 +73,7 @@ watch(id="content-card"class="col-span-full lg:col-span-6 2xl:col-span-4 flex-grow order-1 lg:order-2 bg-primary-900 dark:bg-primary-dark-900 dark:text-[#e2e0e2] sm:shadow-xl p-6 pt-3 sm:rounded-2xl w-full h-fit flex flex-col gap-3 sm:ring-1 ring-gray-900/5">- <NavBar class="z-20" />+ <NavBar /><slot name="content" class="relative z-0"></slot></section><sectiondiff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.phpindex 55bc08b1..7165e716 100755--- a/resources/views/layouts/app.blade.php+++ b/resources/views/layouts/app.blade.php@@ -20,7 +20,7 @@@vite('resources/css/app.css')<style>html {- scrollbar-gutter: stable;+ scrollbar-gutter: stable both-edges;}html.fullscreen {