github/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-21 20:46:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

[downloader/ffmpeg] Allow passing custom arguments before -i

Browse source 
Closes #686
This commit is contained in:
pukkandan 2021-08-24 03:15:44 +05:30
parent 91d4b32bb6
commit 330690a214
No known key found for this signature in database
GPG key ID: 0F00D95A001F4698
5 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -439,9 +439,12 @@ ## Download Options:
(Alias: --external-downloader)
--downloader-args NAME:ARGS Give these arguments to the external
downloader. Specify the downloader name and
the arguments separated by a colon ":". You
can use this option multiple times to give
different arguments to different downloaders
the arguments separated by a colon ":". For
ffmpeg, arguments can be passed to
different positions using the same syntax
as --postprocessor-args. You can use this
option multiple times to give different
arguments to different downloaders
(Alias: --external-downloader-args)
## Filesystem Options:

20
yt_dlp/downloader/external.py
View file

@ -22,7 +22,7 @@
cli_option,
cli_valueless_option,
cli_bool_option,
cli_configuration_args,
_configuration_args,
encodeFilename,
encodeArgument,
handle_youtubedl_headers,
@ -111,11 +111,10 @@ def _bool_option(self, command_option, param, true_value='true', false_value='fa
def _valueless_option(self, command_option, param, expected_value=True):
return cli_valueless_option(self.params, command_option, param, expected_value)
def _configuration_args(self, *args, **kwargs):
return cli_configuration_args(
self.params.get('external_downloader_args'),
[self.get_basename(), 'default'],
*args, **kwargs)
def _configuration_args(self, keys=None, *args, **kwargs):
return _configuration_args(
self.get_basename(), self.params.get('external_downloader_args'), self.get_basename(),
keys, *args, **kwargs)
def _call_downloader(self, tmpfilename, info_dict):
""" Either overwrite this or implement _make_cmd """
@ -459,10 +458,10 @@ def _call_downloader(self, tmpfilename, info_dict):
elif isinstance(conn, compat_str):
args += ['-rtmp_conn', conn]
for url in urls:
args += ['-i', url]
for i, url in enumerate(urls):
args += self._configuration_args((f'_i{i + 1}', '_i')) + ['-i', url]
args += self._configuration_args() + ['-c', 'copy']
args += ['-c', 'copy']
if info_dict.get('requested_formats'):
for (i, fmt) in enumerate(info_dict['requested_formats']):
if fmt.get('acodec') != 'none':
@ -491,9 +490,10 @@ def _call_downloader(self, tmpfilename, info_dict):
else:
args += ['-f', EXT_TO_OUT_FORMATS.get(ext, ext)]
args += self._configuration_args((f'_o1', '_o', ''))
args = [encodeArgument(opt) for opt in args]
args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True))
self._debug_cmd(args)
proc = subprocess.Popen(args, stdin=subprocess.PIPE, env=env)

3
yt_dlp/options.py
View file

@ -742,12 +742,13 @@ def _dict_from_options_callback(
metavar='NAME:ARGS', dest='external_downloader_args', default={}, type='str',
action='callback', callback=_dict_from_options_callback,
callback_kwargs={
'allowed_keys': '|'.join(list_external_downloaders()),
'allowed_keys': r'ffmpeg_[io]\d*|%s' % '|'.join(list_external_downloaders()),
'default_key': 'default',
'process': compat_shlex_split
}, help=(
'Give these arguments to the external downloader. '
'Specify the downloader name and the arguments separated by a colon ":". '
'For ffmpeg, arguments can be passed to different positions using the same syntax as --postprocessor-args. '
'You can use this option multiple times to give different arguments to different downloaders '
'(Alias: --external-downloader-args)'))

17
yt_dlp/postprocessor/common.py
View file

@ -5,7 +5,7 @@
from ..compat import compat_str
from ..utils import (
cli_configuration_args,
_configuration_args,
encodeFilename,
PostProcessingError,
)
@ -110,18 +110,9 @@ def try_utime(self, path, atime, mtime, errnote='Cannot update utime of file'):
except Exception:
self.report_warning(errnote)
def _configuration_args(self, exe, keys=None, default=[], use_compat=True):
pp_key = self.pp_key().lower()
exe = exe.lower()
root_key = exe if pp_key == exe else '%s+%s' % (pp_key, exe)
keys = ['%s%s' % (root_key, k) for k in (keys or [''])]
if root_key in keys:
keys += [root_key] + ([] if pp_key == exe else [(self.pp_key(), exe)]) + ['default']
else:
use_compat = False
return cli_configuration_args(
self.get_param('postprocessor_args'),
keys, default, use_compat)
def _configuration_args(self, exe, *args, **kwargs):
return _configuration_args(
self.pp_key(), self.get_param('postprocessor_args'), exe, *args, **kwargs)
class AudioConversionError(PostProcessingError):

12
yt_dlp/utils.py
View file

@ -4987,6 +4987,18 @@ def cli_configuration_args(argdict, keys, default=[], use_compat=True):
return [arg for args in arg_list for arg in args]
return default
def _configuration_args(main_key, argdict, exe, keys=None, default=[], use_compat=True):
main_key, exe = main_key.lower(), exe.lower()
root_key = exe if main_key == exe else f'{main_key}+{exe}'
keys = [f'{root_key}{k}' for k in (keys or [''])]
if root_key in keys:
if main_key != exe:
keys.append((main_key, exe))
keys.append('default')
else:
use_compat = False
return cli_configuration_args(argdict, keys, default, use_compat)
class ISO639Utils(object):
# See http://www.loc.gov/standards/iso639-2/ISO-639-2_utf-8.txt