Merge remote-tracking branch 'zdv2/develop' into develop

[BK-2020-03.git] / user / mp4_make_480.sh

diff --git a/user/mp4_make_480.sh b/user/mp4_make_480.sh
index 8652f1c1e8f1199a748f6b4364ab5c9bab9ce87c..9d23f77819faf7a9646def4d14b6078fff9d0857 100755 (executable)
--- a/user/mp4_make_480.sh
+++ b/user/mp4_make_480.sh
@@ -5,21 +5,22 @@
 #        arg2  dir  output dir (optional)
 # Output: dir   ./out/
 #         file  ./out/[files]_480.mp4
-# Version: 0.1.3
+# Version: 0.1.6
 # Depends: GNU parallel 20161222, ffmpeg 4.3.6-0
 # Ref/Attrb: [1]: FFmpeg wiki: https://trac.ffmpeg.org/wiki/Scaling
 declare -g dir_in dir_out;
 
 check_input() {
     dir_in="$1";
+    if [[ ! -d "$dir_in" ]]; then echo "FATAL:Not a dir:$dir_in" 1>&2; exit 1; fi;
     if [[ $# -le 0 ]]; then echo "FATAL:Insufficient args:$#" 1>&2; exit 1; fi;
     if [[ $# -eq 2 ]]; then
         dir_out="$2";
     else
-        dir_out="./out_480";
+        dir_out="${dir_in}/out_480";
     fi;
     export dir_out;
-    if [[ ! -d "$dir_in" ]]; then echo "FATAL:Not a dir:$dir_in" 1>&2; exit 1; fi;
+    
     mkdir -p "$dir_out";
     declare -p dir_in dir_out;  # debug
 };
@@ -31,7 +32,7 @@ job_ffmpeg() {
     path_in="$1";
     path_out="$2";
     file_in="$(basename "$path_in")";
-    path_out=./"$dir_out"/"${file_in%.mp4}"_480.mp4;
+    path_out="${dir_out}/${file_in%.[mM][pP]4}"_480.mp4;
     opt_scale="scale=-2:480";  # See [1]
     declare -p path_in path_out file_in dir_out path_out opt_scale;
     ffmpeg -nostdin -i "$path_in" -vf "$opt_scale" "$path_out";
@@ -39,8 +40,13 @@ job_ffmpeg() {
 export -f job_ffmpeg;
 
 main() {
+    SECONDS=0;
+    ti="$(date -Is)";
     check_input "$@";
     convert_video;
+    tf="$(date -Is)";
+    printf "%s\n" "STATUS:Finished in $SECONDS seconds with status $?.";
+    printf "%s\n%s\n%s\n" "STATUS:Job start and end times:" "$ti" "$f";
 };
 
 main "$@";