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

Merge pull request #88 from kkroening/output-video-size

Browse Source 
Support video_size output tuple
This commit is contained in:
Karl Kroening 2018-06-02 00:33:28 -07:00 committed by GitHub
commit a01f68e8af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg/_run.py
View File

@ -1,10 +1,9 @@
from __future__ import unicode_literals
from .dag import get_outgoing_edges, topo_sort
from ._utils import basestring
from builtins import str
from functools import reduce
from past.builtins import basestring
import collections
import copy
import operator
import subprocess
@ -123,6 +122,11 @@ def _get_output_args(node, stream_name_map):
fmt = kwargs.pop('format', None)
if fmt:
args += ['-f', fmt]
if 'video_size' in kwargs:
video_size = kwargs.pop('video_size')
if not isinstance(video_size, basestring) and isinstance(video_size, collections.Iterable):
video_size = '{}x{}'.format(video_size[0], video_size[1])
args += ['-video_size', video_size]
args += _convert_kwargs_to_cmd_line_args(kwargs)
args += [filename]
return args

11
ffmpeg/tests/test_ffmpeg.py
View File

@ -237,6 +237,17 @@ def test_filter_asplit():
]
@pytest.mark.parametrize('video_size', [(320, 240), '320x240'])
def test__output__video_size(video_size):
args = (
ffmpeg
.input('in')
.output('out', video_size=video_size)
.get_args()
)
assert args == ['-i', 'in', '-video_size', '320x240', 'out']
def test_filter_normal_arg_escape():
"""Test string escaping of normal filter args (e.g. ``font`` param of ``drawtext`` filter)."""
def _get_drawtext_font_repr(font):