fabian/AAXtoMP3
1
0
Fork 0
mirror of https://github.com/KrumpetPirate/AAXtoMP3.git synced 2024-11-18 03:08:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #182 from Natrinicle/extra-crop-cover-check

Browse Source 
Add extra_crop_cover to All Odd Cover Widths
This commit is contained in:
Krumpet Pirate 2022-01-07 18:13:35 -05:00 committed by GitHub
commit fb56087a72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
AAXtoMP3
View File

@ -752,7 +752,6 @@ do
fi fi
# Grab the cover art if available. # Grab the cover art if available.
cover_file="${output_directory}/cover.jpg" cover_file="${output_directory}/cover.jpg"
extra_crop_cover=''
if [ "${continue}" == "0" ]; then if [ "${continue}" == "0" ]; then
if [ "${audibleCli}" == "1" ]; then if [ "${audibleCli}" == "1" ]; then
# We have a better quality cover file, copy it. # We have a better quality cover file, copy it.
@ -760,12 +759,6 @@ do
log "Copy cover file to ${cover_file}..." log "Copy cover file to ${cover_file}..."
fi fi
cp "${extra_cover_file}" "${cover_file}" 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 else
# Audible-cli not used, extract the cover from the aax file # Audible-cli not used, extract the cover from the aax file
if [ "$((${loglevel} > 1))" == "1" ]; then if [ "$((${loglevel} > 1))" == "1" ]; then
@ -775,6 +768,18 @@ do
fi fi
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. # 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) # Not all audio encodings make sense with multiple chapter outputs (see options section)