Miroirs/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp synced 2024-12-27 21:59:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge webm formats into mkv if thumbnails are to be embedded

Browse source 
This was originally implemented in 4d971a16b8 (#173) by @damianoamatruda
but was reverted in 3b297919e0
since it was unintentionally being triggered for `write_thumbnail` (See #500)
This commit is contained in:
pukkandan 2021-10-09 21:48:46 +05:30
parent 8cd69fc407
commit 4e3b637d5b
No known key found for this signature in database
GPG key ID: 0F00D95A001F4698
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
yt_dlp/YoutubeDL.py
View file

@ -137,6 +137,7 @@ from .downloader import (
from .downloader.rtmp import rtmpdump_version from .downloader.rtmp import rtmpdump_version
from .postprocessor import ( from .postprocessor import (
get_postprocessor, get_postprocessor,
EmbedThumbnailPP,
FFmpegFixupDurationPP, FFmpegFixupDurationPP,
FFmpegFixupM3u8PP, FFmpegFixupM3u8PP,
FFmpegFixupM4aPP, FFmpegFixupM4aPP,
@ -2696,10 +2697,19 @@ class YoutubeDL(object):
requested_formats = info_dict['requested_formats'] requested_formats = info_dict['requested_formats']
old_ext = info_dict['ext'] old_ext = info_dict['ext']
if self.params.get('merge_output_format') is None and not compatible_formats(requested_formats): if self.params.get('merge_output_format') is None:
info_dict['ext'] = 'mkv' if not compatible_formats(requested_formats):
self.report_warning( info_dict['ext'] = 'mkv'
'Requested formats are incompatible for merge and will be merged into mkv.') self.report_warning(
'Requested formats are incompatible for merge and will be merged into mkv')
if (info_dict['ext'] == 'webm'
and info_dict.get('thumbnails')
# check with type instead of pp_key, __name__, or isinstance
# since we dont want any custom PPs to trigger this
and any(type(pp) == EmbedThumbnailPP for pp in self._pps['post_process'])):
info_dict['ext'] = 'mkv'
self.report_warning(
'webm doesn\'t support embedding a thumbnail, mkv will be used')
new_ext = info_dict['ext'] new_ext = info_dict['ext']
def correct_ext(filename, ext=new_ext): def correct_ext(filename, ext=new_ext):