Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
#17: auto-generate split output count
  • Loading branch information
kkroening committed Jul 11, 2017
commit cf1b7bfd4bb50ed25dd6a31eab5611745c37c987
2 changes: 1 addition & 1 deletion ffmpeg/_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def _get_filter_spec(node, outgoing_edge_map, stream_name_map):
outgoing_edges = get_outgoing_edges(node, outgoing_edge_map)
inputs = [stream_name_map[edge.upstream_node, edge.upstream_label] for edge in incoming_edges]
outputs = [stream_name_map[edge.upstream_node, edge.upstream_label] for edge in outgoing_edges]
filter_spec = '{}{}{}'.format(''.join(inputs), node._get_filter(), ''.join(outputs))
filter_spec = '{}{}{}'.format(''.join(inputs), node._get_filter(outgoing_edges), ''.join(outputs))
return filter_spec


Expand Down
14 changes: 10 additions & 4 deletions ffmpeg/nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,17 @@ def __init__(self, stream_spec, name, max_inputs=1, args=[], kwargs={}):
kwargs=kwargs
)

def _get_filter(self):
params_text = self.name
arg_params = ['{}'.format(arg) for arg in self.args]
kwarg_params = ['{}={}'.format(k, self.kwargs[k]) for k in sorted(self.kwargs)]
def _get_filter(self, outgoing_edges):
args = self.args
kwargs = self.kwargs
if self.name == 'split':
args = [len(outgoing_edges)]

arg_params = ['{}'.format(arg) for arg in args]
kwarg_params = ['{}={}'.format(k, kwargs[k]) for k in sorted(kwargs)]
params = arg_params + kwarg_params

params_text = self.name
if params:
params_text += '={}'.format(':'.join(params))
return params_text
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg/tests/test_ffmpeg.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def test_get_args_complex_filter():
'-i', TEST_OVERLAY_FILE,
'-filter_complex',
'[0]vflip[s0];' \
'[s0]split[s1][s2];' \
'[s0]split=2[s1][s2];' \
'[s1]trim=end_frame=20:start_frame=10[s3];' \
'[s2]trim=end_frame=40:start_frame=30[s4];' \
'[s3][s4]concat=n=2[s5];' \
Expand Down