From 7444a7d3446dd732140d426d9551b85498c7caf6 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Mon, 23 Sep 2024 07:07:35 +1200 Subject: [PATCH] Add VITE_DEFAULT_DASH_BITRATE --- materialious/Dockerfile | 1 + materialious/replace_env_vars.sh | 1 + materialious/src/lib/Player.svelte | 9 ++++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/materialious/Dockerfile b/materialious/Dockerfile index 440a8175..763b4784 100644 --- a/materialious/Dockerfile +++ b/materialious/Dockerfile @@ -20,6 +20,7 @@ RUN echo "VITE_DEFAULT_INVIDIOUS_INSTANCE=VITE_DEFAULT_INVIDIOUS_INSTANCE_PLACEH echo "VITE_DEFAULT_DOWNLOAD_ENABLED=VITE_DEFAULT_DOWNLOAD_ENABLED_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_SYNCIOUS_INSTANCE=VITE_DEFAULT_SYNCIOUS_INSTANCE_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_API_EXTENDED_INSTANCE=VITE_DEFAULT_API_EXTENDED_INSTANCE_PLACEHOLDER" >> .env && \ + echo "VITE_DEFAULT_DASH_BITRATE=VITE_DEFAULT_DASH_BITRATE_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_SETTINGS='\"VITE_DEFAULT_SETTINGS_PLACEHOLDER\"'" >> .env && \ echo "VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE=VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE_PLACEHOLDER" >> .env diff --git a/materialious/replace_env_vars.sh b/materialious/replace_env_vars.sh index 721c7226..329fb6d3 100644 --- a/materialious/replace_env_vars.sh +++ b/materialious/replace_env_vars.sh @@ -12,5 +12,6 @@ find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VI find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_PEERJS_PORT_PLACEHOLDER|'"$VITE_DEFAULT_PEERJS_PORT"'|g' {} + find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_DOWNLOAD_ENABLED_PLACEHOLDER|'"$VITE_DEFAULT_DOWNLOAD_ENABLED"'|g' {} + find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_SYNCIOUS_INSTANCE_PLACEHOLDER|'"$VITE_DEFAULT_SYNCIOUS_INSTANCE"'|g' {} + +find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_DASH_BITRATE_PLACEHOLDER|'"$VITE_DEFAULT_DASH_BITRATE"'|g' {} + find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_API_EXTENDED_INSTANCE_PLACEHOLDER|'"$VITE_DEFAULT_API_EXTENDED_INSTANCE"'|g' {} + find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_SETTINGS_PLACEHOLDER|'"$VITE_DEFAULT_SETTINGS"'|g' {} + diff --git a/materialious/src/lib/Player.svelte b/materialious/src/lib/Player.svelte index b98a0c0c..b22a88fc 100644 --- a/materialious/src/lib/Player.svelte +++ b/materialious/src/lib/Player.svelte @@ -263,8 +263,11 @@ player.addEventListener('provider-change', (event) => { const provider = event.detail as any; - const bitrate = pullBitratePreference(); if (provider?.type === 'dash') { + const bitrate = pullBitratePreference(); + const instanceDefaultBitrate = import.meta.env.VITE_DEFAULT_DASH_BITRATE + ? Number(import.meta.env.VITE_DEFAULT_DASH_BITRATE) + : -1; provider.library = () => import('dashjs'); provider.config = { streaming: { @@ -276,8 +279,8 @@ audio: false }, initialBitrate: { - video: bitrate, - audio: bitrate + video: bitrate === -1 ? instanceDefaultBitrate : bitrate, + audio: bitrate === -1 ? instanceDefaultBitrate : bitrate } } }