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

Merge 7989c5d8a3966156bc9d0fbb701e0b6485664422 into 7077eaad646e84004fbdeb052b034f9f68c15b5e

Browse Source
This commit is contained in:
Karl Kroening 2018-05-09 06:30:29 +00:00 committed by GitHub
commit 3251e1ba44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg/_ffmpeg.py
View File

@ -4,7 +4,6 @@ from ._utils import basestring
from .nodes import (
filter_operator,
GlobalNode,
InputNode,
MergeOutputsNode,
OutputNode,
@ -28,11 +27,10 @@ def input(filename, **kwargs):
@output_operator()
def overwrite_output(stream):
"""Overwrite output files without asking (ffmpeg ``-y`` option)
Official documentation: `Main options <https://ffmpeg.org/ffmpeg.html#Main-options>`__
"""No longer supported; see ``overwrite_output`` parameter of ``get_args`` function instead.
"""
return GlobalNode(stream, overwrite_output.__name__).stream()
raise NameError('`overwrite_output` operator is no longer supported; see `overwrite_output` parameter of '
'`get_args` function instead')
@output_operator()

14
ffmpeg/_run.py
View File

@ -10,7 +10,6 @@ import subprocess as _subprocess
from ._ffmpeg import (
input,
output,
overwrite_output,
)
from .nodes import (
get_stream_spec_nodes,
@ -92,10 +91,7 @@ def _get_filter_arg(filter_nodes, outgoing_edge_maps, stream_name_map):
def _get_global_args(node):
if node.name == overwrite_output.__name__:
return ['-y']
else:
raise ValueError('Unsupported global node: {}'.format(node))
raise ValueError('Unsupported global node: {}'.format(node))
def _get_output_args(node, stream_name_map):
@ -123,7 +119,7 @@ def _get_output_args(node, stream_name_map):
@output_operator()
def get_args(stream_spec, overwrite_output=False):
def get_args(stream_spec, overwrite_output=True):
"""Get command-line arguments for ffmpeg."""
nodes = get_stream_spec_nodes(stream_spec)
args = []
@ -140,7 +136,9 @@ def get_args(stream_spec, overwrite_output=False):
args += ['-filter_complex', filter_arg]
args += reduce(operator.add, [_get_output_args(node, stream_name_map) for node in output_nodes])
args += reduce(operator.add, [_get_global_args(node) for node in global_nodes], [])
if overwrite_output:
if overwrite_output is False:
args += ['-n']
elif overwrite_output is not None:
args += ['-y']
return args
@ -160,7 +158,7 @@ def run(stream_spec, cmd='ffmpeg', **kwargs):
"""Run ffmpeg on node graph.
Args:
**kwargs: keyword-arguments passed to ``get_args()`` (e.g. ``overwrite_output=True``).
**kwargs: keyword-arguments passed to ``get_args()`` (e.g. ``overwrite_output=False``).
"""
_subprocess.check_call(compile(stream_spec, cmd, **kwargs))

35
ffmpeg/tests/test_ffmpeg.py
View File

@ -100,9 +100,16 @@ def test_stream_repr():
assert repr(dummy_out) == 'dummy()[{!r}] <{}>'.format(dummy_out.label, dummy_out.node.short_hash)
def test_overwrite_output():
with pytest.raises(NameError):
ffmpeg.input('dummy.mp4').output('dummy2.mp4').overwrite_output()
def test_get_args_simple():
out_file = ffmpeg.input('dummy.mp4').output('dummy2.mp4')
assert out_file.get_args() == ['-i', 'dummy.mp4', 'dummy2.mp4']
assert out_file.get_args() == ['-i', 'dummy.mp4', 'dummy2.mp4', '-y']
assert out_file.get_args(overwrite_output=False) == ['-i', 'dummy.mp4', 'dummy2.mp4', '-n']
assert out_file.get_args(overwrite_output=None) == ['-i', 'dummy.mp4', 'dummy2.mp4']
def _get_complex_filter_example():
@ -124,7 +131,6 @@ def _get_complex_filter_example():
.overlay(overlay_file.hflip())
.drawbox(50, 50, 120, 120, color='red', thickness=5)
.output(TEST_OUTPUT_FILE1)
.overwrite_output()
)
@ -238,7 +244,7 @@ def test_filter_normal_arg_escape():
.get_args()
)
assert args[:3] == ['-i', 'in', '-filter_complex']
assert args[4:] == ['-map', '[s0]', 'out']
assert args[4:] == ['-map', '[s0]', 'out', '-y']
match = re.match(r'\[0\]drawtext=font=a((.|\n)*)b:text=test\[s0\]', args[3], re.MULTILINE)
assert match is not None, 'Invalid -filter_complex arg: {!r}'.format(args[3])
return match.group(1)
@ -272,7 +278,7 @@ def test_filter_text_arg_str_escape():
.get_args()
)
assert args[:3] == ['-i', 'in', '-filter_complex']
assert args[4:] == ['-map', '[s0]', 'out']
assert args[4:] == ['-map', '[s0]', 'out', '-y']
match = re.match(r'\[0\]drawtext=text=a((.|\n)*)b\[s0\]', args[3], re.MULTILINE)
assert match is not None, 'Invalid -filter_complex arg: {!r}'.format(args[3])
return match.group(1)
@ -314,7 +320,7 @@ def test_run_multi_output():
in_ = ffmpeg.input(TEST_INPUT_FILE1)
out1 = in_.output(TEST_OUTPUT_FILE1)
out2 = in_.output(TEST_OUTPUT_FILE2)
ffmpeg.run([out1, out2], overwrite_output=True)
ffmpeg.run([out1, out2])
def test_run_dummy_cmd():
@ -341,7 +347,8 @@ def test_custom_filter():
'-i', 'dummy.mp4',
'-filter_complex', '[0]custom_filter=a:b:kwarg1=c[s0]',
'-map', '[s0]',
'dummy2.mp4'
'dummy2.mp4',
'-y',
]
@ -355,7 +362,8 @@ def test_custom_filter_fluent():
'-i', 'dummy.mp4',
'-filter_complex', '[0]custom_filter=a:b:kwarg1=c[s0]',
'-map', '[s0]',
'dummy2.mp4'
'dummy2.mp4',
'-y',
]
@ -364,10 +372,10 @@ def test_merge_outputs():
out1 = in_.output('out1.mp4')
out2 = in_.output('out2.mp4')
assert ffmpeg.merge_outputs(out1, out2).get_args() == [
'-i', 'in.mp4', 'out1.mp4', 'out2.mp4'
'-i', 'in.mp4', 'out1.mp4', 'out2.mp4', '-y'
]
assert ffmpeg.get_args([out1, out2]) == [
'-i', 'in.mp4', 'out2.mp4', 'out1.mp4'
'-i', 'in.mp4', 'out2.mp4', 'out1.mp4', '-y'
]
@ -385,14 +393,16 @@ def test_multi_passthrough():
'-i', 'in2.mp4',
'out1.mp4',
'-map', '[1]', # FIXME: this should not be here (see #23)
'out2.mp4'
'out2.mp4',
'-y',
]
assert ffmpeg.get_args([out1, out2]) == [
'-i', 'in2.mp4',
'-i', 'in1.mp4',
'out2.mp4',
'-map', '[1]', # FIXME: this should not be here (see #23)
'out1.mp4'
'out1.mp4',
'-y',
]
@ -420,7 +430,8 @@ def test_pipe():
'[0]trim=start_frame=2[s0]',
'-map', '[s0]',
'-f', 'rawvideo',
'pipe:1'
'pipe:1',
'-y',
]
cmd = ['ffmpeg'] + args