Further improvement of borders detection

Author: philiptn

yt-dlp_discord

@@ -13,6 +13,8 @@ target_audio_bitrate=96 # 128kbps target audio bitrate
 audio_only=0
 crop=0
 cropvalue="crop=iw:ih:(in_w-out_w)/2:(in_h-out_h)/2"
+cropdetect_params_bb="20:16:0"
+cropdetect_params_wb="3:16:0"
 verbose="--no-warnings"
 ffmpeg_enable=1
 ffmpeg_loglevel="-loglevel quiet -stats"
@@ -89,24 +91,34 @@ file_no_ext=$(find .tmp -type f | cut -d "/" -f 2 | cut -d "." -f 1)
 
 if [[ "$crop" = "1" ]]
 then
-   echo -e "[FFmpeg] ${YELLOW}Auto-cropping enabled.${ENDCOL}"
+   echo "[FFmpeg] Auto-cropping enabled."
+   
+   baseres=$(ffmpeg -i ".tmp/$file" -t 1 -vf "cropdetect=0:0:0" -f null - 2>&1 | awk '/crop/ { print $NF }' | tail -1)
+   
    # Detect black bars
-   cropvalue_bb_initial=$(ffmpeg -i ".tmp/$file" -t 1 -vf "cropdetect=20:2:0" -f null - 2>&1 | awk '/crop/ { print $NF }' | tail -1)
-   cropvalue_bb_seek=$(ffmpeg -ss 5 -i ".tmp/$file" -t 1 -vf "cropdetect=20:2:0" -f null - 2>&1 | awk '/crop/ { print $NF }' | tail -1)
+   cropvalue_bb_initial=$(ffmpeg -ss 1 -i ".tmp/$file" -t 1 -vf "cropdetect=${cropdetect_params_bb}" -f null - 2>&1 | awk '/crop/ { print $NF }' | tail -1)
+   cropvalue_bb_seek=$(ffmpeg -ss 6 -i ".tmp/$file" -t 1 -vf "cropdetect=${cropdetect_params_bb}" -f null - 2>&1 | awk '/crop/ { print $NF }' | tail -1)
 
    # Detect white bars
-   cropvalue_wb_initial=$(ffmpeg -i ".tmp/$file" -t 1 -vf "lutrgb=r=negval:g=negval:b=negval, cropdetect=20:2:0" -f null - 2>&1 | awk '/crop/ { print $NF }' | tail -1)
-   cropvalue_wb_seek=$(ffmpeg -ss 5 -i ".tmp/$file" -t 1 -vf "lutrgb=r=negval:g=negval:b=negval, cropdetect=20:2:0" -f null - 2>&1 | awk '/crop/ { print $NF }' | tail -1)
+   cropvalue_wb_initial=$(ffmpeg -ss 1 -i ".tmp/$file" -t 1 -vf "lutrgb=r=negval:g=negval:b=negval, cropdetect=${cropdetect_params_wb}" -f null - 2>&1 | awk '/crop/ { print $NF }' | tail -1)
+   cropvalue_wb_seek=$(ffmpeg -ss 6 -i ".tmp/$file" -t 1 -vf "lutrgb=r=negval:g=negval:b=negval, cropdetect=${cropdetect_params_wb}" -f null - 2>&1 | awk '/crop/ { print $NF }' | tail -1)
 
-   # If the calculated crop-value is identical from the start of the video and 5 seconds in, apply crop value.
+   # If calculated crop-value is identical value both from the start and 6 seconds in, and the values are different from base resolution
    if [[ "$cropvalue_bb_initial" = "$cropvalue_bb_seek" ]]
    then
-      cropvalue=$cropvalue_bb_seek
-   fi
-   
-   if [[ "$cropvalue_wb_initial" = "$cropvalue_wb_seek" ]]
-   then
-      cropvalue=$cropvalue_wb_seek
+      if [[ "$cropvalue_bb_initial" != "$baseres" ]]
+      then
+         cropvalue=$cropvalue_bb_initial
+      fi
+
+      # If the inverted crop-value detection is not base resolution, apply crop based on white borders instead.
+      if [[ "$cropvalue_wb_initial" = "$cropvalue_wb_seek" ]]
+      then
+         if [[ "$cropvalue_wb_initial" !=  "$baseres" ]]
+         then
+            cropvalue=$cropvalue_wb_initial
+	 fi
+      fi
    fi
 fi
 
@@ -159,6 +171,7 @@ if [[ "$ffmpeg_enable" = "1" ]]
 then
    echo "[FFmpeg] Converting video..."
    ffmpeg $ffmpeg_loglevel -i ".tmp/$file" $postprocessor_args_str "$file_no_ext.mp4" && rm ".tmp/$file" && rm -rf .tmp
+   echo -e "[FFmpeg] File saved as: '${YELLOW}$file_no_ext.mp4${ENDCOL}'"
 fi
 
 # Print debug info if verbose is enabled
@@ -173,6 +186,7 @@ then
    echo -e "${YELLOW}Total bitrate (bits):${ENDCOL} $total_bitrate"
    echo -e "${YELLOW}Video bitrate (bits):${ENDCOL} $video_bitrate"
    echo -e "${YELLOW}Audio bitrate (bits):${ENDCOL} $audio_bitrate"
+   echo -e "${YELLOW}Base resolution:${ENDCOL} $baseres"
    echo -e "${YELLOW}Cropvalue black bars initial:${ENDCOL} $cropvalue_bb_initial"
    echo -e "${YELLOW}Cropvalue black bars seek:${ENDCOL} $cropvalue_bb_seek"
    echo -e "${YELLOW}Cropvalue white bars initial:${ENDCOL} $cropvalue_wb_initial"