diff --git a/CHANGELOG.md b/CHANGELOG.md index f36afe5ed..620c910e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG - sitespeed.io +## UNRELEASED +### Added +* Added filenames to the video when you combine two videos in combineVideos.sh + ## 6.2.3 2017-12-29 ### Fixed * Upgraded to PageXray 2.0.2 and Coach 1.1.2 that fixes [#1861](https://github.com/sitespeedio/sitespeed.io/issues/1861). Redirect chains that redirected back to the main page caused out of memory. diff --git a/tools/combineVideos.sh b/tools/combineVideos.sh index 889bb6877..45cbd456e 100755 --- a/tools/combineVideos.sh +++ b/tools/combineVideos.sh @@ -15,6 +15,8 @@ fi TMP_VIDEO_DIR=tmp-video FILE1=$(basename $1) +NAME1=$(basename $1 .mp4) +NAME2=$(basename $2 .mp4) FILE2=$(basename $2) OUTPUT_FILE=${3:-$(basename $1 .mp4)-vs-$(basename $2)} SLOWDOWN=5.0 @@ -38,7 +40,7 @@ docker run -v "$(pwd)":/video sitespeedio/visualmetrics-deps ffmpeg \ echo "Slow down the video" -docker run -v "$(pwd)":/video sitespeedio/visualmetrics-deps ffmpeg -i /video/$TMP_VIDEO_DIR/output.mp4 -filter:v "setpts=$SLOWDOWN*PTS" /video/${OUTPUT_FILE} > /dev/null 2>&1 +docker run -v "$(pwd)":/video sitespeedio/visualmetrics-deps ffmpeg -i /video/$TMP_VIDEO_DIR/output.mp4 -filter:v "setpts=$SLOWDOWN*PTS" -vf drawtext="text='$NAME1 vs $NAME2':fontcolor=white:fontsize=60:box=1:boxcolor=0x000000AA:x=(w-tw)/2: y=40" /video/${OUTPUT_FILE} > /dev/null 2>&1 # Cleanup rm -fR $TMP_VIDEO_DIR