transfer clien-name to yml config, add jack to yml config

diff --git a/bin/streaming/telecaster.py b/bin/streaming/telecaster.py
index c5180885a8c9ac422bf3988ee21339c1d1482844..b5b88a205b054742398dcc80605c570cfd9b4438 100755 (executable)
--- a/bin/streaming/telecaster.py
+++ b/bin/streaming/telecaster.py
@@ -10,7 +10,7 @@ from threading import Thread
 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} \
@@ -27,10 +27,10 @@ VIDEO_PIPELINE_BASE="""{video_source} {video_options} client-name="webm_streamin
     ! queue ! opusenc bitrate={opus_bitrate} \
     ! queue ! 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} \
+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 \
@@ -38,7 +38,7 @@ AUDIO_PIPELINE_BASE="""{audio_source} {audio_options} client-name="mp3_audio_str
     ! 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
+    ! queue ! shout2send ip={ip} port={port} password={password} mount=telecaster_live.mp3 > /dev/null
 """
 
 

diff --git a/etc/telecaster/telecaster.yml b/etc/telecaster/telecaster.yml
index 053255419f689e21e9b435c188953f7501481f22..d0382894b17f0d6d00ee94ba03d9da15d63061b6 100644 (file)
--- a/etc/telecaster/telecaster.yml
+++ b/etc/telecaster/telecaster.yml
@@ -8,23 +8,27 @@ telecaster:
   video:
     gstreamer:
       - id: 0
-        name: C922
-        video_source: pipewiresrc
-        video_options: target-object=v4l2:/dev/video0
+        name: logitech
+        video_source: v4l2src
+        video_options: device=/dev/video0
+          #video_source: pipewiresrc
+          #video_options: target-object=v4l2:/dev/video0 client-name="webm_streaming_{id}_video"
         width: 1280
         height: 720
         framerate: 30
         flip: none
         format: image/jpeg
         decoder: jpegdec
+        audio_delay: 0
+        video_delay: 0
         vp8_bitrate: 4000000
         v4l2-ctl:
           power_line_frequency: 1
-          zoom_absolute: 128
-          focus_auto: 0
+          zoom_absolute: 100
           focus_absolute: 0
-          sharpness: 128
           focus_automatic_continuous: 0
+          sharpness: 128
+          saturation: 100
     deefuzzer:
         log: /var/log/telecaster/telecaster_webm_monitor.log
         m3u: /tmp/telecaster_webm_monitor.m3u
@@ -75,8 +79,10 @@ telecaster:
             tags: bla bla
   audio:
     gstreamer:
-      audio_source: pipewiresrc
-      audio_options: target-object=alsa:acp:ArturiaMsd:0:capture
+      audio_source: jackaudiosrc
+      audio_options: connect=2
+      #audio_source: pipewiresrc
+      #audio_options: target-object=telecaster_source client-name="mp3_audio_streaming"
       channels: 2
       opus_bitrate: 96000
       mp3_quality: 4.0