summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2023-02-28 15:38:17 +0100
committerChristian Pointner <equinox@spreadspace.org>2023-02-28 15:38:17 +0100
commite985994ad4995d1e2628dd6033ee232d1d14fdf7 (patch)
treed4c77be716dc7b7de1721fcb35e728a65f6411db
parentelevate-festival: switch to real citycom ip ranges (diff)
elevate: switch to 1080p25
-rw-r--r--dan/ele-hyperion.yml2
-rw-r--r--inventory/host_vars/ele-calypso.yml2
-rw-r--r--inventory/host_vars/ele-thetys.yml2
-rw-r--r--inventory/host_vars/ele-ymir.yml2
4 files changed, 4 insertions, 4 deletions
diff --git a/dan/ele-hyperion.yml b/dan/ele-hyperion.yml
index 8473edea..6b4dab92 100644
--- a/dan/ele-hyperion.yml
+++ b/dan/ele-hyperion.yml
@@ -64,4 +64,4 @@
-v /usr/lib/libDeckLinkAPI.so:/usr/lib/libDeckLinkAPI.so -v /usr/lib/blackmagic:/usr/lib/blackmagic \
-v "$video_path_full:/srv/$video_name" \
registry.gitlab.com/spreadspace/docker/ffmpeg:bullseye-decklink11.7-2022-07-08.29 \
- /usr/bin/ffmpeg -i "/srv/$video_name" -ac 2 -pix_fmt uyvy422 -s 1920x1080 -r 50 -f decklink "$decklink_device"
+ /usr/bin/ffmpeg -i "/srv/$video_name" -ac 2 -pix_fmt uyvy422 -s 1920x1080 -r 25 -f decklink "$decklink_device"
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index dae985c5..46ccb354 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -80,7 +80,7 @@ player_inst_name: emc-feed
player_ffmpeg_image_version: bullseye-decklink11.7-2022-07-08.29
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', '50','-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-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 5350a525..a4738859 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -94,7 +94,7 @@ 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_input: ['-f', 'decklink', '-format_code', 'Hp50', '-ac', '2', '-i', 'DeckLink SDI 4K']
+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:
x264:
diff --git a/inventory/host_vars/ele-ymir.yml b/inventory/host_vars/ele-ymir.yml
index bbfc4734..c0478146 100644
--- a/inventory/host_vars/ele-ymir.yml
+++ b/inventory/host_vars/ele-ymir.yml
@@ -74,6 +74,6 @@ ws_base_xrandr_setup_script: |
#!/bin/bash
xrandr --output HDMI-1 --mode 1920x1080 --primary
- xrandr --output HDMI-2 --mode 1920x1080 --rate 50 --left-of HDMI-1
+ xrandr --output HDMI-2 --mode 1920x1080 --rate 25 --left-of HDMI-1
exit 0