From: Guillaume Pellerin Date: Fri, 14 Mar 2025 09:23:05 +0000 (+0100) Subject: add pw client names X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=13d95a8dfed7bc091c6e0521103d2cd27d53fa14;p=telecaster-server.git add pw client names --- diff --git a/etc/telecaster/telecaster-jack.yml b/etc/telecaster/telecaster-jack.yml index 1aab8c6..a87539f 100644 --- a/etc/telecaster/telecaster-jack.yml +++ b/etc/telecaster/telecaster-jack.yml @@ -27,19 +27,6 @@ telecaster: focus_automatic_continuous: 0 sharpness: 6 saturation: 100 - - id: 2 - video_source: v4l2src - video_options: device=/dev/video2 - name: USB-HDMI - width: 1280 - height: 720 - framerate: 30 - flip: none - format: image/jpeg - decoder: jpegdec - audio_delay: 0 - video_delay: 0 - vp8_bitrate: 4000000 deefuzzer: log: /var/log/telecaster/telecaster_webm_monitor.log m3u: /tmp/telecaster_webm_monitor.m3u @@ -91,7 +78,7 @@ telecaster: audio: gstreamer: audio_source: jackaudiosrc - audio_options: connect=2, + audio_options: connect=2 channels: 2 opus_bitrate: 96000 mp3_quality: 4.0 diff --git a/etc/telecaster/telecaster-jack_multi.yml b/etc/telecaster/telecaster-jack_multi.yml new file mode 100644 index 0000000..27c96a6 --- /dev/null +++ b/etc/telecaster/telecaster-jack_multi.yml @@ -0,0 +1,153 @@ +telecaster: + server: + ip: 127.0.0.1 + port: 8000 + password: source2parisson + type: icecast + record_dir: /home/telecaster/monitor/ + video: + gstreamer: + - id: 0 + video_source: v4l2src + video_options: device=/dev/video0 + name: JVC + 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: 800 + focus_absolute: 3395 + focus_automatic_continuous: 0 + sharpness: 6 + saturation: 100 + - id: 2 + video_source: v4l2src + video_options: device=/dev/video2 + name: USB-HDMI + width: 1280 + height: 720 + framerate: 30 + flip: none + format: image/jpeg + decoder: jpegdec + audio_delay: 0 + video_delay: 0 + vp8_bitrate: 4000000 + deefuzzer: + log: /var/log/telecaster/telecaster_webm_monitor.log + m3u: /tmp/telecaster_webm_monitor.m3u + station: + control: + mode: 0 + port: 16002 + infos: + description: TeleCaster WebM monitor stream + genre: Vocal + name: monitor_1.webm + short_name: monitor_1.webm + url: https://www.parisson.com + jingles: + dir: /path/to/jingles + mode: '0' + shuffle: '0' + media: + bitrate: '512' + dir: /home/telecaster/media/webm + format: webm + ogg_quality: '4' + samplerate: '48000' + shuffle: '0' + voices: '1' + record: + dir: /home/telecaster/trash/webm/1 + mode: 1 + relay: + author: TeleCaster + mode: '1' + url: http://127.0.0.1:8000/telecaster_live_0.webm + rss: + dir: /var/www/rss + enclosure: '0' + media_url: http://localhost/rss/ + server: + host: 127.0.0.1 + mountpoint: monitor_0.webm + port: '8000' + public: '0' + sourcepassword: source2parisson + type: icecast + twitter: + key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE + mode: '0' + secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4 + tags: bla bla + audio: + gstreamer: + audio_source: jackaudiosrc + audio_options: connect=2 + channels: 2 + opus_bitrate: 96000 + mp3_quality: 4.0 + gain_pre: 2.5 + gain_post: 1.5 + jack: + driver: alsa + samplerate: 48000 + ring_buffers: 3 + phw: 3 + chw: 3 + deefuzzer: + log: /var/log/telecaster/telecaster_mp3_monitor.log + m3u: /tmp/telecaster_mp3_monitor.m3u + station: + control: + mode: 0 + port: 16001 + infos: + description: TeleCaster MP3 monitor + genre: Vocal + name: monitor.mp3 + short_name: monitor.mp3 + url: https://www.parisson.com + jingles: + dir: /path/to/jingles + mode: 0 + shuffle: 1 + media: + bitrate: 96 + dir: /home/telecaster/media/mp3 + format: mp3 + ogg_quality: 4 + samplerate: 48000 + shuffle: 0 + voices: '2' + record: + dir: /home/telecaster/trash/mp3 + mode: 1 + relay: + author: Inconnu + mode: 1 + url: http://127.0.0.1:8000/telecaster_live.mp3 + rss: + dir: /var/www/rss + enclosure: 0 + media_url: http://localhost/rss/ + server: + host: 127.0.0.1 + mountpoint: monitor.mp3 + port: 8000 + public: 0 + sourcepassword: source2parisson + type: icecast + twitter: + key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE + mode: 0 + secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4 + tags: bla bla diff --git a/etc/telecaster/telecaster-pipewire-multi.yml b/etc/telecaster/telecaster-pipewire-multi.yml index e99689a..16565c3 100644 --- a/etc/telecaster/telecaster-pipewire-multi.yml +++ b/etc/telecaster/telecaster-pipewire-multi.yml @@ -9,7 +9,7 @@ telecaster: gstreamer: - id: 0 video_source: pipewiresrc - video_options: target-object="telecaster_source" + video_options: client-name="video_streaming_0" target-object="telecaster_source" name: JVC width: 1280 height: 720 @@ -29,7 +29,7 @@ telecaster: saturation: 100 - id: 2 video_source: pipewiresrc - video_options: target-object="telecaster_source" + video_options: client-name="video_streaming_2" target-object="telecaster_source" name: USB-HDMI width: 1280 height: 720 @@ -91,7 +91,7 @@ telecaster: audio: gstreamer: audio_source: pipewiresrc - audio_options: target-object="telecaster_source" + audio_options: client-name="audio_streaming" target-object="telecaster_source" channels: 2 opus_bitrate: 96000 mp3_quality: 4.0 diff --git a/etc/telecaster/telecaster-pipewire.yml b/etc/telecaster/telecaster-pipewire.yml index 449535d..ac99a64 100644 --- a/etc/telecaster/telecaster-pipewire.yml +++ b/etc/telecaster/telecaster-pipewire.yml @@ -9,7 +9,7 @@ telecaster: gstreamer: - id: 0 video_source: pipewiresrc - video_options: target-object="telecaster_source" + video_options: client-name="video_streaming" target-object="telecaster_source" name: JVC width: 1280 height: 720 @@ -78,7 +78,7 @@ telecaster: audio: gstreamer: audio_source: pipewiresrc - audio_options: target-object="telecaster_source" + audio_options: client-name="audio_streaming" target-object="telecaster_source" channels: 2 opus_bitrate: 96000 mp3_quality: 4.0 diff --git a/etc/telecaster/telecaster.yml b/etc/telecaster/telecaster.yml index 2f7f2cf..ac99a64 100644 --- a/etc/telecaster/telecaster.yml +++ b/etc/telecaster/telecaster.yml @@ -8,8 +8,8 @@ telecaster: video: gstreamer: - id: 0 - video_source: pipewiresrc # or v4l2src - video_options: target-object="telecaster_source" # 'device=/dev/video{id}', + video_source: pipewiresrc + video_options: client-name="video_streaming" target-object="telecaster_source" name: JVC width: 1280 height: 720 @@ -27,19 +27,6 @@ telecaster: focus_automatic_continuous: 0 sharpness: 6 saturation: 100 - - id: 2 - video_source: pipewiresrc # or v4l2src - video_options: target-object="telecaster_source" # 'device=/dev/video{id}', - name: USB-HDMI - width: 1280 - height: 720 - framerate: 30 - flip: none - format: image/jpeg - decoder: jpegdec - audio_delay: 0 - video_delay: 0 - vp8_bitrate: 4000000 deefuzzer: log: /var/log/telecaster/telecaster_webm_monitor.log m3u: /tmp/telecaster_webm_monitor.m3u @@ -50,8 +37,8 @@ telecaster: infos: description: TeleCaster WebM monitor stream genre: Vocal - name: monitor_1.webm - short_name: monitor_1.webm + name: monitor_0.webm + short_name: monitor_0.webm url: https://www.parisson.com jingles: dir: /path/to/jingles @@ -66,7 +53,7 @@ telecaster: shuffle: '0' voices: '1' record: - dir: /home/telecaster/trash/webm/1 + dir: /home/telecaster/monitor/webm mode: 1 relay: author: TeleCaster @@ -90,19 +77,13 @@ telecaster: tags: bla bla audio: gstreamer: - audio_source: pipewiresrc # or jackaudiosrc - audio_options: target-object="telecaster_source" # 'connect=2', + audio_source: pipewiresrc + audio_options: client-name="audio_streaming" target-object="telecaster_source" channels: 2 opus_bitrate: 96000 mp3_quality: 4.0 gain_pre: 2.5 gain_post: 1.5 - jack: - driver: alsa - samplerate: 48000 - ring_buffers: 3 - phw: 3 - chw: 3 deefuzzer: log: /var/log/telecaster/telecaster_mp3_monitor.log m3u: /tmp/telecaster_mp3_monitor.m3u @@ -129,7 +110,7 @@ telecaster: shuffle: 0 voices: '2' record: - dir: /home/telecaster/trash/mp3 + dir: /home/telecaster/monitor/mp3 mode: 1 relay: author: Inconnu