diff options
-rw-r--r-- | dan/ele-hyperion.yml | 4 | ||||
-rw-r--r-- | inventory/host_vars/ch-dione.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/ch-helene.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/ele-thetys.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/glt-calypso.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/glt-tsdatacop.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/s2-thetys.yml | 2 | ||||
-rw-r--r-- | roles/streaming/recorder/defaults/main.yml | 2 | ||||
-rw-r--r-- | roles/streaming/streamer/rtmp/defaults/main.yml | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/dan/ele-hyperion.yml b/dan/ele-hyperion.yml index 6b4dab92..5905a1b6 100644 --- a/dan/ele-hyperion.yml +++ b/dan/ele-hyperion.yml @@ -63,5 +63,5 @@ exec docker run --rm -it --device=/dev/blackmagic:/dev/blackmagic -v /usr/lib/libDeckLinkAPI.so:/usr/lib/libDeckLinkAPI.so \ -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 25 -f decklink "$decklink_device" + registry.gitlab.com/spreadspace/docker/ffmpeg:bookworm-decklink12.5-2024-02-18.33 \ + /usr/bin/ffmpeg -i "/srv/$video_name" -channels 2 -pix_fmt uyvy422 -s 1920x1080 -r 25 -f decklink "$decklink_device" diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index 0b21c563..4503b49a 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -59,5 +59,5 @@ kubelet_storage: # streamer_rtmp_inst_name: feed # streamer_rtmp_nginx_image_version: 2024-02-18.31 # streamer_rtmp_ffmpeg_image_version: bookworm-decklink12.5-2024-02-18.33 -# streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp60', '-video_input', 'sdi', '-ac', '2', '-i', 'DeckLink Studio 4K'] +# streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp60', '-video_input', 'sdi', '-channels', '2', '-i', 'DeckLink Studio 4K'] # 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 8e7c828b..36bffe97 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -59,5 +59,5 @@ kubelet_storage: # streamer_rtmp_inst_name: feed # streamer_rtmp_nginx_image_version: 2024-02-18.31 # streamer_rtmp_ffmpeg_image_version: bookworm-decklink12.5-2024-02-18.33 -# streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp50', '-ac', '2', '-i', 'DeckLink SDI 4K'] +# streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp50', '-channels', '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/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index a0e20a38..cd7a20fa 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -92,7 +92,7 @@ streamer_rtmp_base_path: /srv/streamer streamer_rtmp_inst_name: emc-feed streamer_rtmp_nginx_image_version: 2024-02-18.31 streamer_rtmp_ffmpeg_image_version: bookworm-decklink12.5-2024-02-18.33 -streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink SDI 4K'] +streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp25', '-channels', '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/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml index 0f517e39..9017ec06 100644 --- a/inventory/host_vars/glt-calypso.yml +++ b/inventory/host_vars/glt-calypso.yml @@ -70,7 +70,7 @@ recorder_storage: recorder_base_path: /srv/storage/recorder recorder_inst_name: feed-glt21s1 recorder_ffmpeg_image_version: bookworm-decklink12.5-2024-02-18.33 -recorder_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink SDI (1)'] +recorder_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-channels', '2', '-i', 'DeckLink SDI (1)'] recorder_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv" recorder_segment_time: 3600 diff --git a/inventory/host_vars/glt-tsdatacop.yml b/inventory/host_vars/glt-tsdatacop.yml index f169785e..a5294801 100644 --- a/inventory/host_vars/glt-tsdatacop.yml +++ b/inventory/host_vars/glt-tsdatacop.yml @@ -63,7 +63,7 @@ recorder_storage: recorder_base_path: /srv/recorder recorder_inst_name: feed-glt21s3 recorder_ffmpeg_image_version: bookworm-decklink12.5-2024-02-18.33 -recorder_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder'] +recorder_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-channels', '2', '-i', 'DeckLink Mini Recorder'] recorder_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv" recorder_segment_time: 3600 diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index fa46a4ec..9ae87cc5 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -72,7 +72,7 @@ streamer_rtmp_base_path: /srv/storage/streamer streamer_rtmp_inst_name: feed streamer_rtmp_nginx_image_version: 2024-02-18.31 streamer_rtmp_ffmpeg_image_version: bookworm-decklink12.5-2024-02-18.33 -streamer_rtmp_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder'] +streamer_rtmp_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-channels', '2', '-i', 'DeckLink Mini Recorder'] streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p" streamer_rtmp_recording: level: full diff --git a/roles/streaming/recorder/defaults/main.yml b/roles/streaming/recorder/defaults/main.yml index 39303f50..d31c0e97 100644 --- a/roles/streaming/recorder/defaults/main.yml +++ b/roles/streaming/recorder/defaults/main.yml @@ -6,7 +6,7 @@ recorder_base_path: /srv/recorder # recorder_inst_name: feed # recorder_ffmpeg_image_version: bookworm-decklink12.5-2024-02-18.33 -# recorder_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder'] +# recorder_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-channels', '2', '-i', 'DeckLink Mini Recorder'] # recorder_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv" recorder_audio_tracks: - all diff --git a/roles/streaming/streamer/rtmp/defaults/main.yml b/roles/streaming/streamer/rtmp/defaults/main.yml index 7447e209..9e051ee0 100644 --- a/roles/streaming/streamer/rtmp/defaults/main.yml +++ b/roles/streaming/streamer/rtmp/defaults/main.yml @@ -8,7 +8,7 @@ streamer_rtmp_port: 1935 # streamer_rtmp_inst_name: feed # streamer_rtmp_nginx_image_version: 2024-02-18.31 # streamer_rtmp_ffmpeg_image_version: bookworm-decklink12.5-2024-02-18.33 -# streamer_rtmp_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder'] +# streamer_rtmp_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-channels', '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 }}" streamer_rtmp_audio_track: all |