From 5e0d24aa44197ef1ea1558658e72ce89a60a6f79 Mon Sep 17 00:00:00 2001
From: Pavel Kirilin <win10@list.ru>
Date: Sat, 16 May 2020 22:44:07 +0400
Subject: [PATCH] Fixed scripts.
Signed-off-by: Pavel Kirilin <win10@list.ru>
---
Makefile | 3 ++-
assets/{stream_started.ass => message.ass} | 4 ++--
assets/scripts/concatenator.sh | 1 +
assets/scripts/downloader.sh | 6 ++++++
4 files changed, 11 insertions(+), 3 deletions(-)
rename assets/{stream_started.ass => message.ass} (88%)
diff --git a/Makefile b/Makefile
index d8551e8..bd13d21 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,8 @@ ifndef back
$(eval back=${DEFAULT_BG})
endif
@echo "Compiling ending"
- @ffmpeg -v error -stream_loop -1 -i "${ASSETS_DIR}backgrounds/${back}" -i "${ASSETS_DIR}/sounds/${sound}" -vf "subtitles=${ASSETS_DIR}stream_started.ass" -c:a copy -strict -1 -shortest -y "${OUT_DIR}ending.mp4"
+ @ sh ${ASSETS_DIR}/scripts/downloader.sh "${ASSETS_DIR}backgrounds/${back}" "${OUT_DIR}/ending_src"
+ @ffmpeg -v error -stream_loop -1 -i "${OUT_DIR}/ending_src" -i "${ASSETS_DIR}/sounds/${sound}" -vf "subtitles=${ASSETS_DIR}message.ass" -c:a copy -strict -1 -shortest -y "${OUT_DIR}ending.mp4"
@echo "Ending compiled successfully"
build_sound: out_dir
diff --git a/assets/stream_started.ass b/assets/message.ass
similarity index 88%
rename from assets/stream_started.ass
rename to assets/message.ass
index b1cb407..8cc7da8 100644
--- a/assets/stream_started.ass
+++ b/assets/message.ass
@@ -17,5 +17,5 @@ Style: Bottom,Arial,20,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,-1,0,0,0,100,
[Events]
Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
-Dialogue: 0,0:00:03.00,0:00:12.00,Center,,0,0,0,,{\pos(190,160)}{\fad(1200, 0)} Stream is up {\fad}{\pos}
-Dialogue: 0,0:00:05.00,0:00:12.00,Center,,0,0,0,,{\pos(190,200)}{\fad(1200, 0)} http://s3rius.ddns.net/{\fad}{\pos}
+Dialogue: 0,0:00:03.00,0:00:12.00,Center,,0,0,0,,{\pos(190,160)}{\fad(1200, 0)} The stream is offline. {\fad}{\pos}
+Dialogue: 0,0:00:05.00,0:00:12.00,Center,,0,0,0,,{\pos(190,200)}{\fad(1200, 0)} Stay tuned on http://s3rius.ddns.net/{\fad}{\pos}
diff --git a/assets/scripts/concatenator.sh b/assets/scripts/concatenator.sh
index 1ea2cf2..bd94c57 100644
--- a/assets/scripts/concatenator.sh
+++ b/assets/scripts/concatenator.sh
@@ -26,6 +26,7 @@ echo "processing $2"
vidtmp=$(mktemp $workdir/vidXXXXXX.mp4)
frames=$(count_frames "$2")
ffmpeg -v error -i "$2" \
+ -vf fps=60 \
-c:v libx264 -qp 0 \
-strict -2 -y \
$vidtmp
diff --git a/assets/scripts/downloader.sh b/assets/scripts/downloader.sh
index 6e84b87..47d9399 100644
--- a/assets/scripts/downloader.sh
+++ b/assets/scripts/downloader.sh
@@ -1,6 +1,12 @@
outfile=$2
url=$1
+if [[ -e "$url" ]];then
+ echo "It's a local file. Skipping youtube loading."
+ cp "$url" "$outfile"
+ exit 0
+fi
+
youtube-dl -F "$url"
read -p 'Prefered quality: ' quality
--
GitLab