Skip to content

Commit

Permalink
[postprocessor/embedthumbnail] Add support for non jpeg/png thumbnails (
Browse files Browse the repository at this point in the history
closes #25687)
  • Loading branch information
alexmerkel authored and dstftw committed Sep 13, 2020
1 parent 45f6362 commit a31a022
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions youtube_dl/postprocessor/embedthumbnail.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,28 @@ def run(self, info):
'Skipping embedding the thumbnail because the file is missing.')
return [], info

# Check for mislabeled webp file
with open(encodeFilename(thumbnail_filename), "rb") as f:
b = f.read(16)
if b'\x57\x45\x42\x50' in b: # Binary for WEBP
[thumbnail_filename_path, thumbnail_filename_extension] = os.path.splitext(thumbnail_filename)
if not thumbnail_filename_extension == ".webp":
webp_thumbnail_filename = thumbnail_filename_path + ".webp"
os.rename(encodeFilename(thumbnail_filename), encodeFilename(webp_thumbnail_filename))
thumbnail_filename = webp_thumbnail_filename

# If not a jpg or png thumbnail, convert it to jpg using ffmpeg
if not os.path.splitext(thumbnail_filename)[1].lower() in ['.jpg', '.png']:
jpg_thumbnail_filename = os.path.splitext(thumbnail_filename)[0] + ".jpg"
jpg_thumbnail_filename = os.path.join(os.path.dirname(jpg_thumbnail_filename), os.path.basename(jpg_thumbnail_filename).replace('%', '_')) # ffmpeg interprets % as image sequence

self._downloader.to_screen('[ffmpeg] Converting thumbnail "%s" to JPEG' % thumbnail_filename)

self.run_ffmpeg(thumbnail_filename, jpg_thumbnail_filename, ['-bsf:v', 'mjpeg2jpeg'])

os.remove(encodeFilename(thumbnail_filename))
thumbnail_filename = jpg_thumbnail_filename

if info['ext'] == 'mp3':
options = [
'-c', 'copy', '-map', '0', '-map', '1',
Expand Down

0 comments on commit a31a022

Please sign in to comment.