diff --git a/docker-compose.yml b/docker-compose.yml index 1a6ac91..133811c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,7 +62,7 @@ services: volumes: - $PWD/caddy/Caddyfile:/etc/caddy/Caddyfile - caddy_data:/data - - caddy_config:/config= + - caddy_config:/config volumes: mediamtx_recordings: tiling_frontend_build: diff --git a/live-stream/user_run.sh b/live-stream/user_run.sh index d935b40..18e735c 100755 --- a/live-stream/user_run.sh +++ b/live-stream/user_run.sh @@ -24,7 +24,7 @@ bash -c "DISPLAY=:99 xvfb-run \ sleep 3 -until bash -c "DISPLAY=:99 ffmpeg -xerror -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 -flvflags no_duration_filesize rtmp://x.rtmp.youtube.com/live2/$(cat /home/stream/key.txt)"; do - echo "FFMpeg died, restarting..." - sleep 1 +until bash -c "DISPLAY=:99 ffmpeg -xerror -f x11grab -r 30 -s 1920x1080 -draw_mouse 0 -i :99.0 -f pulse -ac 2 -i default -vcodec libx264 -preset faster -b:v 6000k -bufsize 12000k -framerate 30 -g 60 -pix_fmt yuv420p -acodec aac -f flv -flvflags no_duration_filesize rtmp://x.rtmp.youtube.com/live2/$(cat /home/stream/key.txt)"; do + echo "Restarting FFmpeg..." + sleep 1 done