summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/stream/tasks/main.yml11
-rw-r--r--roles/stream/templates/emacsconf.nginx.conf4
2 files changed, 10 insertions, 5 deletions
diff --git a/roles/stream/tasks/main.yml b/roles/stream/tasks/main.yml
index b5ebcda..7cabb6b 100644
--- a/roles/stream/tasks/main.yml
+++ b/roles/stream/tasks/main.yml
@@ -39,14 +39,19 @@
when: port_check.failed == true
- name: Test by streaming from a file
tags: test-stream-file, never
- local_action: shell ffmpeg -loglevel 32 -i {{ icecast_test }} -cluster_size_limit 2M -cluster_time_limit 5100 -content_type video/webm -c:v libvpx -b:v 1M -crf 30 -g 125 -deadline good -threads 4 -f webm icecast://emacsconf:{{ icecast_emacsconf_password }}@live0.emacsconf.org:{{ icecast_port }}/emacsconf/{{ icecast_test_track|d("gen") }}.webm
+ block:
+ - debug:
+ msg: ffmpeg -loglevel 32 -re -i {{ icecast_test }} -loop 1 -f webm -r 30 -ac 2 -cluster_size_limit 2M -cluster_time_limit 5100 -content_type video/webm -c:v libvpx -b:v 1M -crf 30 -g 125 -threads 4 -deadline realtime icecast://emacsconf:{{ icecast_emacsconf_password }}@live0.emacsconf.org:{{ icecast_port }}/emacsconf/{{ icecast_test_track|d("gen") }}.webm
+ - local_action: shell ffmpeg -re -loglevel 32 -i {{ icecast_test }} -loop 1 -f webm -r 30 -ac 2 -cluster_size_limit 2M -cluster_time_limit 5100 -content_type video/webm -c:v libvpx -b:v 1M -crf 30 -g 125 -threads 4 -deadline realtime icecast://emacsconf:{{ icecast_emacsconf_password }}@live0.emacsconf.org:{{ icecast_port }}/emacsconf/{{ icecast_test_track|d("gen") }}.webm
when: icecast_test is defined
- name: Test by displaying the stream in mpv
tags: test-stream-mpv, never
- local_action: shell mpv http://live0.emacsconf.org:{{ icecast_port }}/emacsconf/{{ icecast_test_track|d(gen) }}.webm
+ local_action: shell mpv http://live0.emacsconf.org:{{ icecast_port }}/emacsconf/{{ icecast_test_track|d("gen") }}.webm
+ when: test is defined and test == 'mpv'
- name: Test by streaming a test pattern
- tags: test-stream-pattern, never
+ tags: test-stream-pattern
local_action: shell ffmpeg -loglevel 32 -f lavfi -i testsrc=duration=10:size=1280x720:rate=30 -f webm icecast://emacsconf:{{ icecast_emacsconf_password }}@live0.emacsconf.org:{{ icecast_port }}/emacsconf/{{ icecast_test_track|d("gen") }}.webm
+ when: test is defined and test == 'pattern'
# - name: Set up restream script
# template:
# src: restream-yt.sh
diff --git a/roles/stream/templates/emacsconf.nginx.conf b/roles/stream/templates/emacsconf.nginx.conf
index 235a661..57570e9 100644
--- a/roles/stream/templates/emacsconf.nginx.conf
+++ b/roles/stream/templates/emacsconf.nginx.conf
@@ -1,8 +1,8 @@
-location /emacsconf {
+location /emacsconf/ {
try_files $uri $uri/ @emacsconf_upstream;
}
location @emacsconf_upstream {
- proxy_pass http://localhost:{{ icecast_port }};
+ proxy_pass http://localhost:{{ icecast_port }}/emacsconf/;
proxy_http_version 1.1;
proxy_buffering off;
proxy_request_buffering off;