Skip to content

A self-hosted media server and file management system

feat: chromium based audio track selector

aminnausin670f36fadb8f
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 0ce49b1c..75f74760 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -28,6 +28,7 @@ import AudioSpectrographPanel from '@/components/video/audio/AudioSpectrographPa
import VideoControlWrapper from '@/components/video/VideoControlWrapper.vue';
import VideoPopoverSlider from '@/components/video/popover/VideoPopoverSlider.vue';
import AudioSpectrograph from '@/components/video/audio/AudioSpectrograph.vue';
+import PlayerAudioTracks from '@/components/video/audio/PlayerAudioTracks.vue';
import VideoPopoverItem from '@/components/video/popover/VideoPopoverItem.vue';
import PlayerSubtitles from '@/components/video/subtitles/PlayerSubtitles.vue';
import VideoPartyPanel from '@/components/video/plugins/party/VideoPartyPanel.vue';
@@ -286,6 +287,7 @@ const container = useTemplateRef('player-container');
const playerContextMenu = useTemplateRef('context-menu');
const playerLyrics = useTemplateRef('player-lyrics');
const playerSubtitles = useTemplateRef('player-subtitles');
+const playerAudioTracks = useTemplateRef('player-audio-tracks');
const playerSpectrograph = useTemplateRef('player-spectrograph');
const progressTooltip = computed(() => timeline.value?.progressTooltip);
@@ -945,7 +947,7 @@ function resetControlsTimeout() {
}
function handleControlsTimeout() {
- if (isPaused.value || popover.value?.popoverOpen || playerSubtitles.value?.subtitlesPopover?.popoverOpen) return;
+ if (isPaused.value || popover.value?.popoverOpen || playerSubtitles.value?.subtitlesPopover?.popoverOpen || playerAudioTracks.value?.audioTracksPopover?.popoverOpen) return;
if (controlsHideTimeout.value) clearTimeout(controlsHideTimeout.value);
isShowingControls.value = false;
@@ -1758,14 +1760,21 @@ defineExpose({
<TablerMicrophone2Off v-else class="size-4 *:stroke-[1.4px]" />
</template>
</VideoButton>
- <PlayerSubtitles
- v-else
- ref="player-subtitles"
- :video-button-offset="videoButtonOffset"
- :using-player-modern-u-i="usingPlayerModernUI"
- :get-current-time="getCurrentTime"
- :title="keyBinds.subtitles"
- />
+ <template v-else>
+ <PlayerSubtitles
+ ref="player-subtitles"
+ :video-button-offset="videoButtonOffset"
+ :using-player-modern-u-i="usingPlayerModernUI"
+ :get-current-time="getCurrentTime"
+ :title="keyBinds.subtitles"
+ />
+ <PlayerAudioTracks
+ ref="player-audio-tracks"
+ :video-button-offset="videoButtonOffset"
+ :using-player-modern-u-i="usingPlayerModernUI"
+ :title="'Languages'"
+ />
+ </template>
<VideoPopover
:popoverClass="cn('max-w-42! rounded-lg h-fit', { 'right-0!': usingPlayerModernUI })"
ref="player-popover"
diff --git a/resources/js/components/video/audio/PlayerAudioTracks.vue b/resources/js/components/video/audio/PlayerAudioTracks.vue
new file mode 100644
index 00000000..615e8759
--- /dev/null
+++ b/resources/js/components/video/audio/PlayerAudioTracks.vue
@@ -0,0 +1,106 @@
+<script setup lang="ts">
+import type { Ref } from 'vue';
+
+import { computed, inject, onMounted, ref, useTemplateRef } from 'vue';
+import { useContentStore } from '@/stores/ContentStore';
+import { storeToRefs } from 'pinia';
+import { cn } from '@aminnausin/cedar-ui';
+
+import VideoPopoverItem from '@/components/video/popover/VideoPopoverItem.vue';
+import VideoPopover from '@/components/video/popover/VideoPopover.vue';
+
+import ProiconsCheckmark from '~icons/proicons/checkmark';
+import LucideLanguages from '~icons/lucide/languages';
+
+defineProps<{
+ videoButtonOffset: number;
+ usingPlayerModernUI?: boolean;
+}>();
+
+const { isStateVideoAudio: isAudio } = storeToRefs(useContentStore());
+
+const audioTracksPopover = useTemplateRef('audio-tracks-popover');
+
+const player = inject<Ref<HTMLVideoElement>>('player');
+
+const preferredLanguage = ref<string>();
+const activeTracks = ref<AudioTrack[]>([]);
+const activeTrackId = ref<string>();
+
+const playerAudioTracks = computed(() =>
+ activeTracks.value.map((track) => {
+ const lang = track.language || 'und';
+ const text = [lang, track.id].filter(Boolean).join(' ');
+
+ return {
+ icon: LucideLanguages,
+ text,
+ title: [text, `Title: ${track.label || 'und'}`, `Track: ${track.id}`].join('\n'),
+ selected: track.id === activeTrackId.value,
+ selectedIcon: ProiconsCheckmark,
+ selectedIconStyle: 'text-primary',
+ action: () => handleTrack(track),
+ };
+ }),
+);
+
+const applyPreferredTrack = () => {
+ if (!activeTracks.value) return;
+
+ const match = preferredLanguage.value ? activeTracks.value.find((track) => track.language === preferredLanguage.value) : undefined;
+ const target = match ?? activeTracks.value.find((track) => track.enabled) ?? activeTracks.value[0];
+
+ handleTrack(target, !!match);
+};
+
+const handleTrack = (track: AudioTrack, setLanguage: boolean = true) => {
+ if (!activeTracks.value.length) return;
+
+ for (const tr of activeTracks.value) tr.enabled = tr.id === track.id;
+ activeTrackId.value = track.id;
+
+ if (setLanguage) preferredLanguage.value = track.language || preferredLanguage.value;
+ if (audioTracksPopover.value?.popoverOpen) audioTracksPopover.value?.handleClose();
+};
+
+const onTracksLoaded = () => {
+ activeTracks.value = Array.from(player?.value?.audioTracks ?? []);
+ applyPreferredTrack();
+};
+
+const attachTrackListEvents = () => {
+ if (!player?.value?.audioTracks) return;
+
+ player.value.audioTracks.onaddtrack = onTracksLoaded;
+};
+
+onMounted(() => {
+ attachTrackListEvents();
+});
+
+defineExpose({ audioTracksPopover });
+</script>
+<template>
+ <VideoPopover
+ v-if="!isAudio && playerAudioTracks.length"
+ ref="audio-tracks-popover"
+ :margin="80"
+ :player="player"
+ :popoverClass="cn('max-w-42! rounded-lg h-fit', { 'right-0!': usingPlayerModernUI })"
+ :button-attributes="{
+ 'target-element': player,
+ 'use-tooltip': !audioTracksPopover?.popoverOpen,
+ offset: videoButtonOffset,
+ }"
+ title="Audio Tracks"
+ >
+ <template #buttonIcon>
+ <LucideLanguages class="size-3" />
+ </template>
+ <template #content>
+ <section :class="['scrollbar-minimal flex h-fit max-h-21 flex-col overflow-y-auto transition-transform md:max-h-35', { 'pe-0.5': playerAudioTracks.length > 3 }]">
+ <VideoPopoverItem v-for="(item, index) in playerAudioTracks" :key="index" v-bind="item" class="capitalize *:truncate" />
+ </section>
+ </template>
+ </VideoPopover>
+</template>
diff --git a/resources/js/types/global.d.ts b/resources/js/types/global.d.ts
index 009a9b90..40179814 100644
--- a/resources/js/types/global.d.ts
+++ b/resources/js/types/global.d.ts
@@ -14,4 +14,25 @@ declare global {
Echo: Echo<keyof Broadcaster> | null;
plausible?: PlausibleEvent;
}
+
+ interface AudioTrack {
+ enabled: boolean;
+ readonly id: string;
+ kind: string;
+ readonly label: string;
+ language: string;
+ }
+
+ interface AudioTrackList extends EventTarget {
+ readonly length: number;
+ onaddtrack: ((this: AudioTrackList, ev: Event) => any) | null;
+ onchange: ((this: AudioTrackList, ev: Event) => any) | null;
+ onremovetrack: ((this: AudioTrackList, ev: Event) => any) | null;
+ [index: number]: AudioTrack;
+ getTrackById(id: string): AudioTrack | null;
+ }
+
+ interface HTMLMediaElement {
+ readonly audioTracks: AudioTrackList;
+ }
}