blackteay/ffmpeg-python
1
0
Fork 0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-08-10 21:20:08 +08:00
Code Issues Projects Releases Wiki Activity

Start fixing escaping for pan filter (which uses |)

Browse Source
This commit is contained in:
Karl Kroening 2018-01-15 00:16:26 -08:00
parent e5003648bb
commit 0a5c5c2877
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ffmpeg/nodes.py
View File

@ -148,22 +148,31 @@ class FilterNode(Node):
kwargs=kwargs kwargs=kwargs
) )
"""FilterNode""" @classmethod
def _get_filter(self, outgoing_edges): def _get_item_param(cls, item):
args = self.args return escape_chars(item, '\\\'=:')
kwargs = self.kwargs
if self.name == 'split':
args = [len(outgoing_edges)]
out_args = [escape_chars(x, '\\\'=:') for x in args] @classmethod
def _get_dict_params(cls, d):
out_kwargs = {} out_kwargs = {}
for k, v in list(kwargs.items()): for k, v in list(d.items()):
k = escape_chars(k, '\\\'=:') k = escape_chars(k, '\\\'=:')
v = escape_chars(v, '\\\'=:') v = escape_chars(v, '\\\'=:')
out_kwargs[k] = v out_kwargs[k] = v
return ['{}={}'.format(k, out_kwargs[k]) for k in sorted(out_kwargs)]
arg_params = [escape_chars(v, '\\\'=:') for v in out_args] @classmethod
kwarg_params = ['{}={}'.format(k, out_kwargs[k]) for k in sorted(out_kwargs)] def _get_list_params(cls, l):
out_args = [cls._get_item_param(x) for x in l]
return [escape_chars(v, '\\\'=:') for v in out_args]
def _get_filter(self, outgoing_edges):
args = self.args
if self.name == 'split':
args = [len(outgoing_edges)]
arg_params = self._get_list_params(args)
kwarg_params = self._get_dict_params(self.kwargs)
params = arg_params + kwarg_params params = arg_params + kwarg_params
params_text = escape_chars(self.name, '\\\'=:') params_text = escape_chars(self.name, '\\\'=:')

12
ffmpeg/tests/test_ffmpeg.py
View File

@ -265,6 +265,18 @@ def test_custom_filter():
] ]
def test_custom_filter_escaped():
stream = ffmpeg.input('dummy.mp4')
stream = ffmpeg.filter_(stream, 'bogus=stuff', 'a=b\'', **{'c\\d': 'e=f'})
stream = ffmpeg.output(stream, 'dummy2.mp4')
assert stream.get_args() == [
'-i', 'dummy.mp4',
'-filter_complex', '[0]bogus\\\\=stuff=a\\\\\\\\\\\\=b\\\\\\\\\\\\\\\':c\\\\\\\\d=e\\\\=f[s0]',
'-map', '[s0]',
'dummy2.mp4'
]
def test_custom_filter_fluent(): def test_custom_filter_fluent():
stream = (ffmpeg stream = (ffmpeg
.input('dummy.mp4') .input('dummy.mp4')