From 59b2f6f194fd1959c034916905582830fb8509ad Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 11 Sep 2018 11:57:29 +0200 Subject: ffmpeg output --- odin/strm/send_kitty | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/odin/strm/send_kitty b/odin/strm/send_kitty index 66012255..4d59a4b8 100644 --- a/odin/strm/send_kitty +++ b/odin/strm/send_kitty @@ -3,6 +3,8 @@ set -o errexit umask 022 +ffmpeg() { { { @ffmpeg@/bin/ffmpeg $@ 1>&3 } 2>&1 | stdbuf -o 0 tr '\r' '\n' | grep -v --line-buffered -E '^$' 1>&2 } 3>&1 } + wDir=/srv/hlidskjalf concatDir=${wDir}/concat lastFile=${concatDir}/latest.mkv @@ -36,6 +38,6 @@ fi newFile="${concatDir}/hlidskjalf.$(date +'%Y-%m-%d-%H-%M-%S').mkv" -@ffmpeg@/bin/ffmpeg -safe 0 -f concat -i =(awk $'{ print "file \'"$0"\'" }' ${fList}) -c:v libx264 -r 30 -vf 'scale=1920:1080:force_original_aspect_ratio=decrease,pad=1920:1080:(ow-iw)/2:(oh-ih)/2' -metadata "description=$(xargs -a ${fList} -- basename -s ".mkv")" ${newFile} +ffmpeg -safe 0 -f concat -i =(awk $'{ print "file \'"$0"\'" }' ${fList}) -c:v libx264 -r 30 -vf 'scale=1920:1080:force_original_aspect_ratio=decrease,pad=1920:1080:(ow-iw)/2:(oh-ih)/2' -metadata "description=$(xargs -a ${fList} -- basename -s ".mkv")" ${newFile} queue.hel -p -r ${newFile} ln -vfs $(realpath --relative-to=${lastFile:h} ${newFile}) ${lastFile} -- cgit v1.2.3