From d6deef93355ed4058c925cdbcec0015c33c99184 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 5 Apr 2021 01:59:32 +0200
Subject: use ffmpeg generic segmenter for rtmp/streamer recording feature as
 well

---
 .../rtmp/streamer/templates/pod-spec.yml.j2        | 31 +++++++++++++++++++---
 .../streaming/rtmp/streamer/templates/record.sh.j2 |  9 -------
 2 files changed, 28 insertions(+), 12 deletions(-)
 delete mode 100644 roles/streaming/rtmp/streamer/templates/record.sh.j2

(limited to 'roles/streaming/rtmp/streamer/templates')

diff --git a/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2 b/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2
index ec51ed14..329267bc 100644
--- a/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2
+++ b/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2
@@ -75,12 +75,37 @@ containers:
   - "{{ forward.url }}"
 
 {% endfor %}
-{% if rtmp_streamer_recording_enabled %}
+{% if rtmp_streamer_recording is defined %}
 - name: record
   image: registry.gitlab.com/spreadspace/docker/nginx:{{ rtmp_streamer_nginx_image_version }}
   imagePullPolicy: Always
+  command:
+  - /usr/bin/ffmpeg
   args:
-  - /srv/record.sh
+  - -f
+  - live_flv
+  - -rtmp_live
+  - live
+  - -i
+  - 'rtmp://127.0.0.1/{{ rtmp_streamer_app_name }}/{{ rtmp_streamer_recording.level }}'
+  - -c:a
+  - copy
+  - -c:v
+  - copy
+  - -f
+  - segment
+  - -segment_atclocktime
+  - '1'
+  - -segment_time
+  - '{{ rtmp_streamer_recording.segment_time | default(3600) }}'
+  - -segment_clocktime_offset
+  - '{{ rtmp_streamer_recording.segment_clocktime_offset | default(0) }}'
+  - -strftime
+  - '1'
+  - -reset_timestamps
+  - '1'
+  - '%Y-%m-%d_%H-%M-%S.mkv'
+  workingDir: /srv/recordings
   volumeMounts:
   - name: home
     mountPath: /srv
@@ -103,7 +128,7 @@ volumes:
   hostPath:
     type: Directory
     path: /usr/lib/
-{% if rtmp_streamer_recording_enabled %}
+{% if rtmp_streamer_recording is defined %}
 - name: recordings
   hostPath:
     type: Directory
diff --git a/roles/streaming/rtmp/streamer/templates/record.sh.j2 b/roles/streaming/rtmp/streamer/templates/record.sh.j2
deleted file mode 100644
index 159bf5e2..00000000
--- a/roles/streaming/rtmp/streamer/templates/record.sh.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-BASE_D="/srv/recordings"
-DAY=$(date '+%Y-%m-%d')
-TIME=$(date '+%H-%M-%S')
-
-umask 022
-mkdir -p "$BASE_D/$DAY"
-exec /usr/bin/ffmpeg -f live_flv -rtmp_live live -i "rtmp://127.0.0.1/{{ rtmp_streamer_app_name }}/{{ rtmp_streamer_recording_level }}" -c:a copy -c:v copy -f matroska "$BASE_D/$DAY/$DAY""_$TIME.mkv"
-- 
cgit v1.2.3