From 371faa43d92974dc09ea89b58796c4faf7db7616 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 29 May 2022 00:56:15 +0200
Subject: rtmp/streamer: move to new encoding scripts

---
 roles/streaming/rtmp/streamer/defaults/main.yml     |  6 ++++--
 roles/streaming/rtmp/streamer/tasks/main.yml        |  2 +-
 .../rtmp/streamer/templates/pod-spec.yml.j2         | 21 ++++++++++++++-------
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'roles/streaming/rtmp')

diff --git a/roles/streaming/rtmp/streamer/defaults/main.yml b/roles/streaming/rtmp/streamer/defaults/main.yml
index d4222f8b..196951d0 100644
--- a/roles/streaming/rtmp/streamer/defaults/main.yml
+++ b/roles/streaming/rtmp/streamer/defaults/main.yml
@@ -7,9 +7,11 @@ rtmp_streamer_base_path: /srv/rtmp/streamer
 rtmp_streamer_port: 1935
 # rtmp_streamer_inst_name: feed
 # rtmp_streamer_nginx_image_version: 2022-05-15.24
-# rtmp_streamer_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13
-# rtmp_streamer_decklink_card: "DeckLink Mini Recorder"
+# rtmp_streamer_ffmpeg_image_version: bullseye-decklink11.7-2022-05-28.17
+# rtmp_streamer_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder']
+# rtmp_streamer_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p,setdar=dar=16/9"
 rtmp_streamer_app_name: "{{ rtmp_streamer_inst_name }}"
+rtmp_streamer_audio_track: orig
 rtmp_streamer_quality_levels:
   - full
 
diff --git a/roles/streaming/rtmp/streamer/tasks/main.yml b/roles/streaming/rtmp/streamer/tasks/main.yml
index 1715bdf9..bb50846c 100644
--- a/roles/streaming/rtmp/streamer/tasks/main.yml
+++ b/roles/streaming/rtmp/streamer/tasks/main.yml
@@ -18,7 +18,7 @@
 
 - name: generate streamer config
   copy:
-    content: "{{ rtmp_streamer_config | combine({'rtmp_base_url': 'rtmp://127.0.0.1/'+rtmp_streamer_app_name}) | to_nice_yaml }}\n"
+    content: "{{ rtmp_streamer_config | combine({'rtmp': {'base_url': 'rtmp://127.0.0.1/'+rtmp_streamer_app_name}}) | to_nice_yaml }}\n"
     dest: "{{ rtmp_streamer_base_path }}/{{ rtmp_streamer_inst_name }}/config.yml"
 
 - name: create recording directory
diff --git a/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2 b/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2
index 5f97d9b8..9d0e7bad 100644
--- a/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2
+++ b/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2
@@ -23,12 +23,22 @@ containers:
   image: registry.gitlab.com/spreadspace/docker/ffmpeg:{{ rtmp_streamer_ffmpeg_image_version }}
   imagePullPolicy: Always
   command:
-  - ffmpeg-decklink-rtmp.py
+  - /usr/local/bin/generic-rtmp.py
   args:
-  - "{{ rtmp_streamer_decklink_card }}"
-{% for level in rtmp_streamer_quality_levels %}
-  - {{ level }}
+{% for param in rtmp_streamer_input %}
+  - '{{ param }}'
 {% endfor %}
+  env:
+  - name: CONFIG_FILENAME
+    value: /srv/config.yml
+  - name: QUALITY_LEVELS
+    value: {{ rtmp_streamer_quality_levels | join(',') }}
+  - name: AUDIO_TRACKS
+    value: {{ rtmp_streamer_audio_track }}
+{% if rtmp_streamer_video_filter_common is defined %}
+  - name: VIDEO_FILTER_COMMON
+    value: "{{ rtmp_streamer_video_filter_common }}"
+{% endif %}
   securityContext:
     privileged: true
   volumeMounts:
@@ -49,9 +59,6 @@ containers:
     subPath: blackmagic
     mountPath: /usr/lib/blackmagic
     readOnly: true
-  env:
-  - name: CONFIG_FILENAME
-    value: /srv/config.yml
 
 {% for name, forward in rtmp_streamer_forwards.items()  %}
 - name: "forward-{{ name }}"
-- 
cgit v1.2.3