Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Karl Kroening
ffmpeg-python
Merge requests
!88
Support video_size output tuple
Code
Review changes
Check out branch
Download
Email patches
Plain diff
Merged
Karl Kroening
requested to merge
output-video-size
into
master
7 years ago
Overview
1
Commits
1
Pipelines
0
Changes
2
0
0
Compare
master
master (base)
and
latest version
latest version
c21e8c10
1 commit,
2 years ago
2 files
+
17
-
2
Expand all files
Preferences
Preferences
File browser
List view
Tree view
Compare changes
Inline
Side-by-side
Show whitespace changes
Show one file at a time
Search (e.g. *.vue) (Ctrl+P)
ffm
peg
te
sts
test_ff
mpeg.py
+11
-0
_ru
n.py
+6
-2
ffmpeg/tests/test_ffmpeg.py
+
11
-
0
Options
View file @ c21e8c10
Edit in single-file editor
Open in Web IDE
Show full 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
):
ffmpeg/_run.py
+
6
-
2
Options
View file @ c21e8c10
Edit in single-file editor
Open in Web IDE
Show full file
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
Menu
Explore
Projects
Groups
Snippets