From 2b699a9f0e031c40139930d82b4a4ca998548a14 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 9 Feb 2024 00:38:28 +0100 Subject: elevate encoder: fix decklink versions --- inventory/host_vars/ele-calypso.yml | 6 +++--- inventory/host_vars/ele-dione.yml | 2 +- inventory/host_vars/ele-helene.yml | 2 +- inventory/host_vars/ele-hyperion.yml | 2 +- inventory/host_vars/ele-telesto.yml | 2 +- inventory/host_vars/ele-thetys.yml | 4 ++-- roles/streaming/player/templates/pod-spec.yml.j2 | 6 ++++++ roles/streaming/recorder/templates/pod-spec.yml.j2 | 6 ++++++ roles/streaming/streamer/rtmp/templates/pod-spec.yml.j2 | 6 ++++++ 9 files changed, 27 insertions(+), 9 deletions(-) diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml index 8fc172df..df5e8962 100644 --- a/inventory/host_vars/ele-calypso.yml +++ b/inventory/host_vars/ele-calypso.yml @@ -45,7 +45,7 @@ ntp_client: options: iburst -blackmagic_desktopvideo_version: 12.8a19 +blackmagic_desktopvideo_version: 12.5a15 blackmagic_desktopvideo_include_gui: yes @@ -71,10 +71,10 @@ kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap player_inst_name: emc-feed -player_ffmpeg_image_version: bullseye-decklink11.7-2022-07-08.29 +player_ffmpeg_image_version: bookworm-decklink12.5-2024-02-08.32 player_input: [ '-f', 'live_flv', '-rtmp_live', 'live', '-i', "rtmp://{{ network_zones.cc_orpheum.prefix | ansible.utils.ipaddr(network_zones.cc_orpheum.offsets['ele-thetys']) | ansible.utils.ipaddr('address') }}/emc-feed/full" ] #player_input: [ '-stream_loop', '-1', '-i', '/srv/videos/Big Buck Bunny 1080p 60fps.mp4' ] -player_output: [ '-ac', '2', '-pix_fmt', 'uyvy422', '-s', '1920x1080' ,'-r', '25','-f', 'decklink', 'DeckLink Mini Monitor 4K' ] +player_output: [ '-ac', '2', '-pix_fmt', 'uyvy422', '-s', '1920x1080' ,'-r', '25', '-f', 'decklink', 'DeckLink Mini Monitor 4K' ] player_volume_mounts: videos: src: /srv/videos diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml index 4e46ee3d..7b1d98d7 100644 --- a/inventory/host_vars/ele-dione.yml +++ b/inventory/host_vars/ele-dione.yml @@ -72,7 +72,7 @@ zfs_pools: create_vdevs: /dev/disk/by-id/ata-WDC_WD40EFAX-68JH4N1_WD-WX92DA1LZA99 -blackmagic_desktopvideo_version: 12.8a19 +blackmagic_desktopvideo_version: 12.5a15 blackmagic_desktopvideo_include_gui: yes diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml index a973c390..41f08c2c 100644 --- a/inventory/host_vars/ele-helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -71,7 +71,7 @@ prometheus_job_multitarget_blackbox__probe: module: ssh_banner -blackmagic_desktopvideo_version: 12.8a19 +blackmagic_desktopvideo_version: 12.5a15 blackmagic_desktopvideo_include_gui: yes diff --git a/inventory/host_vars/ele-hyperion.yml b/inventory/host_vars/ele-hyperion.yml index c36d2095..0871a112 100644 --- a/inventory/host_vars/ele-hyperion.yml +++ b/inventory/host_vars/ele-hyperion.yml @@ -73,7 +73,7 @@ ws_base_lightdm_defaults: autologin-user-timeout: 0 -blackmagic_desktopvideo_version: 12.8a19 +blackmagic_desktopvideo_version: 12.5a15 blackmagic_desktopvideo_include_gui: yes blackmagic_mediaexpress_version: 3.8.1a4 diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml index 00cee8cd..030a7111 100644 --- a/inventory/host_vars/ele-telesto.yml +++ b/inventory/host_vars/ele-telesto.yml @@ -48,7 +48,7 @@ ntp_client: options: iburst -blackmagic_desktopvideo_version: 12.8a19 +blackmagic_desktopvideo_version: 12.5a15 blackmagic_desktopvideo_include_gui: yes diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 23ce5904..34529e0f 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -56,7 +56,7 @@ prometheus_job_multitarget_blackbox__probe: module: ssh_banner -blackmagic_desktopvideo_version: 12.8a19 +blackmagic_desktopvideo_version: 12.5a15 blackmagic_desktopvideo_include_gui: yes @@ -91,7 +91,7 @@ streamer_rtmp_storage: streamer_rtmp_base_path: /srv/streamer streamer_rtmp_inst_name: emc-feed streamer_rtmp_nginx_image_version: 2022-07-10.30 -streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-07-08.29 +streamer_rtmp_ffmpeg_image_version: bookworm-decklink12.5-2024-02-08.32 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" streamer_rtmp_config: diff --git a/roles/streaming/player/templates/pod-spec.yml.j2 b/roles/streaming/player/templates/pod-spec.yml.j2 index 8cd6c355..128e20ff 100644 --- a/roles/streaming/player/templates/pod-spec.yml.j2 +++ b/roles/streaming/player/templates/pod-spec.yml.j2 @@ -29,6 +29,9 @@ containers: subPath: blackmagic mountPath: /usr/lib/blackmagic readOnly: true + - name: decklink-etc + mountPath: /etc/blackmagic + readOnly: true {% for name, mount in player_volume_mounts.items() %} - name: {{ name }} mountPath: {{ mount.dest }} @@ -43,6 +46,9 @@ volumes: hostPath: type: Directory path: /usr/lib/ +- name: decklink-etc + hostPath: + path: /etc/blackmagic {% for name, mount in player_volume_mounts.items() %} - name: {{ name }} hostPath: diff --git a/roles/streaming/recorder/templates/pod-spec.yml.j2 b/roles/streaming/recorder/templates/pod-spec.yml.j2 index 8fbeadba..21c57f45 100644 --- a/roles/streaming/recorder/templates/pod-spec.yml.j2 +++ b/roles/streaming/recorder/templates/pod-spec.yml.j2 @@ -38,6 +38,9 @@ containers: subPath: blackmagic mountPath: /usr/lib/blackmagic readOnly: true + - name: decklink-etc + mountPath: /etc/blackmagic + readOnly: true volumes: - name: home @@ -50,3 +53,6 @@ volumes: hostPath: type: Directory path: /usr/lib/ +- name: decklink-etc + hostPath: + path: /etc/blackmagic diff --git a/roles/streaming/streamer/rtmp/templates/pod-spec.yml.j2 b/roles/streaming/streamer/rtmp/templates/pod-spec.yml.j2 index 81058cea..8ec89c5b 100644 --- a/roles/streaming/streamer/rtmp/templates/pod-spec.yml.j2 +++ b/roles/streaming/streamer/rtmp/templates/pod-spec.yml.j2 @@ -59,6 +59,9 @@ containers: subPath: blackmagic mountPath: /usr/lib/blackmagic readOnly: true + - name: decklink-etc + mountPath: /etc/blackmagic + readOnly: true {% for name, forward in streamer_rtmp_forwards.items() %} - name: "forward-{{ name }}" @@ -135,6 +138,9 @@ volumes: hostPath: type: Directory path: /usr/lib/ +- name: decklink-etc + hostPath: + path: /etc/blackmagic {% if streamer_rtmp_recording is defined %} - name: recordings hostPath: -- cgit v1.2.3