From: telecaster <telecaster@TC-34>
Date: Fri, 29 Nov 2024 09:30:37 +0000 (+0100)
Subject: use telecaster_source from pipewire, add audio caps
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=75f3db17710eac203855a843fbba45912f23775e;p=telecaster-server.git

use telecaster_source from pipewire, add audio caps
---

diff --git a/bin/streaming/telecaster.py b/bin/streaming/telecaster.py
index babfb1e..5560877 100755
--- a/bin/streaming/telecaster.py
+++ b/bin/streaming/telecaster.py
@@ -10,13 +10,12 @@ from copy import deepcopy
 
 #    ! queue ! clockoverlay time-format="%D %H:%M:%S" \
 
-VIDEO_PIPELINE_BASE="""pipewiresrc client-name="video_streaming" ! {format}, width={width}, height={height}, framerate={framerate}/1 \
-    ! queue ! {decoder} \
+VIDEO_PIPELINE_BASE="""pipewiresrc client-name="video_streaming" \
     ! queue ! videoflip method={flip} \
     ! queue ! videoconvert \
     ! queue ! vp8enc threads=4 deadline=2 \
     ! queue ! muxout. \
-    pipewiresrc client-name="video_streaming" ! audio/x-raw, format=F32LE, channels={channels} \
+    pipewiresrc client-name="video_streaming" target-object="telecaster_source" ! 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 \
@@ -29,7 +28,7 @@ VIDEO_PIPELINE_BASE="""pipewiresrc client-name="video_streaming" ! {format}, wid
     ! queue ! shout2send ip={ip} port={port} password={password} mount=telecaster_live_{id}.webm
 """
 
-AUDIO_PIPELINE_BASE="""pipewiresrc client-name="audio_streaming" ! audio/x-raw, format=F32LE, channels={channels} \
+AUDIO_PIPELINE_BASE="""pipewiresrc client-name="audio_streaming" target-object="telecaster_source" ! 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 \
diff --git a/tests/pipewire/tc_pw_link.sh b/tests/pipewire/tc_pw_link.sh
index 8062cd0..0e0b2e4 100755
--- a/tests/pipewire/tc_pw_link.sh
+++ b/tests/pipewire/tc_pw_link.sh
@@ -17,28 +17,33 @@ def find_object(puts, device):
 inputs = link.list_inputs()
 outputs = link.list_outputs()
 
-# print(inputs)
-# print(outputs)
+print(inputs)
+print(outputs)
 
 firefox_input = find_object(inputs, "Firefox")
-audio_processing_output = find_object(outputs, "audio_processing")
-audio_processing_input = find_object(inputs, "audio_processing")
+audio_streaming_output = find_object(outputs, "audio_streaming")
+audio_streaming_input = find_object(inputs, "audio_streaming")
 alsa_output = find_object(outputs, "alsa_input.pci-0000")
 alsa_input = find_object(inputs, "alsa_output.pci-0000")
 mic_output = find_object(outputs, "U192k_0_1")
+webcam_output = find_object(outputs, "v4l2")
+
+print(webcam_output)
 
 # print(alsa_output)
 # print(alsa_inputs)
 # print(firefox)
-# print(audio_processing_input)
+# print(audio_streaming_input)
 
-alsa_output.disconnect(audio_processing_input)
-alsa_input.disconnect(audio_processing_output)
+#alsa_output.disconnect(audio_streaming_input)
+#alsa_input.disconnect(audio_streaming_output)
+webcam_output.disconnect(audio_streaming_input)
+#audio_streaming_input.disconnect(webcam_output)
 
 # mono source
-mic_output.connect(audio_processing_input.left)
-mic_output.connect(audio_processing_input.right)
+mic_output.connect(audio_streaming_input.left)
+mic_output.connect(audio_streaming_input.right)
 
-firefox_input.connect(audio_processing_output)
+firefox_input.connect(audio_streaming_output)
 firefox_input.disconnect(alsa_output)
 
diff --git a/tests/pipewire/tc_pw_video.sh b/tests/pipewire/tc_pw_video.sh
index 94c19f9..237a3d9 100755
--- a/tests/pipewire/tc_pw_video.sh
+++ b/tests/pipewire/tc_pw_video.sh
@@ -7,7 +7,6 @@ set -e
 source /etc/telecaster/telecaster.conf
 
 gst-launch-1.0 pipewiresrc client-name="video_streaming" \
-		! queue ! $VIDEO_DECODER \
 		! queue ! videoconvert \
 		! queue ! vp8enc threads=4 deadline=2 target-bitrate=2000000 \
 		! queue ! muxout. \