From ab91343dd56dbca8ce26fb49e66b3fd470692bc8 Mon Sep 17 00:00:00 2001
From: Nate Bohman <natrinicle@gmail.com>
Date: Tue, 9 Nov 2021 11:36:23 -0700
Subject: [PATCH] Add extra_crop_cover to All Odd Cover Widths

When attempting to convert
https://www.audible.com/pd/Stephen-Fry-Presents-a-Selection-of-Anton-Chekhovs-Short-Stories-Audiobook/B0036GPPWS
using this tool and chaptered mode, ffmpeg fails out with

[libx264 @ 0x5588ef28d780] width not divisible by 2 (483x500)
Error initializing output stream 0:1 -- Error while opening encoder
for output stream #0:1 - maybe incorrect parameters such as bit_rate,
rate, width or height
Conversion failed!

This is because the cover file embedded in the downloaded mp4 file
from Audible has the dimensions 483x500. Found the extra_crop_cover
that's currently being used only for covers from the Audible CLI
tool and extended the script to instead check the dimensions of the
cover file and include the extra_crop_cover anytime the cover has an
odd width.
---
 AAXtoMP3 | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/AAXtoMP3 b/AAXtoMP3
index d5a80a1..028ccfc 100755
--- a/AAXtoMP3
+++ b/AAXtoMP3
@@ -751,7 +751,6 @@ do
   fi
   # Grab the cover art if available.
   cover_file="${output_directory}/cover.jpg"
-  extra_crop_cover=''
   if [ "${continue}" == "0" ]; then
     if [ "${audibleCli}" == "1" ]; then
       # We have a better quality cover file, copy it.
@@ -759,12 +758,6 @@ do
         log "Copy cover file to ${cover_file}..."
       fi
       cp "${extra_cover_file}" "${cover_file}"
-
-      # We now set a variable, ${extra_crop_cover}, which contains an additional
-      # ffmpeg flag. It crops the cover so the width and the height is divisible by two.
-      # Since the standard (in the aax file) image resolution is 512, we set the flag
-      # only if we use a custom cover art.
-      extra_crop_cover='-vf crop=trunc(iw/2)*2:trunc(ih/2)*2'
     else
       # Audible-cli not used, extract the cover from the aax file
       if [ "$((${loglevel} > 1))" == "1" ]; then
@@ -774,6 +767,18 @@ do
     fi
   fi
 
+  extra_crop_cover=''
+  cover_width=$(ffprobe -i "${cover_file}" 2>&1 | grep -Po "[0-9]+(?=x[0-9]+)")
+  if [ "$(( ${cover_width} % 2 ))" == "1" ]; then
+    if [ "$((${loglevel} > 1))" == "1" ]; then
+      log "Cover ${cover_file} has odd width ${cover_width}, setting extra_crop_cover to make even."
+    fi
+    # We now set a variable, ${extra_crop_cover}, which contains an additional
+    # ffmpeg flag. It crops the cover so the width and the height is divisible by two.
+    # Set the flag only if we use a cover art with an odd width.
+    extra_crop_cover='-vf crop=trunc(iw/2)*2:trunc(ih/2)*2'
+  fi
+
   # -----
   # If mode=chaptered, split the big converted file by chapter and remove it afterwards.
   # Not all audio encodings make sense with multiple chapter outputs (see options section)