From 302edae9b61aac097d39942ee67146db06868637 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 12 Jan 2022 01:47:00 +0100 Subject: [PATCH] add rgvolume before and after compressor, add limiter, add variables, add third channel jack patch --- .../scripts/tc_audio_mp3_icecast-gst1.sh | 7 +++++- .../tc_video_simple_webm_stream-gst1.sh | 23 +++++++++++------- src/home/telecaster/.fluxbox/startup | 24 ++++++++++++++++++- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh b/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh index 0d2beef..d77d549 100755 --- a/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh +++ b/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh @@ -1,9 +1,14 @@ #!/bin/sh -gst-launch-1.0 jackaudiosrc connect=1 ! audio/x-raw, format=F32LE, channels=1 \ +AUDIO_CHANNELS=2 + +gst-launch-1.0 jackaudiosrc connect=$AUDIO_CHANNELS ! audio/x-raw, format=F32LE, channels=$AUDIO_CHANNELS \ ! queue ! audioconvert \ + ! queue ! rgvolume pre-amp=12.0 \ ! queue ! audiocheblimit mode=high-pass cutoff=120 poles=4 \ ! queue ! audiodynamic characteristics=soft-knee mode=compressor threshold=0.25 ratio=4.0 \ + ! queue ! rgvolume pre-amp=12.0 \ + ! queue ! rglimiter \ ! queue ! audioconvert ! queue ! lamemp3enc quality=4.0 \ ! queue ! shout2send ip=127.0.0.1 port=8000 password=source2parisson mount=telecaster_live.mp3 > /dev/null diff --git a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh index d10e912..8d7864f 100755 --- a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh +++ b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh @@ -2,6 +2,9 @@ # Start TeleCaster video channel +VIDEO_ID=0 +AUDIO_CHANNELS=2 + #WIDTH=640 #HEIGHT=360 WIDTH=864 @@ -10,21 +13,23 @@ HEIGHT=480 #HEIGHT=720 FRAMERATE=24 -v4l2-ctl -d 0 -c power_line_frequency=1 -v4l2-ctl -d 0 -c zoom_absolute=100 -v4l2-ctl -d 0 -c focus_auto=0 -v4l2-ctl -d 0 -c focus_absolute=1 - +v4l2-ctl -d $VIDEO_ID -c power_line_frequency=1 +v4l2-ctl -d $VIDEO_ID -c zoom_absolute=140 +v4l2-ctl -d $VIDEO_ID -c focus_auto=0 +v4l2-ctl -d $VIDEO_ID -c focus_absolute=1 +v4l2-ctl -d $VIDEO_ID -c sharpness=100 # ! queue ! videoflip method=rotate-180 \ -gst-launch-1.0 v4l2src device=/dev/video0 ! video/x-raw, format=YUY2, width=$WIDTH, height=$HEIGHT, framerate=$FRAMERATE/1 \ +gst-launch-1.0 v4l2src device=/dev/video$VIDEO_ID ! video/x-raw, format=YUY2, width=$WIDTH, height=$HEIGHT, framerate=$FRAMERATE/1 \ + ! queue ! videoflip method=rotate-180 \ ! queue ! videoconvert \ ! queue ! vp8enc threads=4 deadline=2 \ ! queue ! muxout. \ - jackaudiosrc connect=1 ! audio/x-raw, format=F32LE, channels=1 \ + jackaudiosrc connect=$AUDIO_CHANNELS ! audio/x-raw, format=F32LE, channels=$AUDIO_CHANNELS \ + ! queue ! rgvolume pre-amp=12.0 \ ! queue ! audiocheblimit mode=high-pass cutoff=120 poles=4 \ - ! queue ! audiodynamic characteristics=soft-knee mode=compressor threshold=0.16 ratio=0.15 \ - ! queue ! rgvolume pre-amp=6.0 headroom=1.0 \ + ! queue ! audiodynamic characteristics=soft-knee mode=compressor threshold=0.25 ratio=4.0 \ + ! queue ! rgvolume pre-amp=12.0 \ ! queue ! rglimiter \ ! queue ! audioconvert \ ! queue ! opusenc bitrate=96000 \ diff --git a/src/home/telecaster/.fluxbox/startup b/src/home/telecaster/.fluxbox/startup index e3ce53c..9506fc7 100644 --- a/src/home/telecaster/.fluxbox/startup +++ b/src/home/telecaster/.fluxbox/startup @@ -33,7 +33,29 @@ qjackctl & /home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh & -sleep 3 +sleep 8 + +# STEREO setup +# 1: L +# 2: R + +#jack_disconnect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1 +#jack_disconnect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2 + +#jack_disconnect system:capture_1 gst-launch-1.0-01:in_jackaudiosrc0_1 +#jack_disconnect system:capture_2 gst-launch-1.0-01:in_jackaudiosrc0_2 + +#jack_connect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1 +#jack_connect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2 + +# ADDITIONAL mics +# 3: C + +jack_connect system:capture_3 gst-launch-1.0:in_jackaudiosrc0_1 +jack_connect system:capture_3 gst-launch-1.0:in_jackaudiosrc0_2 + +jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_1 +jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_2 #Audio monitor deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml & -- 2.39.5