Deploy higher bitrate and fix stream on LLI WiFi

ansible/README.md

@@ -0,0 +1,7 @@
+
+# WARNING: It's a mess in here
+
+We're working on ironing this out, in a more reliable way, for future events.
+
+<!-- vim: set conceallevel=2 et ts=2 sw=2: -->
+

ansible/event-fetch-generate.sh

@@ -3,4 +3,4 @@
 set -e
 
 echo "Fetching event inventory from Ambrose's infrastructure"
-ssh -p 222 root@fd11:f055:a514::1 /usr/local/bin/wireguard-negotiator dump -i wg1 | go run event-generate.go opentech > event
+ssh -p 222 root@fd11:f055:a514::1 /usr/local/bin/wireguard-negotiator dump -i wg1 | go run event-generate.go opentech

ansible/performance.yml

@@ -0,0 +1,6 @@
+---
+- hosts: all
+  tasks:
+    - name: temporarily set performance cpu govenor
+      become: yes
+      command: bash -c "echo performance | tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor"

ansible/roles/recorder/tasks/custom_networking.yml

@@ -0,0 +1,7 @@
+---
+
+- name: write custom-networking.conf to sysctl.d 
+  template:
+    src: "sysctl-custom-networking.conf"
+    dest: "/etc/sysctl.d/custom-networking.conf"
+  become: yes

ansible/roles/recorder/tasks/main.yml

@@ -3,9 +3,11 @@
   tags: base
 - include: packages.yml
   tags: base
-- include: artwork.yml
-  tags: base
 - include: obs.yml
   tags: obs
+- include: artwork.yml
+  tags: base
 - include: textfile.yml
   tags: base
+- include: custom_networking.yml
+  tags: base

ansible/roles/recorder/templates/obs-studio/basic/profiles/720p/basic.ini.j2

@@ -23,7 +23,7 @@ OBSBasic.Transition={\n    "bindings": [\n        {\n            "key": "OBS_KEY
 [SimpleOutput]
 RecFormat=mkv
 RecQuality=Stream
-VBitrate=3000
+VBitrate=4000
 UseAdvanced=true
 Preset=ultrafast
 {% if record_fast %}

ansible/roles/recorder/templates/obs-studio/basic/profiles/720p/service.json.j2

@@ -1,9 +1,7 @@
 {
     "settings": {
-        "bwtest": false,
         "key": "{{ stream_key }}",
-        "server": "rtmp://a.rtmp.youtube.com/live2",
-        "service": "YouTube / YouTube Gaming"
+        "server": "rtmp://209.85.229.151/live2"
     },
-    "type": "rtmp_common"
+    "type": "rtmp_custom"
 }

ansible/roles/recorder/templates/obs-studio/basic/scenes/event_id.json.j2

@@ -21,7 +21,15 @@
         "id": "pulse_input_capture",
         "mixers": 255,
         "monitoring_type": {{ monitoring_type }},
-        "muted": false,
+{% if room_type == "setup1" %}
+		"muted": false,
+{% elif room_type == "setup2" %}
+		"muted": true,
+{% elif room_type == "setup3" %}
+		"muted": false,
+{% else %}
+		"muted": false,
+{% endif %}
         "name": "Microphone",
         "private_settings": {},
         "push-to-mute": false,
@@ -34,7 +42,7 @@
 {% elif room_type == "setup2" %}
             "device_id": "alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo"
 {% elif room_type == "setup3" %}
-            "device_id": ""
+            "device_id": "alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo"
 {% else %}
             "device_id": "alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo"
 {% endif %}
@@ -56,7 +64,7 @@
         "id": "pulse_input_capture",
         "mixers": 255,
         "monitoring_type": {{ monitoring_type }},
-        "muted": false,
+        "muted": true,
         "name": "Slides Audio",
         "private_settings": {},
         "push-to-mute": false,
@@ -91,7 +99,15 @@
         "id": "pulse_input_capture",
         "mixers": 255,
         "monitoring_type": {{ monitoring_type }},
-        "muted": true,
+{% if room_type == "setup1" %}
+		"muted": true,
+{% elif room_type == "setup2" %}
+		"muted": false,
+{% elif room_type == "setup3" %}
+		"muted": true,
+{% else %}
+		"muted": true,
+{% endif %}
         "name": "Emergency Audio",
         "private_settings": {},
         "push-to-mute": false,
@@ -100,7 +116,7 @@
         "push-to-talk-delay": 0,
         "settings": {
 {% if room_type == "setup1" %}
-            "device_id": "alsa_input.pci-0000_00_1b.0.analog-stereo"
+            "device_id": "alsa_input.{{ webcam_name }}-02.analog-stereo"
 {% elif room_type == "setup2" %}
             "device_id": "alsa_input.{{ webcam_name }}-02.analog-stereo"
 {% elif room_type == "setup3" %}

ansible/roles/recorder/templates/sysctl-custom-networking.conf

@@ -0,0 +1,4 @@
+net.core.default_qdisc=cake
+net.ipv4.tcp_congestion_control=bbr
+net.ipv4.tcp_slow_start_after_idle=0
+net.ipv4.tcp_ecn=1