From 6ea71d6ca1789a51325f732a6a56148a1c3abbc4 Mon Sep 17 00:00:00 2001
From: olli <olli@ds9.dedyn.io>
Date: Wed, 24 Aug 2022 17:14:59 +0200
Subject: [PATCH] fixes for linux mint

---
 gaboshlib/g_compress_video.sh | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/gaboshlib/g_compress_video.sh b/gaboshlib/g_compress_video.sh
index 90d1477..98e8428 100644
--- a/gaboshlib/g_compress_video.sh
+++ b/gaboshlib/g_compress_video.sh
@@ -171,18 +171,14 @@ function g_compress_video {
   g_ass="ass=${g_viddone}.ass,"
  fi
  
- if [ -z ${g_remotedockerffmpeg} ]
- then
-   g_echo "Baue MP4 ($g_vid)"
-   echo "cat \"$g_vid\" | docker run -i --rm linuxserver/ffmpeg -loglevel warning -stats -i pipe: -f mp4 -map_metadata -1 -map_chapters -1 -map $g_vidstream -map $g_audstream -filter:v \"${g_ass}${g_vidscale}\" -c:v libx265 -crf 25 -x265-params \"vbv-maxrate=${g_vidmaxratenew}:vbv-bufsize=${g_vidmaxratenew}:log-level=warning\" -pix_fmt yuv420p -max_muxing_queue_size 9999 $g_audionew -threads 1 -movflags +faststart+empty_moov -f mp4 pipe: >\"${g_viddone}-stream\"" >"$g_tmp"/cmd
-   echo "ffmpeg -loglevel warning -stats -i \"${g_viddone}-stream\" -c:v copy -c:a copy  -movflags +faststart \"$g_viddone\" < /dev/null 2>&1" >>"$g_tmp"/cmd
-   #echo "ffmpeg -loglevel warning -stats -i \"$g_vid\" -f mp4 -map_metadata -1 -map_chapters -1 -map $g_vidstream -map $g_audstream -filter:v \"${g_ass}${g_vidscale}\" -c:v libx265 -crf 25 -x265-params \"vbv-maxrate=${g_vidmaxratenew}:vbv-bufsize=${g_vidmaxratenew}:log-level=warning\" -pix_fmt yuv420p -max_muxing_queue_size 9999 $g_audionew -threads 1 -movflags +faststart \"$g_viddone\" < /dev/null 2>&1" >"$g_tmp"/cmd
- else
-   g_echo "Baue MP4 ($g_vid) auf ${g_remotedockerffmpeg}"
-   echo "cat \"$g_vid\" | ssh -p33 ${g_remotedockerffmpeg} 'cat | docker run -i --rm linuxserver/ffmpeg -loglevel warning -stats -i pipe: -f mp4 -map_metadata -1 -map_chapters -1 -map $g_vidstream -map $g_audstream -filter:v \"${g_ass}${g_vidscale}\" -c:v libx265 -crf 25 -x265-params \"vbv-maxrate=${g_vidmaxratenew}:vbv-bufsize=${g_vidmaxratenew}:log-level=warning\" -pix_fmt yuv420p -max_muxing_queue_size 9999 $g_audionew -threads 1 -movflags +faststart+empty_moov -f mp4 pipe:' >\"${g_viddone}-stream\"" >"$g_tmp"/cmd
-   echo "ffmpeg -loglevel warning -stats -i \"${g_viddone}-stream\" -c:v copy -c:a copy  -movflags +faststart \"$g_viddone\" < /dev/null 2>&1" >>"$g_tmp"/cmd
- fi 
- g_echo $(cat "$g_tmp"/cmd)
+ echo "ffmpeg -loglevel warning -stats -i \"${g_vid}\" -c:v copy -c:a copy  -movflags +faststart -f mp4 \"${g_vid}-streamable\" < /dev/null 2>&1" >"$g_tmp"/cmd
+ sshstream="ssh -p33 ${g_remotedockerffmpeg}"
+ [ -z ${g_remotedockerffmpeg} ] && sshstream="sh -c"
+ g_echo "Baue MP4 ($g_vid) ${g_remotedockerffmpeg}"
+ echo "cat \"${g_vid}-streamable\"| $sshstream 'cat | docker run -i --rm linuxserver/ffmpeg -loglevel warning -stats -i pipe: -f mp4 -map_metadata -1 -map_chapters -1 -map $g_vidstream -map $g_audstream -filter:v \"${g_ass}${g_vidscale}\" -c:v libx265 -crf 25 -x265-params \"vbv-maxrate=${g_vidmaxratenew}:vbv-bufsize=${g_vidmaxratenew}:log-level=warning\" -pix_fmt yuv420p -max_muxing_queue_size 9999 $g_audionew -threads 1 -movflags +faststart+empty_moov -f mp4 pipe:' >\"${g_viddone}-stream\"" >>"$g_tmp"/cmd
+ echo "ffmpeg -loglevel warning -stats -i \"${g_viddone}-stream\" -c:v copy -c:a copy  -movflags +faststart -f mp4 \"$g_viddone\" < /dev/null 2>&1" >>"$g_tmp"/cmd
+
+ cat "$g_tmp"/cmd
  sh "$g_tmp"/cmd
  # Wiederholen falls schief gelaufen
  local g_try=2