Deploy higher bitrate and fix stream on LLI WiFi
parent
97057b497d
commit
cdfb87762a
|
@ -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: -->
|
||||||
|
|
|
@ -3,4 +3,4 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
echo "Fetching event inventory from Ambrose's infrastructure"
|
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
|
||||||
|
|
|
@ -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"
|
|
@ -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
|
|
@ -3,9 +3,11 @@
|
||||||
tags: base
|
tags: base
|
||||||
- include: packages.yml
|
- include: packages.yml
|
||||||
tags: base
|
tags: base
|
||||||
- include: artwork.yml
|
|
||||||
tags: base
|
|
||||||
- include: obs.yml
|
- include: obs.yml
|
||||||
tags: obs
|
tags: obs
|
||||||
|
- include: artwork.yml
|
||||||
|
tags: base
|
||||||
- include: textfile.yml
|
- include: textfile.yml
|
||||||
tags: base
|
tags: base
|
||||||
|
- include: custom_networking.yml
|
||||||
|
tags: base
|
||||||
|
|
|
@ -23,7 +23,7 @@ OBSBasic.Transition={\n "bindings": [\n {\n "key": "OBS_KEY
|
||||||
[SimpleOutput]
|
[SimpleOutput]
|
||||||
RecFormat=mkv
|
RecFormat=mkv
|
||||||
RecQuality=Stream
|
RecQuality=Stream
|
||||||
VBitrate=3000
|
VBitrate=4000
|
||||||
UseAdvanced=true
|
UseAdvanced=true
|
||||||
Preset=ultrafast
|
Preset=ultrafast
|
||||||
{% if record_fast %}
|
{% if record_fast %}
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
{
|
{
|
||||||
"settings": {
|
"settings": {
|
||||||
"bwtest": false,
|
|
||||||
"key": "{{ stream_key }}",
|
"key": "{{ stream_key }}",
|
||||||
"server": "rtmp://a.rtmp.youtube.com/live2",
|
"server": "rtmp://209.85.229.151/live2"
|
||||||
"service": "YouTube / YouTube Gaming"
|
|
||||||
},
|
},
|
||||||
"type": "rtmp_common"
|
"type": "rtmp_custom"
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,15 @@
|
||||||
"id": "pulse_input_capture",
|
"id": "pulse_input_capture",
|
||||||
"mixers": 255,
|
"mixers": 255,
|
||||||
"monitoring_type": {{ monitoring_type }},
|
"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",
|
"name": "Microphone",
|
||||||
"private_settings": {},
|
"private_settings": {},
|
||||||
"push-to-mute": false,
|
"push-to-mute": false,
|
||||||
|
@ -34,7 +42,7 @@
|
||||||
{% elif room_type == "setup2" %}
|
{% elif room_type == "setup2" %}
|
||||||
"device_id": "alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo"
|
"device_id": "alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo"
|
||||||
{% elif room_type == "setup3" %}
|
{% elif room_type == "setup3" %}
|
||||||
"device_id": ""
|
"device_id": "alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo"
|
||||||
{% else %}
|
{% else %}
|
||||||
"device_id": "alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo"
|
"device_id": "alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -56,7 +64,7 @@
|
||||||
"id": "pulse_input_capture",
|
"id": "pulse_input_capture",
|
||||||
"mixers": 255,
|
"mixers": 255,
|
||||||
"monitoring_type": {{ monitoring_type }},
|
"monitoring_type": {{ monitoring_type }},
|
||||||
"muted": false,
|
"muted": true,
|
||||||
"name": "Slides Audio",
|
"name": "Slides Audio",
|
||||||
"private_settings": {},
|
"private_settings": {},
|
||||||
"push-to-mute": false,
|
"push-to-mute": false,
|
||||||
|
@ -91,7 +99,15 @@
|
||||||
"id": "pulse_input_capture",
|
"id": "pulse_input_capture",
|
||||||
"mixers": 255,
|
"mixers": 255,
|
||||||
"monitoring_type": {{ monitoring_type }},
|
"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",
|
"name": "Emergency Audio",
|
||||||
"private_settings": {},
|
"private_settings": {},
|
||||||
"push-to-mute": false,
|
"push-to-mute": false,
|
||||||
|
@ -100,7 +116,7 @@
|
||||||
"push-to-talk-delay": 0,
|
"push-to-talk-delay": 0,
|
||||||
"settings": {
|
"settings": {
|
||||||
{% if room_type == "setup1" %}
|
{% 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" %}
|
{% elif room_type == "setup2" %}
|
||||||
"device_id": "alsa_input.{{ webcam_name }}-02.analog-stereo"
|
"device_id": "alsa_input.{{ webcam_name }}-02.analog-stereo"
|
||||||
{% elif room_type == "setup3" %}
|
{% elif room_type == "setup3" %}
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue