From b4b22da6c21e264a01365380991dc03346f01f60 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 30 Jul 2021 22:54:34 +0200 Subject: dolmetsch-rapi fix rtp-send and address config --- inventory/group_vars/ele-dolmetsch-raspi/vars.yml | 7 +++++-- roles/streaming/dolmetsch-raspi/templates/rtp-send.sh.j2 | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/inventory/group_vars/ele-dolmetsch-raspi/vars.yml b/inventory/group_vars/ele-dolmetsch-raspi/vars.yml index 501c8249..3c68aad7 100644 --- a/inventory/group_vars/ele-dolmetsch-raspi/vars.yml +++ b/inventory/group_vars/ele-dolmetsch-raspi/vars.yml @@ -4,5 +4,8 @@ ssh_users_root: - datacop - nhg -dolmetsch_raspi_server_address: "{{ network_zones.mixer.prefix | ipaddr(network_zones.mixer.offsets['ele-dol-raspi0']) | ipaddr('address/prefix') }}" -dolmetsch_raspi_client_address: "{{ network_zones.mixer.prefix | ipaddr(network_zones.mixer.offsets['ele-dol-raspi1']) | ipaddr('address/prefix') }}" +dolmetsch_raspi_server_address: "{{ network_zones.mixer.prefix | ipaddr(network_zones.mixer.offsets['ele-dol-raspi0']) | ipaddr('address') }}" +dolmetsch_raspi_client_address: "{{ network_zones.mixer.prefix | ipaddr(network_zones.mixer.offsets['ele-dol-raspi1']) | ipaddr('address') }}" + +# dolmetsch_raspi_recv_latency: 2000 +dolmetsch_raspi_send_alsa_device: "hw:CARD=Pro,DEV=0" diff --git a/roles/streaming/dolmetsch-raspi/templates/rtp-send.sh.j2 b/roles/streaming/dolmetsch-raspi/templates/rtp-send.sh.j2 index a0dba99a..f69ee2fe 100644 --- a/roles/streaming/dolmetsch-raspi/templates/rtp-send.sh.j2 +++ b/roles/streaming/dolmetsch-raspi/templates/rtp-send.sh.j2 @@ -8,7 +8,7 @@ fi #export GST_DEBUG=3 exec gst-launch-1.0 rtpbin name=rtpbin \ - alsasrc device='{{ dolmetsch_raspi_send_alsa_device }}' ! 'audio/x-raw,rate=48000,channels=1' ! opusenc ! rtpopuspay ! rtpbin.send_rtp_sink_0 \ + alsasrc device='{{ dolmetsch_raspi_send_alsa_device }}' ! audioconvert ! 'audio/x-raw,rate=48000,channels=1' ! opusenc ! rtpopuspay ! rtpbin.send_rtp_sink_0 \ rtpbin.send_rtp_src_0 ! udpsink "host=$HOST" port=5000 \ rtpbin.send_rtcp_src_0 ! udpsink "host=$HOST" port=5001 sync=false async=false \ udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 -- cgit v1.2.3