Skip to content

Preserve string video_size options on inputs #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Eric3-jp wants to merge 1 commit into from
Closed

Preserve string video_size options on inputs #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ffmpeg/_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ def _get_input_args(input_node):
if fmt:
args += ['-f', fmt]
if video_size:
args += ['-video_size', '{}x{}'.format(video_size[0], video_size[1])]
if not isinstance(video_size, basestring):
video_size = '{}x{}'.format(video_size[0], video_size[1])
args += ['-video_size', video_size]
args += convert_kwargs_to_cmd_line_args(kwargs)
args += ['-i', filename]
else:
Expand Down
15 changes: 15 additions & 0 deletions ffmpeg/tests/test_ffmpeg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,21 @@ def test__output__video_size(video_size):
assert args == ['-i', 'in', '-video_size', '320x240', 'out']


@pytest.mark.parametrize(
'video_size,expected',
[
((320, 240), '320x240'),
([320, 240], '320x240'),
('320x240', '320x240'),
('1920x1080', '1920x1080'),
('hd720', 'hd720'),
],
)
def test__input__video_size(video_size, expected):
args = ffmpeg.input('in', video_size=video_size).output('out').get_args()
assert args == ['-video_size', expected, '-i', 'in', 'out']


def test_filter_normal_arg_escape():
"""Test string escaping of normal filter args (e.g. ``font`` param of ``drawtext``
filter).
Expand Down