Skip to content

A self-hosted media server and file management system

feat: show buffer on progress bar

aminnausin466c4edce785
diff --git a/resources/css/app.css b/resources/css/app.css
index 7f017a71..e016fc6b 100755
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -122,19 +122,40 @@
--track-color: rgba(255, 255, 255, 0.3);
--track-rounded: 9999px;
--progress-color: #111827;
+ --buffer-color: rgba(255, 255, 255, 0.3);
+ --thumb-color: #ffffff;
+ --buffer: 0;
+
+ appearance: none;
+ cursor: pointer;
+ overflow: hidden;
+
+ transition-property: height, border-radius, margin-top, margin-bottom;
+ transition-duration: 200ms;
+ transition-timing-function: ease-in-out;
+ will-change: transform;
+
+ background-color: var(--track-color);
+ border-radius: var(--track-rounded);
+ }
+
+ .slider.volume {
+ --progress-color: #9333eaca;
}
.slider.timeline {
--thumb-size: 1;
+ height: calc(var(--thumb-size) * 0.25rem);
+ margin-top: calc(var(--thumb-size) * 0.125rem);
+ margin-bottom: calc(var(--thumb-size) * 0.125rem);
}
.slider.timeline:hover {
--thumb-size: 2;
- }
-
- .slider.volume {
- --thumb-color: #ffffff;
- --progress-color: #9333eaca;
+ height: calc(var(--thumb-size) * 0.25rem);
+ margin-top: 0rem;
+ margin-bottom: 0rem;
+ border-radius: 1px;
}
/* WebKit (Chrome, Safari) */
@@ -149,10 +170,25 @@
box-shadow: -995px 0 0 992px var(--progress-color);
}
+ .slider.timeline::-webkit-slider-thumb,
+ .slider.timeline::-moz-range-thumb {
+ box-shadow: -995px 0 0 993px var(--progress-color);
+ }
+
+ .slider.timeline:hover::-webkit-slider-thumb,
+ .slider.timeline::-moz-range-thumb {
+ box-shadow: -995px 0 0 991px var(--progress-color);
+ }
+
.slider::-webkit-slider-runnable-track {
- background: var(--track-color);
- border-radius: var(--track-rounded);
- overflow: hidden;
+ background: linear-gradient(
+ to right,
+ var(--buffer-color) 0%,
+
+ var(--buffer-color) calc(var(--buffer, 0) * 1%),
+ rgba(0, 0, 0, 0) calc(var(--buffer, 0) * 1%),
+ rgba(0, 0, 0, 0) 100%
+ );
}
/* Firefox */
@@ -164,27 +200,24 @@
border-radius: var(--thumb-rounded);
width: calc(var(--thumb-size) * 0.25rem);
height: calc(var(--thumb-size) * 0.25rem);
+ box-shadow: -995px 0 0 992px var(--progress-color);
}
.slider::-moz-range-track {
transition: all 200ms ease-in-out;
- background: var(--track-color);
+
+ background: linear-gradient(to right, var(--buffer-color) calc(var(--buffer) * 1%), var(rgba(0, 0, 0, 0)) calc(var(--buffer) * 1%), var(rgba(0, 0, 0, 0)) 100%);
+ /* background: transparent; */
+
border-radius: var(--track-rounded);
height: calc(var(--thumb-size) * 0.25rem);
}
.slider::-moz-range-progress {
transition: all 200ms ease-in-out;
- background: var(--progress-color);
- border-radius: var(--track-rounded);
- height: calc(var(--thumb-size) * 0.25rem);
- }
- .slider.timeline:hover::-moz-range-track,
- .slider.timeline:hover::-moz-range-progress {
- border-radius: 1px;
- }
- .slider.timeline:hover::-webkit-slider-runnable-track {
- border-radius: 1px;
+ background: transparent;
+
+ height: calc(var(--thumb-size) * 0.25rem);
}
}
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 30845da9..d050f157 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -123,9 +123,13 @@ const isMuted = ref(false);
// Player Info
const endsAtTime = ref('00:00');
-const bufferHealth = ref<string>('0s');
+const bufferTime = ref<number>(0);
+const bufferPercentage = ref<number>(0);
const frameHealth = ref<string>('0/0');
const playerHealthCounter = ref(0);
+const bufferHealth = computed(() => {
+ return toFormattedDuration(bufferTime.value, false) ?? '0s';
+});
const videoButtonOffset = computed(() => {
return 8 + (isFullScreen.value ? 8 : 0);
});
@@ -314,6 +318,8 @@ const initVideoPlayer = async () => {
isPictureInPicture.value = false;
currentSpeed.value = 1;
currentId.value = -1;
+ bufferPercentage.value = 0;
+ bufferTime.value = 0;
timeElapsed.value = 0; // HOTFIX: I do not know why this wasn't here already but if a video is changed before the previous one loaded, the time is not reset
if (!root) return;
@@ -441,7 +447,6 @@ const onPlayerPlay = async (override = false, recordProgress = true) => {
updateViewCount(stateVideo.value.id);
handleProgress(true);
getEndTime();
- getPlayerInfo();
if (isMediaSession.value) navigator.mediaSession.playbackState = 'playing';
} catch (error) {
if ((error instanceof DOMException && error.name === 'AbortError') || playRequestId !== latestPlayRequestId.value) {
@@ -685,7 +690,7 @@ const handleSeek = (seconds?: number) => {
const onSeeked = () => {
debouncedEndTime();
emit('seeked');
-
+ getPlayerInfo();
if (isPaused.value) {
isLoading.value = false;
return;
@@ -762,7 +767,8 @@ function getPlayerInfo() {
}
}
- bufferHealth.value = toFormattedDuration(bufferedSeconds, false) ?? '0s';
+ bufferTime.value = bufferedSeconds;
+ bufferPercentage.value = (bufferedSeconds / timeDuration.value) * 100 + timeElapsed.value;
frameHealth.value = `${playbackQuality.droppedVideoFrames} / ${playbackQuality.totalVideoFrames}`;
}
@@ -1154,10 +1160,10 @@ defineExpose({
max="100"
value="0"
step="0.01"
- :class="
- `peer w-full h-2 appearance-none flex items-center cursor-pointer bg-transparent slider timeline pointer-events-auto focus:outline-none ` + // Base Class
- `[&::-webkit-slider-thumb]:!bg-white [&::-moz-range-thumb]:!bg-white ` // Thumb Colour
- "
+ :class="[`peer w-full h-2 flex items-center slider timeline pointer-events-auto focus:outline-none`]"
+ :style="{
+ '--buffer': bufferPercentage,
+ }"
:aria-valuetext="timeStrings.timeElapsedVerbose"
/>
<VideoHeatmap :playback-data="playbackData" />
diff --git a/resources/js/components/video/VideoPopoverSlider.vue b/resources/js/components/video/VideoPopoverSlider.vue
index f74facd6..c84e57bc 100644
--- a/resources/js/components/video/VideoPopoverSlider.vue
+++ b/resources/js/components/video/VideoPopoverSlider.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { PopoverSlider } from '@/types/types';
-const props = withDefaults(defineProps<PopoverSlider>(), { min: 10, max: 200, step: 5 });
+withDefaults(defineProps<PopoverSlider>(), { min: 10, max: 200, step: 5 });
const model = defineModel();
</script>
<template>
@@ -16,14 +16,6 @@ const model = defineModel();
<span class="text-nowrap">{{ text }}</span>
<span class="ml-auto text-xs tracking-wide opacity-60">{{ shortcut ?? '' }}</span>
- <input
- type="range"
- @input="action"
- :min="min"
- :max="max"
- :step="step"
- v-model="model"
- :class="`w-full appearance-none flex items-center cursor-pointer bg-transparent slider volume`"
- />
+ <input type="range" @input="action" :min="min" :max="max" :step="step" v-model="model" :class="`w-full h-2 slider volume`" />
</section>
</template>
diff --git a/resources/js/components/video/VideoSlider.vue b/resources/js/components/video/VideoSlider.vue
index 46b0ddcf..0ea2a1e5 100644
--- a/resources/js/components/video/VideoSlider.vue
+++ b/resources/js/components/video/VideoSlider.vue
@@ -45,9 +45,7 @@ watch(
);
</script>
<template>
- <div
- class="relative h-full flex items-center mx-1 sm:mx-0 sm:group-hover:mx-1 rounded-full sm:group-hover:w-12 sm:invisible sm:group-hover:visible w-12 sm:w-0 ease-out duration-300"
- >
+ <div class="relative h-full flex items-center mx-1 sm:mx-0 sm:group-hover:mx-1 sm:group-hover:w-12 sm:invisible sm:group-hover:visible w-12 sm:w-0 ease-out duration-300">
<input
v-model="model"
@input="action"
@@ -58,7 +56,7 @@ watch(
min="0"
max="1"
step="0.01"
- :class="`w-full h-1.5 appearance-none flex items-center cursor-pointer bg-transparent slider volume${style ? ` ${style}` : ''}`"
+ :class="['w-full h-2 slider volume', style]"
:title="title"
/>
<VideoTooltipBase v-if="useTooltip" v-cloak :tooltip-text="text" :tooltip-arrow="tooltipArrow" ref="tooltip" :target-element="targetElement" />