From 7ddbfc05f45052534d64b76b15e98a1be941cdbc Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 13 Jun 2022 20:24:06 +0200 Subject: streaming/streamer/rtmp: new image with target option --- inventory/host_vars/ch-dione.yml | 4 ++-- inventory/host_vars/ch-helene.yml | 4 ++-- inventory/host_vars/ch-thetys.yml | 4 ++-- inventory/host_vars/ele-thetys.yml | 4 ++-- inventory/host_vars/glt-dione.yml | 4 ++-- inventory/host_vars/glt-helene.yml | 4 ++-- inventory/host_vars/glt-thetys.yml | 4 ++-- inventory/host_vars/s2-thetys.yml | 4 ++-- roles/streaming/streamer/rtmp/defaults/main.yml | 4 ++-- roles/streaming/streamer/rtmp/tasks/main.yml | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index 4aeec11d..a7766e6e 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -62,7 +62,7 @@ kubelet_storage: # streamer_rtmp_base_path: /srv/storage/streamer # streamer_rtmp_inst_name: feed -# streamer_rtmp_nginx_image_version: 2022-05-15.24 -# streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +# streamer_rtmp_nginx_image_version: 2022-06-12.26 +# streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 # streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp50', '-ac', '2', '-i', 'DeckLink 8K Pro (1)'] # streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml index d8027300..a4042eea 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -62,7 +62,7 @@ kubelet_storage: # streamer_rtmp_base_path: /srv/storage/streamer # streamer_rtmp_inst_name: feed -# streamer_rtmp_nginx_image_version: 2022-05-15.24 -# streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +# streamer_rtmp_nginx_image_version: 2022-06-12.26 +# streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 # streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp50', '-ac', '2', '-i', 'DeckLink SDI 4K'] # streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml index 907a7f9d..25e56ed5 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -55,7 +55,7 @@ kubernetes_standalone_cni_variant: with-portmap streamer_rtmp_base_path: /srv/storage/streamer streamer_rtmp_inst_name: feed -streamer_rtmp_nginx_image_version: 2022-05-15.24 -streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +streamer_rtmp_nginx_image_version: 2022-06-12.26 +streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 streamer_rtmp_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder'] streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 79da69f4..ef880f8f 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -71,8 +71,8 @@ streamer_rtmp_storage: fs: ext4 streamer_rtmp_base_path: /srv/streamer streamer_rtmp_inst_name: emc-test -streamer_rtmp_nginx_image_version: 2022-05-15.24 -streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +streamer_rtmp_nginx_image_version: 2022-06-12.26 +streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 streamer_rtmp_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder'] streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml index 178f3da1..a7f107af 100644 --- a/inventory/host_vars/glt-dione.yml +++ b/inventory/host_vars/glt-dione.yml @@ -61,8 +61,8 @@ streamer_rtmp_storage: fs: ext4 streamer_rtmp_base_path: /srv/streamer streamer_rtmp_inst_name: feed-glt21s1 -streamer_rtmp_nginx_image_version: 2022-05-15.24 -streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +streamer_rtmp_nginx_image_version: 2022-06-12.26 +streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink 8K Pro (1)'] streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml index 07eaf9f7..f0180acb 100644 --- a/inventory/host_vars/glt-helene.yml +++ b/inventory/host_vars/glt-helene.yml @@ -61,8 +61,8 @@ streamer_rtmp_storage: fs: ext4 streamer_rtmp_base_path: /srv/streamer streamer_rtmp_inst_name: feed-glt21s2 -streamer_rtmp_nginx_image_version: 2022-05-15.24 -streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +streamer_rtmp_nginx_image_version: 2022-06-12.26 +streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink SDI 4K'] streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml index 52ff4bdc..3543f948 100644 --- a/inventory/host_vars/glt-thetys.yml +++ b/inventory/host_vars/glt-thetys.yml @@ -67,8 +67,8 @@ streamer_rtmp_storage: fs: ext4 streamer_rtmp_base_path: /srv/streamer streamer_rtmp_inst_name: feed-glt21s3 -streamer_rtmp_nginx_image_version: 2022-05-15.24 -streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +streamer_rtmp_nginx_image_version: 2022-06-12.26 +streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 streamer_rtmp_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder'] streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index c7809685..689c124b 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -70,8 +70,8 @@ zfs_pools: streamer_rtmp_base_path: /srv/storage/streamer streamer_rtmp_inst_name: feed -streamer_rtmp_nginx_image_version: 2022-05-15.24 -streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +streamer_rtmp_nginx_image_version: 2022-06-12.26 +streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 streamer_rtmp_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder'] streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" streamer_rtmp_recording: diff --git a/roles/streaming/streamer/rtmp/defaults/main.yml b/roles/streaming/streamer/rtmp/defaults/main.yml index a4faf706..0560d05f 100644 --- a/roles/streaming/streamer/rtmp/defaults/main.yml +++ b/roles/streaming/streamer/rtmp/defaults/main.yml @@ -6,8 +6,8 @@ streamer_rtmp_base_path: /srv/streamer/rtmp streamer_rtmp_port: 1935 # streamer_rtmp_inst_name: feed -# streamer_rtmp_nginx_image_version: 2022-05-15.24 -# streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-05-29.21 +# streamer_rtmp_nginx_image_version: 2022-06-12.26 +# streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 # streamer_rtmp_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder'] # streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" streamer_rtmp_app_name: "{{ streamer_rtmp_inst_name }}" diff --git a/roles/streaming/streamer/rtmp/tasks/main.yml b/roles/streaming/streamer/rtmp/tasks/main.yml index 9259fbd4..938fa93a 100644 --- a/roles/streaming/streamer/rtmp/tasks/main.yml +++ b/roles/streaming/streamer/rtmp/tasks/main.yml @@ -18,7 +18,7 @@ - name: generate streamer config copy: - content: "{{ streamer_rtmp_config | combine({'rtmp': {'base_url': 'rtmp://127.0.0.1/'+streamer_rtmp_app_name}}) | to_nice_yaml }}\n" + content: "{{ streamer_rtmp_config | combine({'rtmp': {'target': 'rtmp://127.0.0.1/'+streamer_rtmp_app_name}}) | to_nice_yaml }}\n" dest: "{{ streamer_rtmp_base_path }}/{{ streamer_rtmp_inst_name }}/config.yml" - name: create recording directory -- cgit v1.2.3