summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-09-11 11:57:29 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-09-11 11:57:29 +0200
commit59b2f6f194fd1959c034916905582830fb8509ad (patch)
treea33af1dd31107c935265a3e18c08459ecf5f46d2
parent610e63c004c05a6ffe9aaa45477ee269c0b37a21 (diff)
downloadnixos-59b2f6f194fd1959c034916905582830fb8509ad.tar
nixos-59b2f6f194fd1959c034916905582830fb8509ad.tar.gz
nixos-59b2f6f194fd1959c034916905582830fb8509ad.tar.bz2
nixos-59b2f6f194fd1959c034916905582830fb8509ad.tar.xz
nixos-59b2f6f194fd1959c034916905582830fb8509ad.zip
ffmpeg output
-rw-r--r--odin/strm/send_kitty4
1 files changed, 3 insertions, 1 deletions
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 @@
3set -o errexit 3set -o errexit
4umask 022 4umask 022
5 5
6ffmpeg() { { { @ffmpeg@/bin/ffmpeg $@ 1>&3 } 2>&1 | stdbuf -o 0 tr '\r' '\n' | grep -v --line-buffered -E '^$' 1>&2 } 3>&1 }
7
6wDir=/srv/hlidskjalf 8wDir=/srv/hlidskjalf
7concatDir=${wDir}/concat 9concatDir=${wDir}/concat
8lastFile=${concatDir}/latest.mkv 10lastFile=${concatDir}/latest.mkv
@@ -36,6 +38,6 @@ fi
36 38
37newFile="${concatDir}/hlidskjalf.$(date +'%Y-%m-%d-%H-%M-%S').mkv" 39newFile="${concatDir}/hlidskjalf.$(date +'%Y-%m-%d-%H-%M-%S').mkv"
38 40
39@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} 41ffmpeg -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}
40queue.hel -p -r ${newFile} 42queue.hel -p -r ${newFile}
41ln -vfs $(realpath --relative-to=${lastFile:h} ${newFile}) ${lastFile} 43ln -vfs $(realpath --relative-to=${lastFile:h} ${newFile}) ${lastFile}