From 00034c146a2d8c84d7fc388c64eb29916105b754 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Sun, 11 Jul 2021 04:07:25 +0530 Subject: [PATCH] [embedthumbnail] Fix `_get_thumbnail_resolution` --- yt_dlp/postprocessor/embedthumbnail.py | 2 +- yt_dlp/postprocessor/ffmpeg.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/yt_dlp/postprocessor/embedthumbnail.py b/yt_dlp/postprocessor/embedthumbnail.py index 48d4b673d..7008f4d4d 100644 --- a/yt_dlp/postprocessor/embedthumbnail.py +++ b/yt_dlp/postprocessor/embedthumbnail.py @@ -51,7 +51,7 @@ def guess(): try: size_regex = r',\s*(?P\d+)x(?P\d+)\s*[,\[]' - size_result = self.run_ffmpeg(filename, filename, ['-hide_banner']) + size_result = self.run_ffmpeg(filename, None, ['-hide_banner'], expected_retcodes=(1,)) mobj = re.search(size_regex, size_result) if mobj is None: return guess() diff --git a/yt_dlp/postprocessor/ffmpeg.py b/yt_dlp/postprocessor/ffmpeg.py index 85cd0288a..eb5ae1737 100644 --- a/yt_dlp/postprocessor/ffmpeg.py +++ b/yt_dlp/postprocessor/ffmpeg.py @@ -235,12 +235,12 @@ def get_stream_number(self, path, keys, value): None) return num, len(streams) - def run_ffmpeg_multiple_files(self, input_paths, out_path, opts): + def run_ffmpeg_multiple_files(self, input_paths, out_path, opts, **kwargs): return self.real_run_ffmpeg( [(path, []) for path in input_paths], - [(out_path, opts)]) + [(out_path, opts)], **kwargs) - def real_run_ffmpeg(self, input_path_opts, output_path_opts): + def real_run_ffmpeg(self, input_path_opts, output_path_opts, *, expected_retcodes=(0,)): self.check_version() oldest_mtime = min( @@ -270,7 +270,7 @@ def make_args(file, args, name, number): self.write_debug('ffmpeg command line: %s' % shell_quote(cmd)) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE) stdout, stderr = process_communicate_or_kill(p) - if p.returncode != 0: + if p.returncode not in variadic(expected_retcodes): stderr = stderr.decode('utf-8', 'replace').strip() if self.get_param('verbose', False): self.report_error(stderr) @@ -280,8 +280,8 @@ def make_args(file, args, name, number): self.try_utime(out_path, oldest_mtime, oldest_mtime) return stderr.decode('utf-8', 'replace') - def run_ffmpeg(self, path, out_path, opts): - return self.run_ffmpeg_multiple_files([path], out_path, opts) + def run_ffmpeg(self, path, out_path, opts, **kwargs): + return self.run_ffmpeg_multiple_files([path], out_path, opts, **kwargs) def _ffmpeg_filename_argument(self, fn): # Always use 'file:' because the filename may contain ':' (ffmpeg