From: Guillaume Pellerin Date: Sun, 1 Jun 2025 13:56:53 +0000 (+0200) Subject: remove more blocking audio queues, less sleep X-Git-Tag: 4.1.0~16 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f7fd4efa066d7f2dc3b71752535fdd334a574891;p=telecaster-server.git remove more blocking audio queues, less sleep --- diff --git a/bin/streaming/telecaster.py b/bin/streaming/telecaster.py index 1182d62..81192ae 100755 --- a/bin/streaming/telecaster.py +++ b/bin/streaming/telecaster.py @@ -23,8 +23,8 @@ VIDEO_PIPELINE_BASE="""{video_source} {video_options} client-name="webm_streamin ! audiodynamic characteristics=soft-knee mode=compressor threshold=0.125 ratio=0.125 \ ! volume volume={gain_post} \ ! audiodynamic characteristics=hard-knee mode=compressor threshold=0.95 ratio=0.001 \ - ! queue ! audioconvert \ - ! queue ! opusenc bitrate={opus_bitrate} \ + ! audioconvert \ + ! opusenc bitrate={opus_bitrate} \ ! queue ! muxout. \ webmmux streamable=true name=muxout \ ! queue ! shout2send ip={ip} port={port} password={password} mount=telecaster_live_{id}.webm @@ -36,12 +36,12 @@ AUDIO_PIPELINE_BASE="""{audio_source} {audio_options} client-name="mp3_audio_str ! audiodynamic characteristics=soft-knee mode=compressor threshold=0.125 ratio=0.125 \ ! volume volume={gain_post} \ ! audiodynamic characteristics=hard-knee mode=compressor threshold=0.95 ratio=0.001 \ - ! queue ! audioconvert \ - ! queue ! lamemp3enc quality={mp3_quality} \ + ! audioconvert \ + ! lamemp3enc quality={mp3_quality} \ ! queue ! shout2send ip={ip} port={port} password={password} mount=telecaster_live.mp3 """ -BOOT_TIME_DELAY = 5 +BOOT_TIME_DELAY = 2 DEFAULT_CONFIG_FILE = "/etc/telecaster/telecaster.yml" diff --git a/bin/streaming/telecaster.sh b/bin/streaming/telecaster.sh index 28680be..f41dd3b 100755 --- a/bin/streaming/telecaster.sh +++ b/bin/streaming/telecaster.sh @@ -11,7 +11,7 @@ PATH=$PATH:/srv/telecaster/telecaster-server/bin/streaming/ # jackd $JACK_OPTIONS & # qjackctl & -sleep 30 +sleep 2 pipewire & qpwgraph &