From: Guillaume Pellerin <guillaume.pellerin@parisson.com>
Date: Sun, 8 Jun 2025 22:46:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/release/4.1-jack' into dev
X-Git-Tag: 4.1.0~12
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1e616ee417625770bfc65aaee2f450ba5605b0e1;p=telecaster-server.git

Merge remote-tracking branch 'origin/release/4.1-jack' into dev
---

1e616ee417625770bfc65aaee2f450ba5605b0e1
diff --cc bin/streaming/telecaster.py
index 52600fe,b5b88a2..ae4ed3a
--- a/bin/streaming/telecaster.py
+++ b/bin/streaming/telecaster.py
@@@ -10,41 -10,37 +10,42 @@@ from threading import Threa
  from copy import deepcopy
  
  
- VIDEO_PIPELINE_BASE="""{video_source} {video_options} client-name="webm_streaming_{id}_video" \
+ VIDEO_PIPELINE_BASE="""{video_source} {video_options} \
      ! {format}, width={width}, height={height}, framerate={framerate}/1 \
 -    ! queue ! {decoder} \
 -    ! queue ! videoflip method={flip} \
 -    ! queue ! videoconvert \
 -    ! queue ! vp8enc threads=4 deadline=2 target-bitrate={vp8_bitrate} \
 -    ! queue ! muxout. \
 +    ! {decoder} \
 +    ! videoflip method={flip} \
 +    ! videoconvert \
 +    ! vp8enc threads=4 deadline=2 target-bitrate={vp8_bitrate} \
 +    ! muxout. \
      {audio_source} {audio_options} client-name="webm_streaming_{id}_audio" ! audio/x-raw, format=F32LE, channels={channels} \
 -    ! queue ! audiocheblimit mode=high-pass cutoff=120 poles=4 \
 -    ! queue ! volume volume={gain_pre} \
 -    ! queue ! audiodynamic characteristics=soft-knee mode=compressor threshold=0.125 ratio=0.125 \
 -    ! queue ! volume volume={gain_post} \
 -    ! queue ! audiodynamic characteristics=hard-knee mode=compressor threshold=0.95 ratio=0.001 \
 -    ! queue ! audioconvert \
 -    ! queue ! opusenc bitrate={opus_bitrate} \
 -    ! queue ! muxout. \
 +    ! audiocheblimit mode=high-pass cutoff=120 poles=4 \
 +    ! volume volume={gain_pre} \
 +    ! 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 \
 +    ! audioconvert \
 +    ! opusenc bitrate={opus_bitrate} \
 +    ! muxout. \
      webmmux streamable=true name=muxout \
-     ! queue ! shout2send ip={ip} port={port} password={password} mount=telecaster_live_{id}.webm
+     ! queue ! shout2send ip={ip} port={port} password={password} mount=telecaster_live_{id}.webm > /dev/null
  """
  
- AUDIO_PIPELINE_BASE="""{audio_source} {audio_options} client-name="mp3_audio_streaming" ! audio/x-raw, format=F32LE, channels={channels} \
-     ! audiocheblimit mode=high-pass cutoff=120 poles=4 \
-     ! volume volume={gain_pre} \
-     ! 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 \
-     ! audioconvert \
-     ! lamemp3enc quality={mp3_quality} \
-     ! queue ! shout2send ip={ip} port={port} password={password} mount=telecaster_live.mp3
 -AUDIO_PIPELINE_BASE="""{audio_source} {audio_options} ! audio/x-raw, format=F32LE, channels={channels} \
++AUDIO_PIPELINE_BASE="""{audio_source} {audio_options} \
++    ! audio/x-raw, format=F32LE, channels={channels} \
+     ! queue ! audiocheblimit mode=high-pass cutoff=120 poles=4 \
+     ! queue ! volume volume={gain_pre} \
+     ! queue ! audiodynamic characteristics=soft-knee mode=compressor threshold=0.125 ratio=0.125 \
+     ! queue ! volume volume={gain_post} \
+     ! queue ! audiodynamic characteristics=hard-knee mode=compressor threshold=0.95 ratio=0.001 \
+     ! queue ! audioconvert \
+     ! queue ! lamemp3enc quality={mp3_quality} \
+     ! queue ! shout2send ip={ip} port={port} password={password} mount=telecaster_live.mp3 > /dev/null
  """
  
 +BOOT_TIME_DELAY = 0
 +
 +DEFAULT_CONFIG_FILE = "/etc/telecaster/telecaster.yml"
 +
  
  class TeleCasterGStream(Thread):
  
diff --cc bin/streaming/telecaster.sh
index b245e70,4d35a98..f9c4580
--- a/bin/streaming/telecaster.sh
+++ b/bin/streaming/telecaster.sh
@@@ -2,30 -2,34 +2,39 @@@
  
  set -e
  
 -source /etc/telecaster/telecaster.conf
 -
 +#source /etc/telecaster/telecaster.conf
+ #TELECASTER_PATH=/srv/telecaster/telecaster-server/
+ #XDG_RUNTIME_DIR="/run/user/1000"
+ 
+ konsole &
  
 -# JACKD
 -#
 -jackd $JACK_OPTIONS &
 -sleep 2
 -catia &
 +# AUDIO
  
- # jackd $JACK_OPTIONS &
- # qjackctl &
+ # PIPEWIRE
+ #
+ #pipewire &
+ #pipewire-pulse &
+ # other non relevant stuff
+ #dbus-run-session dwm 2> ~/.dwm.log &
++# qpwgraph &
++
++# JACK
++jackd $JACK_OPTIONS &
++qjackctl &
++catia &
 +
 +#sleep 2
 +
- #pipewire &
- qpwgraph &
 +
 +#sleep 2
  
  # TELECASTER
 -sleep 2
 -# qjackctl &
 -#sleep 3
 -/srv/telecaster/telecaster-server/bin/streaming/telecaster.py /etc/telecaster/telecaster.yml &
 -#sleep 3
  
 -# JACK ports setup
 +/srv/telecaster/telecaster-server/bin/streaming/telecaster.py &
 +
- #sleep 3
- 
- konsole &
 +
 +
 +# Audio ports setup
  #
  # 1: L
  # 2: R