From 8343f69bb8be47e4b6e9a7d8a45011a7ef525526 Mon Sep 17 00:00:00 2001 From: Micha Albert Date: Tue, 17 Sep 2024 18:45:46 -0400 Subject: [PATCH] make this not crash as much hopefully --- docker-compose.yml | 3 +++ live-stream/user_run.sh | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 38cc09e..b69f146 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,6 @@ services: mediamtx: + restart: unless-stopped network_mode: "host" build: context: ./mediamtx @@ -18,6 +19,7 @@ services: - tiling_frontend_build:/usr/src/app/dist live-stream: network_mode: "host" + restart: unless-stopped env_file: .stream.env depends_on: backend: @@ -31,6 +33,7 @@ services: - tiling_frontend_build:/html backend: network_mode: "host" + restart: unless-stopped env_file: .backend.env build: context: ./backend diff --git a/live-stream/user_run.sh b/live-stream/user_run.sh index 107f362..6d82394 100755 --- a/live-stream/user_run.sh +++ b/live-stream/user_run.sh @@ -9,9 +9,8 @@ pacmd update-sink-proplist VirtSink device.description=VirtSink export CHROMIUM_FLAGS="--disable-software-rasterizer --disable-dev-shm-usage" export LIBGL_ALWAYS_INDIRECT=1 -bash -c "sleep 5 && DISPLAY=:99 ffmpeg -f x11grab -r 60 -s 1920x1080 -draw_mouse 0 -i :99.0 -f pulse -ac 2 -i default -vcodec libx264 -preset medium -b:v 7000k -framerate 60 -g 2 -pix_fmt yuv420p -acodec aac -f flv rtmp://x.rtmp.youtube.com/live2/$(cat /home/stream/key.txt)" & -DISPLAY=:99 xvfb-run \ +bash -c "DISPLAY=:99 xvfb-run \ --server-num 99 \ -s "-nocursor -ac -screen 0 1920x1080x24" \ dbus-launch chromium \ @@ -21,4 +20,6 @@ DISPLAY=:99 xvfb-run \ --window-position=0,0 \ --hide-scrollbars \ --autoplay-policy=no-user-gesture-required \ - --app=http://localhost:4173 + --app=http://localhost:4173" & disown + +bash -c "sleep 3 && DISPLAY=:99 ffmpeg -f x11grab -r 60 -s 1920x1080 -draw_mouse 0 -i :99.0 -f pulse -ac 2 -i default -vcodec libx264 -preset medium -b:v 7000k -framerate 60 -g 2 -pix_fmt yuv420p -acodec aac -f flv rtmp://x.rtmp.youtube.com/live2/$(cat /home/stream/key.txt)"