diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-03-05 15:35:28 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-03-05 15:35:28 +0100 |
| commit | 5657c5aca784fc2afee9a9493bfe41c5501d3e20 (patch) | |
| tree | 52edfa794a35edd32767b13d998c45ea76f358ce | |
| parent | update blackmagic desktopvideo for all machines (diff) | |
update blackmagic desktop video
| -rw-r--r-- | inventory/host_vars/ch-thetys.yml | 9 | ||||
| -rw-r--r-- | inventory/host_vars/s2-thetys.yml | 2 | ||||
| -rw-r--r-- | roles/streaming/blackmagic/desktopvideo/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/streaming/rtmp/streamer/defaults/main.yml | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml index 21218a76..7bea4df2 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -20,6 +20,7 @@ network: admin_users_host: - equinox +apt_repo_provider: default apt_repo_components: - main - contrib @@ -27,6 +28,7 @@ apt_repo_components: blackmagic_desktopvideo_version: 11.7a12 +blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com @@ -52,8 +54,11 @@ kubernetes_standalone_cni_variant: with-portmap rtmp_streamer_base_path: /srv/storage/streamer rtmp_streamer_inst_name: feed -rtmp_streamer_nginx_image_version: 2021-02-20.13 +rtmp_streamer_nginx_image_version: 2021-02-24.20 rtmp_streamer_decklink_card: "DeckLink Mini Recorder" rtmp_streamer_recording_enabled: no rtmp_streamer_config: - input_params: ['-f', 'decklink', '-format_code', 'Hp25', '-ac', '2', '-i'] +# input_params: ['-f', 'decklink', '-video_input', 'hdmi', '-format_code', 'Hp25', '-ac', '2', '-i'] +# input_params: ['-f', 'decklink', '-video_pts', 'wallclock', '-audio_pts', 'wallclock', '-video_input', 'hdmi', '-format_code', 'Hp25', '-ac', '2', '-i'] + input_params: ['-copyts', '-f', 'decklink', '-video_pts', 'abs_wallclock', '-audio_pts', 'abs_wallclock', '-video_input', 'hdmi', '-format_code', 'Hp25', '-ac', '2', '-i'] +# input_params: ['-copyts', '-f', 'decklink', '-decklink_copyts', '1', '-video_input', 'hdmi', '-format_code', 'Hp25', '-ac', '2', '-i'] diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index d2d99006..8331a198 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -64,7 +64,7 @@ zfs_pools: rtmp_streamer_base_path: /srv/storage/streamer rtmp_streamer_inst_name: feed -rtmp_streamer_nginx_image_version: 2021-02-07.11 +rtmp_streamer_nginx_image_version: 2021-02-24.20 rtmp_streamer_decklink_card: "DeckLink Mini Recorder" rtmp_streamer_recording_enabled: yes rtmp_streamer_config: diff --git a/roles/streaming/blackmagic/desktopvideo/tasks/main.yml b/roles/streaming/blackmagic/desktopvideo/tasks/main.yml index 03bff4bb..980e10e1 100644 --- a/roles/streaming/blackmagic/desktopvideo/tasks/main.yml +++ b/roles/streaming/blackmagic/desktopvideo/tasks/main.yml @@ -3,6 +3,12 @@ import_role: name: apt-repo/blackmagic +- name: install xauth package for SSH X-Forwarding to work + when: blackmagic_desktopvideo_include_gui + apt: + name: xauth + state: present + - name: generate list of desktopvideo packages set_fact: blackmagic_desktopvideo_packages: "{{ ['desktopvideo'] | union(blackmagic_desktopvideo_include_gui | ternary(['desktopvideo-gui'], [])) }}" diff --git a/roles/streaming/rtmp/streamer/defaults/main.yml b/roles/streaming/rtmp/streamer/defaults/main.yml index 614fc95e..27b18cbf 100644 --- a/roles/streaming/rtmp/streamer/defaults/main.yml +++ b/roles/streaming/rtmp/streamer/defaults/main.yml @@ -3,7 +3,7 @@ rtmp_streamer_base_path: /srv/rtmp/streamer rtmp_streamer_port: 1935 # rtmp_streamer_inst_name: feed -# rtmp_streamer_nginx_image_version: 2021-02-07.11 +# rtmp_streamer_nginx_image_version: 2021-02-24.20 # rtmp_streamer_decklink_card: "DeckLink Mini Recorder" rtmp_streamer_app_name: "{{ rtmp_streamer_inst_name }}" rtmp_streamer_quality_levels: |