diff --git a/Makefile b/Makefile
index 934ec51f359b5a5e475e49daa6517e84b188e111..0ef089f85875fc28989a89402da64e68f7adf83f 100644
--- a/Makefile
+++ b/Makefile
@@ -28,15 +28,15 @@ endif
build_ad: cleanup out_dir
@sh ${ASSETS_DIR}/scripts/downloader.sh "${url}" "${OUT_DIR}/new_ad"
@ffmpeg -i "${OUT_DIR}/new_ad" \
- -ss ${ss} -t 10 \
- -an -y "${OUT_DIR}/new_ad.webm"
- @ffmpeg -i "${OUT_DIR}/new_ad.webm" \
+ -ss ${ss} -t ${t} \
+ -an -y "${OUT_DIR}/new_ad.mp4"
+ @ffmpeg -i "${OUT_DIR}/new_ad.mp4" \
-framerate 30 -pix_fmt yuv420p \
-movflags +faststart \
- -b:v 0 -crf 20 \
+ -b:v 0 -crf 23 \
-vf "scale=w=1280:h=720:force_original_aspect_ratio=2,crop=1280:720,subtitles=${ASSETS_DIR}/messages/ad.ass" \
- -c:v vp8 -an -y -strict 1 "${OUT_DIR}/ad.webm"
- @mktemp "${ASSETS_DIR}/ads/adXXXXX.webm" | xargs mv -v "${OUT_DIR}/ad.webm"
+ -c:v h264_nvenc -an -y -strict 1 "${OUT_DIR}/ad.mp4"
+ @mktemp "${ASSETS_DIR}/ads/adXXXXX.mp4" | xargs mv -v "${OUT_DIR}/ad.mp4"
build_sound: out_dir
@sh ${ASSETS_DIR}/scripts/downloader.sh "${url}" "${OUT_DIR}/sound_target"
@@ -71,7 +71,7 @@ install:
pip install --user ffpb
stream:
- vlc --no-dbus -vv --sout-keep --sout '#gather:std{access=http,mux=ogg,dst=:8888/}' --sout-all --loop
+ vlc --no-dbus -vv --sout-keep --sout '#gather:std{access=http{mime=video/mp4},mux=ts,dst=:8888/}' --sout-all --loop
cleanup:
@echo "Cleaning up outdir"
@rm -rfv "${OUT_DIR}"
diff --git a/assets/ads/ad0CmRY.mp4 b/assets/ads/ad0CmRY.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..9c05abc874fc78b5b7a097746f1897190308e714
Binary files /dev/null and b/assets/ads/ad0CmRY.mp4 differ
diff --git a/assets/ads/ad0Nn3q.mp4 b/assets/ads/ad0Nn3q.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..39eeb77c3c5438147f19ceaeee7b9cfd0a94b451
Binary files /dev/null and b/assets/ads/ad0Nn3q.mp4 differ
diff --git a/assets/ads/adE9soi.webm b/assets/ads/adE9soi.webm
deleted file mode 100644
index fd4775c2bb13a52590cb2be79548deacdd9cb2b3..0000000000000000000000000000000000000000
Binary files a/assets/ads/adE9soi.webm and /dev/null differ
diff --git a/assets/ads/adOfPam.webm b/assets/ads/adOfPam.webm
deleted file mode 100644
index d2f9683ece1218868b2f1c8388cd0e90edad1da4..0000000000000000000000000000000000000000
Binary files a/assets/ads/adOfPam.webm and /dev/null differ
diff --git a/assets/ads/adOzauY.mp4 b/assets/ads/adOzauY.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..638cafd04d2745abe63d402ba83a2b141ade6cf6
Binary files /dev/null and b/assets/ads/adOzauY.mp4 differ
diff --git a/assets/ads/adVORXS.mp4 b/assets/ads/adVORXS.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..5512e96baf8a7122365c3c5fcf7da7410c2e2bf1
Binary files /dev/null and b/assets/ads/adVORXS.mp4 differ
diff --git a/assets/ads/adc83lD.mp4 b/assets/ads/adc83lD.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..f71869d50f327f53b479447270b3790f55166aaa
Binary files /dev/null and b/assets/ads/adc83lD.mp4 differ
diff --git a/assets/ads/adcdkrD.webm b/assets/ads/adcdkrD.webm
deleted file mode 100644
index 4f2c150ed3ef2af8a6890729615f74c028ededa5..0000000000000000000000000000000000000000
Binary files a/assets/ads/adcdkrD.webm and /dev/null differ
diff --git a/assets/ads/adulP4O.webm b/assets/ads/adulP4O.webm
deleted file mode 100644
index 60c3f3f4d331ca5b662cadcccdefa4ad3b8de087..0000000000000000000000000000000000000000
Binary files a/assets/ads/adulP4O.webm and /dev/null differ
diff --git a/assets/ads/adzsUQz.webm b/assets/ads/adzsUQz.webm
deleted file mode 100644
index 77c261aefc5abe1de1a74b3c4b7ed70058c1bf1b..0000000000000000000000000000000000000000
Binary files a/assets/ads/adzsUQz.webm and /dev/null differ
diff --git a/assets/messages/ad.ass b/assets/messages/ad.ass
index b6b9bb318f9862bf7fce8253ed3960629b3d441b..802bd74f956487d09374cbfed7d9776156bc7283 100644
--- a/assets/messages/ad.ass
+++ b/assets/messages/ad.ass
@@ -16,5 +16,4 @@ Style: Center,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,00:00:00.00,00:00:10.00,Center,,0,0,0,,{\pos(190,160)}{\fad(1200, 0)} We happy to see you here at {\fad}{\pos}
-Dialogue: 0,00:00:00.00,00:00:10.00,Center,,0,0,0,,{\pos(190,200)}{\fad(1200, 0)} http://s3rius.ddns.net/{\fad}{\pos}
+Dialogue: 0,00:00:00.00,00:00:60.00,Center,,0,0,0,,{\pos(190,160)}{\fad(1200, 0)}We will help to start â˜your☠day a liitle bit better.{\fad}{\pos}
diff --git a/assets/scripts/playerctl_loader.sh b/assets/scripts/playerctl_loader.sh
index 24209ba7a0456daa3aac63b7880f9d06d5fa21cc..13b955f55fa409e1eeff638f6b87a88949482083 100644
--- a/assets/scripts/playerctl_loader.sh
+++ b/assets/scripts/playerctl_loader.sh
@@ -22,8 +22,8 @@ function player(){
function cleanup_and_exit() {
if [[ "$job_started" = "1" ]];then
rm -fv "current.mp3" "bg.png" "cover.jpg" "cover.png"
- find . -name '*.webm' -exec basename {} \; | sort --numeric-sort | xargs -I {} echo "file '{}'" > concat
- ffmpeg -f concat -i concat -c copy "compiled-$((compiled_index + 1)).webm"
+ find . -name '*.mp4' -exec basename {} \; | sort --numeric-sort | xargs -I {} echo "file '{}'" > concat
+ ffmpeg -f concat -i concat -c copy "compiled-$((compiled_index + 1)).mp4"
rm -fv "concat"
popd || exit
find "$workdir" -maxdepth 1 -name "compiled*" -print0 | xargs -I '{}' mv -v '{}' "$res_dir"
@@ -67,22 +67,20 @@ function render_on_gpu(){
target_adv="$4"
ffmpeg -loop 1 -init_hw_device cuda=cuda:0 \
-hwaccel nvdec \
- -vsync 1 -async 1 \
- -r 3 -i "$background" -i "$sound" -r 25 -i "${target_adv}" \
+ -r 15 -i "$background" -i "$sound" -stream_loop -1 -i "${target_adv}" \
-filter_complex "[0:v]scale=w=1280:h=720:force_original_aspect_ratio=2,crop=1280:720[img]; \
- [2:v]setpts=10*PTS[adv]; \
- [adv]loop[ladv]; \
+ [2:v]loop=999,setpts=N/FRAME_RATE/TB[ladv]; \
[img][ladv]overlay=enable='gt(mod(t, 40), 30)'[rv]" \
-map "[rv]" \
-map 1:a \
-framerate 30 -g 60 \
- -c:v vp8 -pix_fmt yuv420p -movflags +faststart \
- -vb 4000k \
- -f webm \
- -c:a libopus \
+ -c:v libx264 -preset ultrafast -crf 23 -pix_fmt yuv420p -movflags +faststart \
+ -c:a aac \
+ -b:v 400k \
+ -b:a 384k \
-err_detect ignore_err \
-shortest -strict -2 -y \
- "${index}.webm"
+ "${index}.mp4"
}
trap "cleanup_and_exit" EXIT