From fabd401e964aeaa014cdeb121825e3969651d31f Mon Sep 17 00:00:00 2001 From: Noah Stier Date: Thu, 5 Oct 2017 23:45:43 -0700 Subject: [PATCH 01/39] Add 'crop' filter --- ffmpeg/_filters.py | 23 +++++++++++++++++++++++ ffmpeg/tests/test_ffmpeg.py | 10 ++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ffmpeg/_filters.py b/ffmpeg/_filters.py index 8c52732..0f980a7 100644 --- a/ffmpeg/_filters.py +++ b/ffmpeg/_filters.py @@ -152,6 +152,28 @@ def vflip(stream): return FilterNode(stream, vflip.__name__).stream() +@filter_operator() +def crop(stream, x, y, width, height, **kwargs): + """Crop the input video. + + Args: + x: The horizontal position, in the input video, of the left edge of + the output video. + y: The vertical position, in the input video, of the top edge of the + output video. + width: The width of the output video. Must be greater than 0. + heigth: The height of the output video. Must be greater than 0. + + Official documentation: `crop `__ + """ + return FilterNode( + stream, + crop.__name__, + args=[width, height, x, y], + kwargs=kwargs + ).stream() + + @filter_operator() def drawbox(stream, x, y, width, height, color, thickness=None, **kwargs): """Draw a colored box on the input image. @@ -395,6 +417,7 @@ def colorchannelmixer(stream, *args, **kwargs): __all__ = [ 'colorchannelmixer', 'concat', + 'crop', 'drawbox', 'filter_', 'hflip', diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index de4f2af..95e0042 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -114,6 +114,7 @@ def _get_complex_filter_example(): split1 = split[1] overlay_file = ffmpeg.input(TEST_OVERLAY_FILE) + overlay_file = ffmpeg.crop(overlay_file, 10, 10, 158, 112) return (ffmpeg .concat( split0.trim(start_frame=10, end_frame=20), @@ -137,10 +138,11 @@ def test_get_args_complex_filter(): '[s1]trim=end_frame=20:start_frame=10[s3];' \ '[s2]trim=end_frame=40:start_frame=30[s4];' \ '[s3][s4]concat=n=2[s5];' \ - '[1]hflip[s6];' \ - '[s5][s6]overlay=eof_action=repeat[s7];' \ - '[s7]drawbox=50:50:120:120:red:t=5[s8]', - '-map', '[s8]', TEST_OUTPUT_FILE1, + '[1]crop=158:112:10:10[s6];' \ + '[s6]hflip[s7];' \ + '[s5][s7]overlay=eof_action=repeat[s8];' \ + '[s8]drawbox=50:50:120:120:red:t=5[s9]', + '-map', '[s9]', TEST_OUTPUT_FILE1, '-y' ] From db89774454b6db339401f4127ac9e4d4eaba0391 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 21:12:11 -0700 Subject: [PATCH 02/39] Update README.md --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 86976c1..9a4abff 100644 --- a/README.md +++ b/README.md @@ -86,9 +86,9 @@ pip install ffmpeg-python It's also possible to clone the source and put it on your python path (`$PYTHONPATH`, `sys.path`, etc.): ``` -> git clone git@github.com:kkroening/ffmpeg-python.git -> export PYTHONPATH=${PYTHONPATH}:ffmpeg-python -> python +$ git clone git@github.com:kkroening/ffmpeg-python.git +$ export PYTHONPATH=${PYTHONPATH}:ffmpeg-python +$ python >>> import ffmpeg ``` @@ -98,8 +98,8 @@ API documentation is automatically generated from python docstrings and hosted o Alternatively, standard python help is available, such as at the python REPL prompt as follows: ``` -import ffmpeg -help(ffmpeg) +>>> import ffmpeg +>>> help(ffmpeg) ``` ## Custom Filters @@ -140,3 +140,4 @@ Pull requests are welcome as well. - [FFmpeg Homepage](https://ffmpeg.org/) - [FFmpeg Documentation](https://ffmpeg.org/ffmpeg.html) - [FFmpeg Filters Documentation](https://ffmpeg.org/ffmpeg-filters.html) +- [Matrix Chat: #ffmpeg-python:matrix.org](https://riot.im/app/#/room/#ffmpeg-python:matrix.org) From 65a068267b26319839416d5aeccc54b5f09f0000 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 21:12:29 -0700 Subject: [PATCH 03/39] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a4abff..f0ce393 100644 --- a/README.md +++ b/README.md @@ -140,4 +140,4 @@ Pull requests are welcome as well. - [FFmpeg Homepage](https://ffmpeg.org/) - [FFmpeg Documentation](https://ffmpeg.org/ffmpeg.html) - [FFmpeg Filters Documentation](https://ffmpeg.org/ffmpeg-filters.html) -- [Matrix Chat: #ffmpeg-python:matrix.org](https://riot.im/app/#/room/#ffmpeg-python:matrix.org) +- Matrix Chat: [#ffmpeg-python:matrix.org](https://riot.im/app/#/room/#ffmpeg-python:matrix.org) From 614a55826677f4ada12835cbe6943c110710505b Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 22:41:55 -0700 Subject: [PATCH 04/39] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f0ce393..9c8d924 100644 --- a/README.md +++ b/README.md @@ -132,6 +132,8 @@ It should be fairly easy to use filters that aren't explicitly built into `ffmpe Pull requests are welcome as well. +Hammer logo + ## Additional Resources - [API Reference](https://kkroening.github.io/ffmpeg-python/) From f2a37d3eac08b75fea35ce71008e61665927069e Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:05:23 -0700 Subject: [PATCH 05/39] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9c8d924..1863dc9 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,16 @@ # ffmpeg-python: Python bindings for FFmpeg +ffmpeg-python logo + [![Build status](https://travis-ci.org/kkroening/ffmpeg-python.svg?branch=master)](https://travis-ci.org/kkroening/ffmpeg-python) +
## Overview There are tons of Python FFmpeg wrappers out there but they seem to lack complex filter support. `ffmpeg-python` works well for simple as well as complex signal graphs. + ## Quickstart Flip a video horizontally: From fb7fe24873a848bf514c407d11de67a0e64f1b0c Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:06:16 -0700 Subject: [PATCH 06/39] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1863dc9..ce8151b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # ffmpeg-python: Python bindings for FFmpeg -ffmpeg-python logo - [![Build status](https://travis-ci.org/kkroening/ffmpeg-python.svg?branch=master)](https://travis-ci.org/kkroening/ffmpeg-python)
@@ -130,13 +128,15 @@ When in doubt, refer to the [existing filters](https://github.com/kkroening/ffmp ## Contributing +ffmpeg-python logo + Feel free to report any bugs or feature requests. It should be fairly easy to use filters that aren't explicitly built into `ffmpeg-python` but if there's a feature or filter you'd really like to see included in the library, don't hesitate to open a feature request. Pull requests are welcome as well. -Hammer logo + ## Additional Resources From fc86457eb8ade52eb586faa8eec5c9741400857b Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:06:26 -0700 Subject: [PATCH 07/39] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index ce8151b..5fcc550 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ [![Build status](https://travis-ci.org/kkroening/ffmpeg-python.svg?branch=master)](https://travis-ci.org/kkroening/ffmpeg-python) -
- ## Overview There are tons of Python FFmpeg wrappers out there but they seem to lack complex filter support. `ffmpeg-python` works well for simple as well as complex signal graphs. From d904e153cf2fa1badabf5923420926ea4f4f3a40 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:07:09 -0700 Subject: [PATCH 08/39] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5fcc550..a1fe752 100644 --- a/README.md +++ b/README.md @@ -124,17 +124,17 @@ Or fluently: When in doubt, refer to the [existing filters](https://github.com/kkroening/ffmpeg-python/blob/master/ffmpeg/_filters.py) and/or the [official ffmpeg documentation](https://ffmpeg.org/ffmpeg-filters.html). -## Contributing - ffmpeg-python logo +## Contributing + Feel free to report any bugs or feature requests. It should be fairly easy to use filters that aren't explicitly built into `ffmpeg-python` but if there's a feature or filter you'd really like to see included in the library, don't hesitate to open a feature request. Pull requests are welcome as well. - +
## Additional Resources From e66a0939c4fe203b519c4a98ba76a6f9b01e6a73 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:08:01 -0700 Subject: [PATCH 09/39] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a1fe752..573a6af 100644 --- a/README.md +++ b/README.md @@ -124,10 +124,10 @@ Or fluently: When in doubt, refer to the [existing filters](https://github.com/kkroening/ffmpeg-python/blob/master/ffmpeg/_filters.py) and/or the [official ffmpeg documentation](https://ffmpeg.org/ffmpeg-filters.html). -ffmpeg-python logo - ## Contributing +ffmpeg-python logo + Feel free to report any bugs or feature requests. It should be fairly easy to use filters that aren't explicitly built into `ffmpeg-python` but if there's a feature or filter you'd really like to see included in the library, don't hesitate to open a feature request. From 0e47a6a6e5e4cc2d8b578d7faa9899b3fee94fef Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:11:03 -0700 Subject: [PATCH 10/39] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 573a6af..424923a 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ When in doubt, refer to the [existing filters](https://github.com/kkroening/ffmp ## Contributing -ffmpeg-python logo +ffmpeg-python logo Feel free to report any bugs or feature requests. From be3f300de5036b1a147187132b2e9999d8d0e920 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:24:38 -0700 Subject: [PATCH 11/39] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 424923a..ca52621 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ When in doubt, refer to the [existing filters](https://github.com/kkroening/ffmp ## Contributing -ffmpeg-python logo +ffmpeg-python logo Feel free to report any bugs or feature requests. From 2a95d6f2e184909c2e0483cd6e772043f87bd7b2 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:37:53 -0700 Subject: [PATCH 12/39] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ca52621..189ce30 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ [![Build status](https://travis-ci.org/kkroening/ffmpeg-python.svg?branch=master)](https://travis-ci.org/kkroening/ffmpeg-python) +ffmpeg-python logo + +
+ ## Overview There are tons of Python FFmpeg wrappers out there but they seem to lack complex filter support. `ffmpeg-python` works well for simple as well as complex signal graphs. @@ -126,7 +130,7 @@ When in doubt, refer to the [existing filters](https://github.com/kkroening/ffmp ## Contributing -ffmpeg-python logo +ffmpeg-python logo Feel free to report any bugs or feature requests. From 63e4218725fa12c96a69003ace8da9463db36351 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:41:01 -0700 Subject: [PATCH 13/39] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 189ce30..c5697d1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build status](https://travis-ci.org/kkroening/ffmpeg-python.svg?branch=master)](https://travis-ci.org/kkroening/ffmpeg-python) -ffmpeg-python logo +ffmpeg-python logo
From 6dd34a21d5ff773a61228bbe7fd6a2760ed62236 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:42:16 -0700 Subject: [PATCH 14/39] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5697d1..0596562 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ When in doubt, refer to the [existing filters](https://github.com/kkroening/ffmp ## Contributing -ffmpeg-python logo +ffmpeg-python logo Feel free to report any bugs or feature requests. From 918345852782c97a8ff3064e133f2e4f3cfd0bc3 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:45:53 -0700 Subject: [PATCH 15/39] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0596562..eb09236 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build status](https://travis-ci.org/kkroening/ffmpeg-python.svg?branch=master)](https://travis-ci.org/kkroening/ffmpeg-python) -ffmpeg-python logo +ffmpeg-python logo
From 6de40d80c5e985f4aef5da09dbacf603accbe208 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:46:50 -0700 Subject: [PATCH 16/39] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index eb09236..e896444 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ ffmpeg-python logo -
- ## Overview There are tons of Python FFmpeg wrappers out there but they seem to lack complex filter support. `ffmpeg-python` works well for simple as well as complex signal graphs. From 273cf8f2053cd833a7910fd8520a010d8e327930 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 12 Dec 2017 16:45:33 +0100 Subject: [PATCH 17/39] Allow extra, unhashed objects to be added to the incoming_edge_map --- ffmpeg/dag.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ffmpeg/dag.py b/ffmpeg/dag.py index 3ce3891..0454503 100644 --- a/ffmpeg/dag.py +++ b/ffmpeg/dag.py @@ -42,6 +42,7 @@ class DagNode(object): Again, because nodes are immutable, the string representations should remain constant. """ + def __hash__(self): """Return an integer hash of the node.""" raise NotImplementedError() @@ -90,10 +91,12 @@ def get_outgoing_edges(upstream_node, outgoing_edge_map): class KwargReprNode(DagNode): """A DagNode that can be represented as a set of args+kwargs. """ + @property def __upstream_hashes(self): hashes = [] - for downstream_label, (upstream_node, upstream_label) in list(self.incoming_edge_map.items()): + # This is needed to allow extra stuff in the incoming_edge_map's value tuples + for downstream_label, (upstream_node, upstream_label) in [(i[0], i[1][:2]) for i in self.incoming_edge_map.items()]: hashes += [hash(x) for x in [downstream_label, upstream_node, upstream_label]] return hashes From 646a0dcae86db06d153765a2e233199c05ab81b5 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 12 Dec 2017 17:10:35 +0100 Subject: [PATCH 18/39] Implement selectors in Stream and Node * Selectors are used just like 'split', i.e. `stream.split()[0:"audio"]` --- ffmpeg/nodes.py | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index 2b4c94f..e68ecd5 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -21,12 +21,13 @@ def _get_types_str(types): class Stream(object): """Represents the outgoing edge of an upstream node; may be used to create more downstream nodes.""" - def __init__(self, upstream_node, upstream_label, node_types): + def __init__(self, upstream_node, upstream_label, node_types, upstream_selector=None): if not _is_of_types(upstream_node, node_types): raise TypeError('Expected upstream node to be of one of the following type(s): {}; got {}'.format( _get_types_str(node_types), type(upstream_node))) self.node = upstream_node self.label = upstream_label + self.selector = upstream_selector def __hash__(self): return get_hash_int([hash(self.node), hash(self.label)]) @@ -36,7 +37,10 @@ class Stream(object): def __repr__(self): node_repr = self.node.long_repr(include_hash=False) - out = '{}[{!r}] <{}>'.format(node_repr, self.label, self.node.short_hash) + selector = "" + if self.selector: + selector = ":{}".format(self.selector) + out = '{}[{!r}{}] <{}>'.format(node_repr, self.label, selector, self.node.short_hash) return out @@ -86,11 +90,11 @@ class Node(KwargReprNode): def __get_incoming_edge_map(cls, stream_map): incoming_edge_map = {} for downstream_label, upstream in list(stream_map.items()): - incoming_edge_map[downstream_label] = (upstream.node, upstream.label) + incoming_edge_map[downstream_label] = (upstream.node, upstream.label, upstream.selector) return incoming_edge_map def __init__(self, stream_spec, name, incoming_stream_types, outgoing_stream_type, min_inputs, max_inputs, args=[], - kwargs={}): + kwargs={}): stream_map = get_stream_map(stream_spec) self.__check_input_len(stream_map, min_inputs, max_inputs) self.__check_input_types(stream_map, incoming_stream_types) @@ -98,22 +102,27 @@ class Node(KwargReprNode): super(Node, self).__init__(incoming_edge_map, name, args, kwargs) self.__outgoing_stream_type = outgoing_stream_type - def stream(self, label=None): + def stream(self, label=None, select=None): """Create an outgoing stream originating from this node. More nodes may be attached onto the outgoing stream. """ - return self.__outgoing_stream_type(self, label) + return self.__outgoing_stream_type(self, label, upstream_selector=select) - def __getitem__(self, label): + def __getitem__(self, item): """Create an outgoing stream originating from this node; syntactic sugar for ``self.stream(label)``. + It can also be used to apply a selector: e.g. node[0:"audio"] returns a stream with label 0 and + selector "audio", which is the same as ``node.stream(label=0, select="audio")``. """ - return self.stream(label) + if isinstance(item, slice): + return self.stream(label=item.start, select=item.stop) + else: + return self.stream(label=item) class FilterableStream(Stream): - def __init__(self, upstream_node, upstream_label): - super(FilterableStream, self).__init__(upstream_node, upstream_label, {InputNode, FilterNode}) + def __init__(self, upstream_node, upstream_label, upstream_selector=None): + super(FilterableStream, self).__init__(upstream_node, upstream_label, {InputNode, FilterNode}, upstream_selector) class InputNode(Node): From f6d014540a3fc0c24037cdc5e871903ad21d5cff Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 21 Dec 2017 15:33:50 +0100 Subject: [PATCH 19/39] Add __getitem__ to Stream too, simplify selector syntax * No need to have a split node in between, you can just do stream[:"a"] * Split nodes are still needed to do actual splitting. --- ffmpeg/nodes.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index e68ecd5..5c3067d 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -43,6 +43,17 @@ class Stream(object): out = '{}[{!r}{}] <{}>'.format(node_repr, self.label, selector, self.node.short_hash) return out + def __getitem__(self, item): + """ + Select a component of the stream. `stream[:X]` is analogous to `stream.node.stream(select=X)`. + Please note that this can only be used to select a substream that already exist. If you want to split + the stream, use the `split` filter. + """ + if item.start != None: + raise ValueError("Invalid syntax. Use 'stream[:\"something\"]', not 'stream[\"something\"]'.") + + return self.node.stream(select=item.stop) + def get_stream_map(stream_spec): if stream_spec is None: @@ -201,8 +212,8 @@ class OutputNode(Node): class OutputStream(Stream): - def __init__(self, upstream_node, upstream_label): - super(OutputStream, self).__init__(upstream_node, upstream_label, {OutputNode, GlobalNode, MergeOutputsNode}) + def __init__(self, upstream_node, upstream_label, upstream_selector=None): + super(OutputStream, self).__init__(upstream_node, upstream_label, {OutputNode, GlobalNode, MergeOutputsNode}, upstream_selector=upstream_selector) class MergeOutputsNode(Node): From 3f671218a6a2c6ee50974b96a4ebf2b9fdbfd8b4 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 21 Dec 2017 15:35:39 +0100 Subject: [PATCH 20/39] Take into account upstream selectors in topological sort, `get_args()` and `view()` --- ffmpeg/_run.py | 8 ++++---- ffmpeg/_view.py | 6 +++++- ffmpeg/dag.py | 21 +++++++++++++-------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index 91a1462..7dad58a 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -23,7 +23,7 @@ from .nodes import ( def _get_stream_name(name): - return '[{}]'.format(name) + return '{}'.format(name) def _convert_kwargs_to_cmd_line_args(kwargs): @@ -57,8 +57,8 @@ def _get_input_args(input_node): def _get_filter_spec(node, outgoing_edge_map, stream_name_map): incoming_edges = node.incoming_edges 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] + inputs = ["[{}{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label], "" if not edge.upstream_selector else ":{}".format(edge.upstream_selector)) for edge in incoming_edges] + outputs = ["[{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label]) for edge in outgoing_edges] filter_spec = '{}{}{}'.format(''.join(inputs), node._get_filter(outgoing_edges), ''.join(outputs)) return filter_spec @@ -95,7 +95,7 @@ def _get_output_args(node, stream_name_map): args = [] assert len(node.incoming_edges) == 1 edge = node.incoming_edges[0] - stream_name = stream_name_map[edge.upstream_node, edge.upstream_label] + stream_name = "[{}{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label], "" if not edge.upstream_selector else ":{}".format(edge.upstream_selector)) if stream_name != '[0]': args += ['-map', stream_name] kwargs = copy.copy(node.kwargs) diff --git a/ffmpeg/_view.py b/ffmpeg/_view.py index cdb41b0..eea2b43 100644 --- a/ffmpeg/_view.py +++ b/ffmpeg/_view.py @@ -62,9 +62,13 @@ def view(stream_spec, **kwargs): kwargs = {} up_label = edge.upstream_label down_label = edge.downstream_label - if show_labels and (up_label is not None or down_label is not None): + up_selector = edge.upstream_selector + + if show_labels and (up_label is not None or down_label is not None or up_selector is not None): if up_label is None: up_label = '' + if up_selector is not None: + up_label += ":" + up_selector if down_label is None: down_label = '' if up_label != '' and down_label != '': diff --git a/ffmpeg/dag.py b/ffmpeg/dag.py index 0454503..413d324 100644 --- a/ffmpeg/dag.py +++ b/ffmpeg/dag.py @@ -70,21 +70,26 @@ class DagNode(object): raise NotImplementedError() -DagEdge = namedtuple('DagEdge', ['downstream_node', 'downstream_label', 'upstream_node', 'upstream_label']) +DagEdge = namedtuple('DagEdge', ['downstream_node', 'downstream_label', 'upstream_node', 'upstream_label', 'upstream_selector']) def get_incoming_edges(downstream_node, incoming_edge_map): edges = [] - for downstream_label, (upstream_node, upstream_label) in list(incoming_edge_map.items()): - edges += [DagEdge(downstream_node, downstream_label, upstream_node, upstream_label)] + # downstream_label, (upstream_node, upstream_label) in [(i[0], i[1][:2]) for i in self.incoming_edge_map.items()] + for downstream_label, upstream_info in [(i[0], i[1]) for i in incoming_edge_map.items()]: + upstream_node, upstream_label = upstream_info[:2] + upstream_selector = None if len(upstream_info) < 3 else upstream_info[2] + edges += [DagEdge(downstream_node, downstream_label, upstream_node, upstream_label, upstream_selector)] return edges def get_outgoing_edges(upstream_node, outgoing_edge_map): edges = [] for upstream_label, downstream_infos in list(outgoing_edge_map.items()): - for (downstream_node, downstream_label) in downstream_infos: - edges += [DagEdge(downstream_node, downstream_label, upstream_node, upstream_label)] + for downstream_info in downstream_infos: + downstream_node, downstream_label = downstream_info[:2] + downstream_selector = None if len(downstream_info) < 3 else downstream_info[2] + edges += [DagEdge(downstream_node, downstream_label, upstream_node, upstream_label, downstream_selector)] return edges @@ -155,21 +160,21 @@ def topo_sort(downstream_nodes): sorted_nodes = [] outgoing_edge_maps = {} - def visit(upstream_node, upstream_label, downstream_node, downstream_label): + def visit(upstream_node, upstream_label, downstream_node, downstream_label, downstream_selector=None): if upstream_node in marked_nodes: raise RuntimeError('Graph is not a DAG') if downstream_node is not None: outgoing_edge_map = outgoing_edge_maps.get(upstream_node, {}) outgoing_edge_infos = outgoing_edge_map.get(upstream_label, []) - outgoing_edge_infos += [(downstream_node, downstream_label)] + outgoing_edge_infos += [(downstream_node, downstream_label, downstream_selector)] outgoing_edge_map[upstream_label] = outgoing_edge_infos outgoing_edge_maps[upstream_node] = outgoing_edge_map if upstream_node not in sorted_nodes: marked_nodes.append(upstream_node) for edge in upstream_node.incoming_edges: - visit(edge.upstream_node, edge.upstream_label, edge.downstream_node, edge.downstream_label) + visit(edge.upstream_node, edge.upstream_label, edge.downstream_node, edge.downstream_label, edge.upstream_selector) marked_nodes.remove(upstream_node) sorted_nodes.append(upstream_node) From c2c6a864d2fea9948f04f973bb69f3a6368a9316 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 21 Dec 2017 15:55:36 +0100 Subject: [PATCH 21/39] Make sure `item` is instance of `slice` in `__getitem__` --- ffmpeg/nodes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index 5c3067d..fea04a8 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -49,7 +49,7 @@ class Stream(object): Please note that this can only be used to select a substream that already exist. If you want to split the stream, use the `split` filter. """ - if item.start != None: + if not isinstance(item, slice) or item.start is not None: raise ValueError("Invalid syntax. Use 'stream[:\"something\"]', not 'stream[\"something\"]'.") return self.node.stream(select=item.stop) From 44091f8a4adc505ae4df4298d794c748c2892350 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 21 Dec 2017 17:12:58 +0100 Subject: [PATCH 22/39] Allow outputs to be created empty; streams can be mapped later --- ffmpeg/nodes.py | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index fea04a8..fdbd8ff 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -21,6 +21,7 @@ def _get_types_str(types): class Stream(object): """Represents the outgoing edge of an upstream node; may be used to create more downstream nodes.""" + def __init__(self, upstream_node, upstream_label, node_types, upstream_selector=None): if not _is_of_types(upstream_node, node_types): raise TypeError('Expected upstream node to be of one of the following type(s): {}; got {}'.format( @@ -83,6 +84,7 @@ def get_stream_spec_nodes(stream_spec): class Node(KwargReprNode): """Node base""" + @classmethod def __check_input_len(cls, stream_map, min_inputs, max_inputs): if min_inputs is not None and len(stream_map) < min_inputs: @@ -95,7 +97,7 @@ class Node(KwargReprNode): for stream in list(stream_map.values()): if not _is_of_types(stream, incoming_stream_types): raise TypeError('Expected incoming stream(s) to be of one of the following types: {}; got {}' - .format(_get_types_str(incoming_stream_types), type(stream))) + .format(_get_types_str(incoming_stream_types), type(stream))) @classmethod def __get_incoming_edge_map(cls, stream_map): @@ -113,6 +115,10 @@ class Node(KwargReprNode): super(Node, self).__init__(incoming_edge_map, name, args, kwargs) self.__outgoing_stream_type = outgoing_stream_type + self.__incoming_stream_types = incoming_stream_types + self.__min_inputs = min_inputs + self.__max_inputs = max_inputs + def stream(self, label=None, select=None): """Create an outgoing stream originating from this node. @@ -130,14 +136,41 @@ class Node(KwargReprNode): else: return self.stream(label=item) + def _add_streams(self, stream_spec): + """Attach additional streams after the Node is initialized. + """ + # Back up previous edges + prev_edges = self.incoming_edge_map.values() + + # Check new edges + new_stream_map = get_stream_map(stream_spec) + self.__check_input_types(new_stream_map, self.__incoming_stream_types) + + # Generate new edge map + new_inc_edge_map = self.__get_incoming_edge_map(new_stream_map) + new_edges = new_inc_edge_map.values() + + # Rename all edges + new_edge_map = dict(enumerate(list(prev_edges) + list(new_edges))) + + # Check new length + self.__check_input_len(new_edge_map, self.__min_inputs, self.__max_inputs) + + # Overwrite old map (exploiting the fact that dict is mutable; incoming_edge_map is a read-only property) + if None in self.incoming_edge_map: + self.incoming_edge_map.pop(None) + self.incoming_edge_map.update(new_edge_map) + class FilterableStream(Stream): def __init__(self, upstream_node, upstream_label, upstream_selector=None): - super(FilterableStream, self).__init__(upstream_node, upstream_label, {InputNode, FilterNode}, upstream_selector) + super(FilterableStream, self).__init__(upstream_node, upstream_label, {InputNode, FilterNode}, + upstream_selector) class InputNode(Node): """InputNode type""" + def __init__(self, name, args=[], kwargs={}): super(InputNode, self).__init__( stream_spec=None, @@ -169,6 +202,7 @@ class FilterNode(Node): ) """FilterNode""" + def _get_filter(self, outgoing_edges): args = self.args kwargs = self.kwargs @@ -200,8 +234,8 @@ class OutputNode(Node): name=name, incoming_stream_types={FilterableStream}, outgoing_stream_type=OutputStream, - min_inputs=1, - max_inputs=1, + min_inputs=0, # Allow streams to be mapped afterwards + max_inputs=None, args=args, kwargs=kwargs ) @@ -213,7 +247,8 @@ class OutputNode(Node): class OutputStream(Stream): def __init__(self, upstream_node, upstream_label, upstream_selector=None): - super(OutputStream, self).__init__(upstream_node, upstream_label, {OutputNode, GlobalNode, MergeOutputsNode}, upstream_selector=upstream_selector) + super(OutputStream, self).__init__(upstream_node, upstream_label, {OutputNode, GlobalNode, MergeOutputsNode}, + upstream_selector=upstream_selector) class MergeOutputsNode(Node): @@ -247,6 +282,7 @@ def stream_operator(stream_classes={Stream}, name=None): func_name = name or func.__name__ [setattr(stream_class, func_name, func) for stream_class in stream_classes] return func + return decorator From aa0b0bbd0304129f6fbf01b8474c78ad9e79f38a Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 21 Dec 2017 17:13:53 +0100 Subject: [PATCH 23/39] Generate multiple `-map` for outputs with multiple incoming edges --- ffmpeg/_run.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index 7dad58a..455bab7 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -93,11 +93,16 @@ def _get_output_args(node, stream_name_map): if node.name != output.__name__: raise ValueError('Unsupported output node: {}'.format(node)) args = [] - assert len(node.incoming_edges) == 1 - edge = node.incoming_edges[0] - stream_name = "[{}{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label], "" if not edge.upstream_selector else ":{}".format(edge.upstream_selector)) - if stream_name != '[0]': - args += ['-map', stream_name] + + if len(node.incoming_edges) == 0: + raise ValueError("Output node {} has no mapped streams") + + for edge in node.incoming_edges: + # edge = node.incoming_edges[0] + stream_name = "[{}{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label], "" if not edge.upstream_selector else ":{}".format(edge.upstream_selector)) + if stream_name != '[0]': + args += ['-map', stream_name] + kwargs = copy.copy(node.kwargs) filename = kwargs.pop('filename') fmt = kwargs.pop('format', None) From 0d95d9b58dd4fcb9dd424bdb4f3bf62629e9c3b6 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 21 Dec 2017 17:14:26 +0100 Subject: [PATCH 24/39] Implement `.map()` operator, allow multiple streams in `.output()` --- ffmpeg/_ffmpeg.py | 49 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/ffmpeg/_ffmpeg.py b/ffmpeg/_ffmpeg.py index 968e793..7153fc5 100644 --- a/ffmpeg/_ffmpeg.py +++ b/ffmpeg/_ffmpeg.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals +from past.builtins import basestring + from .nodes import ( filter_operator, GlobalNode, @@ -7,8 +9,9 @@ from .nodes import ( MergeOutputsNode, OutputNode, output_operator, -) + OutputStream) +_py_map = map def input(filename, **kwargs): """Input file URL (ffmpeg ``-i`` option) @@ -41,24 +44,62 @@ def merge_outputs(*streams): @filter_operator() -def output(stream, filename, **kwargs): +def output(*streams_and_filename, **kwargs): """Output file URL + Syntax: + `ffmpeg.output(stream1[, stream2, stream3...], filename, **ffmpeg_args)` + + If multiple streams are provided, they are mapped to the same output. + Official documentation: `Synopsis `__ """ - kwargs['filename'] = filename + streams_and_filename = list(streams_and_filename) + if "filename" not in kwargs: + if not isinstance(streams_and_filename[-1], basestring): + raise ValueError("You must provide a filename") + kwargs['filename'] = streams_and_filename.pop(-1) + streams = streams_and_filename + + if len(streams) < 1: + raise ValueError("You must specify at least one stream to produce an output") + fmt = kwargs.pop('f', None) if fmt: if 'format' in kwargs: raise ValueError("Can't specify both `format` and `f` kwargs") kwargs['format'] = fmt - return OutputNode(stream, output.__name__, kwargs=kwargs).stream() + return OutputNode(streams, output.__name__, kwargs=kwargs).stream() +@output_operator() +def map(*streams): + """Map multiple streams to the same output + """ + head = streams[0] + tail = streams[1:] + + if not isinstance(head, OutputStream): + raise ValueError("First argument must be an output stream") + + if not tail: + return head + + head.node._add_streams(tail) + + return head + +# stream_map = get_stream_map(stream_spec) +# self.__check_input_len(stream_map, min_inputs, max_inputs) +# self.__check_input_types(stream_map, incoming_stream_types) +# incoming_edge_map = self.__get_incoming_edge_map(stream_map) +# super(Node, self).__init__(incoming_edge_map, name, args, kwargs) +# self.__outgoing_stream_type = outgoing_stream_type __all__ = [ 'input', 'merge_outputs', 'output', + 'map', 'overwrite_output', ] From 90652306eadc60de5b64a4e33a11d3c6ed54f10c Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 21 Dec 2017 17:37:10 +0100 Subject: [PATCH 25/39] Explicitly include `-map [0]` when output has multiple mapped streams --- ffmpeg/_run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index 455bab7..589114d 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -100,7 +100,7 @@ def _get_output_args(node, stream_name_map): for edge in node.incoming_edges: # edge = node.incoming_edges[0] stream_name = "[{}{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label], "" if not edge.upstream_selector else ":{}".format(edge.upstream_selector)) - if stream_name != '[0]': + if stream_name != '[0]' or len(node.incoming_edges) > 1: args += ['-map', stream_name] kwargs = copy.copy(node.kwargs) From db83137f532e0566e2be39868cade07f2e82f2ce Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 21 Dec 2017 17:37:34 +0100 Subject: [PATCH 26/39] Add tests for stream selection and mapping --- ffmpeg/tests/test_ffmpeg.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 95e0042..e6d8186 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -146,6 +146,38 @@ def test_get_args_complex_filter(): '-y' ] +def _get_filter_with_select_example(): + i = ffmpeg.input(TEST_INPUT_FILE1) + v1 = i[:"v"].hflip() + a1 = i[:"a"].filter_("aecho", 0.8, 0.9, 1000, 0.3) + + return ffmpeg.output(a1, v1, TEST_OUTPUT_FILE1) + +def test_filter_with_select(): + assert _get_filter_with_select_example().get_args() \ + == ['-i', TEST_INPUT_FILE1, + '-filter_complex', + '[0:a]aecho=0.8:0.9:1000:0.3[s0];' \ + '[0:v]hflip[s1]', + '-map', '[s0]', '-map', '[s1]', + TEST_OUTPUT_FILE1] + +def test_map_same_effect_as_output(): + i1 = ffmpeg.input(TEST_INPUT_FILE1) + i2 = ffmpeg.input(TEST_OVERLAY_FILE) + + o_map = i1.output(TEST_OUTPUT_FILE1) + o_map.map(i2) + + o_nomap = ffmpeg.output(i1, i2, TEST_OUTPUT_FILE1) + + assert o_map.node.incoming_edge_map == o_nomap.node.incoming_edge_map + assert o_map.get_args() == o_nomap.get_args() == ['-i', TEST_INPUT_FILE1, + '-i', TEST_OVERLAY_FILE, + '-map', '[0]', + '-map', '[1]', + TEST_OUTPUT_FILE1] + def test_filter_normal_arg_escape(): """Test string escaping of normal filter args (e.g. ``font`` param of ``drawtext`` filter).""" From b4503a183cd9c87dcfa0b647b59b3bac060e7ad1 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 21 Dec 2017 17:40:35 +0100 Subject: [PATCH 27/39] Allow output to be created without mapped streams --- ffmpeg/_ffmpeg.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/ffmpeg/_ffmpeg.py b/ffmpeg/_ffmpeg.py index 7153fc5..826497d 100644 --- a/ffmpeg/_ffmpeg.py +++ b/ffmpeg/_ffmpeg.py @@ -61,9 +61,6 @@ def output(*streams_and_filename, **kwargs): kwargs['filename'] = streams_and_filename.pop(-1) streams = streams_and_filename - if len(streams) < 1: - raise ValueError("You must specify at least one stream to produce an output") - fmt = kwargs.pop('f', None) if fmt: if 'format' in kwargs: From 03762a5cc530f436d05e498621588b6365a12283 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 9 Jan 2018 10:59:08 +0100 Subject: [PATCH 28/39] Expand complicated format + list comprehension into its own function --- ffmpeg/_run.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index 589114d..b23c2c3 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -16,7 +16,7 @@ from .nodes import ( get_stream_spec_nodes, FilterNode, GlobalNode, - InputNode, + InputNode, OutputNode, output_operator, ) @@ -54,11 +54,24 @@ def _get_input_args(input_node): return args +def _format_input_stream_name(stream_name_map, edge): + prefix = stream_name_map[edge.upstream_node, edge.upstream_label] + if not edge.upstream_selector: + suffix = "" + else: + suffix = ":{}".format(edge.upstream_selector) + return "[{}{}]".format(prefix, suffix) + + +def _format_output_stream_name(stream_name_map, edge): + return "[{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label]) + + def _get_filter_spec(node, outgoing_edge_map, stream_name_map): incoming_edges = node.incoming_edges outgoing_edges = get_outgoing_edges(node, outgoing_edge_map) - inputs = ["[{}{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label], "" if not edge.upstream_selector else ":{}".format(edge.upstream_selector)) for edge in incoming_edges] - outputs = ["[{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label]) for edge in outgoing_edges] + inputs = [_format_input_stream_name(stream_name_map, edge) for edge in incoming_edges] + outputs = [_format_output_stream_name(stream_name_map, edge) for edge in outgoing_edges] filter_spec = '{}{}{}'.format(''.join(inputs), node._get_filter(outgoing_edges), ''.join(outputs)) return filter_spec @@ -71,7 +84,7 @@ def _allocate_filter_stream_names(filter_nodes, outgoing_edge_maps, stream_name_ if len(downstreams) > 1: # TODO: automatically insert `splits` ahead of time via graph transformation. raise ValueError('Encountered {} with multiple outgoing edges with same upstream label {!r}; a ' - '`split` filter is probably required'.format(upstream_node, upstream_label)) + '`split` filter is probably required'.format(upstream_node, upstream_label)) stream_name_map[upstream_node, upstream_label] = _get_stream_name('s{}'.format(stream_count)) stream_count += 1 @@ -99,7 +112,7 @@ def _get_output_args(node, stream_name_map): for edge in node.incoming_edges: # edge = node.incoming_edges[0] - stream_name = "[{}{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label], "" if not edge.upstream_selector else ":{}".format(edge.upstream_selector)) + stream_name = _format_input_stream_name(stream_name_map, edge) if stream_name != '[0]' or len(node.incoming_edges) > 1: args += ['-map', stream_name] From 1070b3e51bc3d5d3b00ca817f10b048348a5ac79 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 9 Jan 2018 11:06:26 +0100 Subject: [PATCH 29/39] Remove commented code --- ffmpeg/_ffmpeg.py | 7 +------ ffmpeg/dag.py | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ffmpeg/_ffmpeg.py b/ffmpeg/_ffmpeg.py index 826497d..1abf2ca 100644 --- a/ffmpeg/_ffmpeg.py +++ b/ffmpeg/_ffmpeg.py @@ -13,6 +13,7 @@ from .nodes import ( _py_map = map + def input(filename, **kwargs): """Input file URL (ffmpeg ``-i`` option) @@ -86,12 +87,6 @@ def map(*streams): return head -# stream_map = get_stream_map(stream_spec) -# self.__check_input_len(stream_map, min_inputs, max_inputs) -# self.__check_input_types(stream_map, incoming_stream_types) -# incoming_edge_map = self.__get_incoming_edge_map(stream_map) -# super(Node, self).__init__(incoming_edge_map, name, args, kwargs) -# self.__outgoing_stream_type = outgoing_stream_type __all__ = [ 'input', diff --git a/ffmpeg/dag.py b/ffmpeg/dag.py index 413d324..0138197 100644 --- a/ffmpeg/dag.py +++ b/ffmpeg/dag.py @@ -75,7 +75,6 @@ DagEdge = namedtuple('DagEdge', ['downstream_node', 'downstream_label', 'upstrea def get_incoming_edges(downstream_node, incoming_edge_map): edges = [] - # downstream_label, (upstream_node, upstream_label) in [(i[0], i[1][:2]) for i in self.incoming_edge_map.items()] for downstream_label, upstream_info in [(i[0], i[1]) for i in incoming_edge_map.items()]: upstream_node, upstream_label = upstream_info[:2] upstream_selector = None if len(upstream_info) < 3 else upstream_info[2] From 1a4647155398def9a7ec68809fed749386a97023 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 9 Jan 2018 11:15:47 +0100 Subject: [PATCH 30/39] Remove useless `_get_stream_name` function --- ffmpeg/_run.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index b23c2c3..d7f8cd2 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -22,10 +22,6 @@ from .nodes import ( ) -def _get_stream_name(name): - return '{}'.format(name) - - def _convert_kwargs_to_cmd_line_args(kwargs): args = [] for k in sorted(kwargs.keys()): @@ -85,7 +81,7 @@ def _allocate_filter_stream_names(filter_nodes, outgoing_edge_maps, stream_name_ # TODO: automatically insert `splits` ahead of time via graph transformation. raise ValueError('Encountered {} with multiple outgoing edges with same upstream label {!r}; a ' '`split` filter is probably required'.format(upstream_node, upstream_label)) - stream_name_map[upstream_node, upstream_label] = _get_stream_name('s{}'.format(stream_count)) + stream_name_map[upstream_node, upstream_label] = 's{}'.format(stream_count) stream_count += 1 @@ -137,7 +133,7 @@ def get_args(stream_spec, overwrite_output=False): output_nodes = [node for node in sorted_nodes if isinstance(node, OutputNode)] global_nodes = [node for node in sorted_nodes if isinstance(node, GlobalNode)] filter_nodes = [node for node in sorted_nodes if isinstance(node, FilterNode)] - stream_name_map = {(node, None): _get_stream_name(i) for i, node in enumerate(input_nodes)} + stream_name_map = {(node, None): str(i) for i, node in enumerate(input_nodes)} filter_arg = _get_filter_arg(filter_nodes, outgoing_edge_maps, stream_name_map) args += reduce(operator.add, [_get_input_args(node) for node in input_nodes]) if filter_arg: From 783bdbdb37c4a093a3eba0febd62181eacb2cd90 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 9 Jan 2018 11:18:04 +0100 Subject: [PATCH 31/39] Remove unused imports --- ffmpeg/_view.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/ffmpeg/_view.py b/ffmpeg/_view.py index eea2b43..19d401c 100644 --- a/ffmpeg/_view.py +++ b/ffmpeg/_view.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals from builtins import str from .dag import get_outgoing_edges from ._run import topo_sort -import os import tempfile from ffmpeg.nodes import ( @@ -11,7 +10,6 @@ from ffmpeg.nodes import ( get_stream_spec_nodes, InputNode, OutputNode, - Stream, stream_operator, ) From 861980db0bd6d7add7ec6324777238603a4468fe Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 9 Jan 2018 11:31:51 +0100 Subject: [PATCH 32/39] Simplify, expand and explain complicated loops in dag.py --- ffmpeg/dag.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ffmpeg/dag.py b/ffmpeg/dag.py index 0138197..7dc02f6 100644 --- a/ffmpeg/dag.py +++ b/ffmpeg/dag.py @@ -75,8 +75,10 @@ DagEdge = namedtuple('DagEdge', ['downstream_node', 'downstream_label', 'upstrea def get_incoming_edges(downstream_node, incoming_edge_map): edges = [] - for downstream_label, upstream_info in [(i[0], i[1]) for i in incoming_edge_map.items()]: + for downstream_label, upstream_info in incoming_edge_map.items(): + # `upstream_info` may contain the upstream_selector. [:2] trims it away upstream_node, upstream_label = upstream_info[:2] + # Take into account the stream selector if it's present (i.e. len(upstream_info) >= 3) upstream_selector = None if len(upstream_info) < 3 else upstream_info[2] edges += [DagEdge(downstream_node, downstream_label, upstream_node, upstream_label, upstream_selector)] return edges @@ -86,7 +88,9 @@ def get_outgoing_edges(upstream_node, outgoing_edge_map): edges = [] for upstream_label, downstream_infos in list(outgoing_edge_map.items()): for downstream_info in downstream_infos: + # `downstream_info` may contain the downstream_selector. [:2] trims it away downstream_node, downstream_label = downstream_info[:2] + # Take into account the stream selector if it's present downstream_selector = None if len(downstream_info) < 3 else downstream_info[2] edges += [DagEdge(downstream_node, downstream_label, upstream_node, upstream_label, downstream_selector)] return edges @@ -99,8 +103,10 @@ class KwargReprNode(DagNode): @property def __upstream_hashes(self): hashes = [] - # This is needed to allow extra stuff in the incoming_edge_map's value tuples - for downstream_label, (upstream_node, upstream_label) in [(i[0], i[1][:2]) for i in self.incoming_edge_map.items()]: + for downstream_label, upstream_info in self.incoming_edge_map.items(): + # `upstream_info` may contain the upstream_selector. [:2] trims it away + upstream_node, upstream_label = upstream_info[:2] + # The stream selector is discarded when calculating the hash: the stream "as a whole" is still the same hashes += [hash(x) for x in [downstream_label, upstream_node, upstream_label]] return hashes From 497105f929a7a927ee8807519738f48c49b5a3a1 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 9 Jan 2018 14:45:27 +0100 Subject: [PATCH 33/39] Reimplement `.map` logic making `Node` immutable --- ffmpeg/_ffmpeg.py | 4 +- ffmpeg/nodes.py | 157 +++++++++++++++++++++++++++--------- ffmpeg/tests/test_ffmpeg.py | 5 +- 3 files changed, 122 insertions(+), 44 deletions(-) diff --git a/ffmpeg/_ffmpeg.py b/ffmpeg/_ffmpeg.py index 1abf2ca..231783a 100644 --- a/ffmpeg/_ffmpeg.py +++ b/ffmpeg/_ffmpeg.py @@ -83,9 +83,7 @@ def map(*streams): if not tail: return head - head.node._add_streams(tail) - - return head + return OutputNode(head.node, tail).stream() __all__ = [ diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index fdbd8ff..89fdc11 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -1,9 +1,12 @@ from __future__ import unicode_literals +import warnings + from .dag import KwargReprNode from ._utils import escape_chars, get_hash_int from builtins import object -import os +import os, sys +import inspect def _is_of_types(obj, types): @@ -19,6 +22,13 @@ def _get_types_str(types): return ', '.join(['{}.{}'.format(x.__module__, x.__name__) for x in types]) +def _get_arg_count(callable): + if sys.version_info.major >= 3: + return len(inspect.getfullargspec(callable).args) + else: + return len(inspect.getargspec(callable).args) + + class Stream(object): """Represents the outgoing edge of an upstream node; may be used to create more downstream nodes.""" @@ -30,6 +40,7 @@ class Stream(object): self.label = upstream_label self.selector = upstream_selector + def __hash__(self): return get_hash_int([hash(self.node), hash(self.label)]) @@ -85,6 +96,22 @@ def get_stream_spec_nodes(stream_spec): class Node(KwargReprNode): """Node base""" + @property + def min_inputs(self): + return self.__min_inputs + + @property + def max_inputs(self): + return self.__max_inputs + + @property + def incoming_stream_types(self): + return self.__incoming_stream_types + + @property + def outgoing_stream_type(self): + return self.__outgoing_stream_type + @classmethod def __check_input_len(cls, stream_map, min_inputs, max_inputs): if min_inputs is not None and len(stream_map) < min_inputs: @@ -106,19 +133,85 @@ class Node(KwargReprNode): incoming_edge_map[downstream_label] = (upstream.node, upstream.label, upstream.selector) return incoming_edge_map - def __init__(self, stream_spec, name, incoming_stream_types, outgoing_stream_type, min_inputs, max_inputs, args=[], - kwargs={}): + def __init_fromscratch__(self, stream_spec, name, incoming_stream_types, outgoing_stream_type, min_inputs, + max_inputs, args=[], + kwargs={}): stream_map = get_stream_map(stream_spec) self.__check_input_len(stream_map, min_inputs, max_inputs) self.__check_input_types(stream_map, incoming_stream_types) incoming_edge_map = self.__get_incoming_edge_map(stream_map) + super(Node, self).__init__(incoming_edge_map, name, args, kwargs) self.__outgoing_stream_type = outgoing_stream_type - self.__incoming_stream_types = incoming_stream_types self.__min_inputs = min_inputs self.__max_inputs = max_inputs + def __init_fromnode__(self, old_node, stream_spec): + # Make sure old node and new node are of the same type + if type(self) != type(old_node): + raise ValueError("'old_node' should be of type {}".format(self.__class__.__name__)) + + # Copy needed data from old node + name = old_node.name + incoming_stream_types = old_node.incoming_stream_types + outgoing_stream_type = old_node.outgoing_stream_type + min_inputs = old_node.min_inputs + max_inputs = old_node.max_inputs + prev_edges = old_node.incoming_edge_map.values() + args = old_node.args + kwargs = old_node.kwargs + + # Check new stream spec - the old spec should have already been checked + new_stream_map = get_stream_map(stream_spec) + self.__check_input_types(new_stream_map, incoming_stream_types) + + # Generate new edge map + new_inc_edge_map = self.__get_incoming_edge_map(new_stream_map) + new_edges = new_inc_edge_map.values() + + # Rename all edges + new_edge_map = dict(enumerate(list(prev_edges) + list(new_edges))) + + # Check new length + self.__check_input_len(new_edge_map, min_inputs, max_inputs) + + super(Node, self).__init__(new_edge_map, name, args, kwargs) + self.__outgoing_stream_type = outgoing_stream_type + self.__incoming_stream_types = incoming_stream_types + self.__min_inputs = min_inputs + self.__max_inputs = max_inputs + + # noinspection PyMissingConstructor + def __init__(self, *args, **kwargs): + """ + If called with the following arguments, the new Node is created from scratch: + - stream_spec, name, incoming_stream_types, outgoing_stream_type, min_inputs, max_inputs, args=[], kwargs={} + + If called with the following arguments, the new node is a copy of `old_node` that includes the additional + `stream_spec`: + - old_node, stream_spec + """ + # Python doesn't support constructor overloading. This hacky code detects how we want to construct the object + # based on the number of arguments and the type of the first argument, then calls the appropriate constructor + # helper method + + # "1+" is for `self` + argc = 1 + len(args) + len(kwargs) + + first_arg = "old_node" in kwargs and kwargs["old_node"] or args[0] + + if argc == _get_arg_count(self.__init_fromnode__) and type(first_arg) == type(self): + self.__init_fromnode__(*args, **kwargs) + else: + if isinstance(first_arg, Node): + raise ValueError( + "{}.__init__() received an instance of {} as the first argument. If you want to create a " + "copy of an existing node, the types must match and you must provide an additional stream_spec." + .format(self.__class__.__name__, first_arg.__class__.__name__) + ) + self.__init_fromscratch__(*args, **kwargs) + def stream(self, label=None, select=None): """Create an outgoing stream originating from this node. @@ -136,31 +229,6 @@ class Node(KwargReprNode): else: return self.stream(label=item) - def _add_streams(self, stream_spec): - """Attach additional streams after the Node is initialized. - """ - # Back up previous edges - prev_edges = self.incoming_edge_map.values() - - # Check new edges - new_stream_map = get_stream_map(stream_spec) - self.__check_input_types(new_stream_map, self.__incoming_stream_types) - - # Generate new edge map - new_inc_edge_map = self.__get_incoming_edge_map(new_stream_map) - new_edges = new_inc_edge_map.values() - - # Rename all edges - new_edge_map = dict(enumerate(list(prev_edges) + list(new_edges))) - - # Check new length - self.__check_input_len(new_edge_map, self.__min_inputs, self.__max_inputs) - - # Overwrite old map (exploiting the fact that dict is mutable; incoming_edge_map is a read-only property) - if None in self.incoming_edge_map: - self.incoming_edge_map.pop(None) - self.incoming_edge_map.update(new_edge_map) - class FilterableStream(Stream): def __init__(self, upstream_node, upstream_label, upstream_selector=None): @@ -168,11 +236,12 @@ class FilterableStream(Stream): upstream_selector) +# noinspection PyMethodOverriding class InputNode(Node): """InputNode type""" - def __init__(self, name, args=[], kwargs={}): - super(InputNode, self).__init__( + def __init_fromscratch__(self, name, args=[], kwargs={}): + super(InputNode, self).__init_fromscratch__( stream_spec=None, name=name, incoming_stream_types={}, @@ -183,14 +252,18 @@ class InputNode(Node): kwargs=kwargs ) + def __init_fromnode__(self, old_node, stream_spec): + raise TypeError("{} can't be constructed from an existing node".format(self.__class__.__name__)) + @property def short_repr(self): return os.path.basename(self.kwargs['filename']) +# noinspection PyMethodOverriding class FilterNode(Node): - def __init__(self, stream_spec, name, max_inputs=1, args=[], kwargs={}): - super(FilterNode, self).__init__( + def __init_fromscratch__(self, stream_spec, name, max_inputs=1, args=[], kwargs={}): + super(FilterNode, self).__init_fromscratch__( stream_spec=stream_spec, name=name, incoming_stream_types={FilterableStream}, @@ -227,9 +300,10 @@ class FilterNode(Node): return escape_chars(params_text, '\\\'[],;') +# noinspection PyMethodOverriding class OutputNode(Node): - def __init__(self, stream, name, args=[], kwargs={}): - super(OutputNode, self).__init__( + def __init_fromscratch__(self, stream, name, args=[], kwargs={}): + super(OutputNode, self).__init_fromscratch__( stream_spec=stream, name=name, incoming_stream_types={FilterableStream}, @@ -251,9 +325,10 @@ class OutputStream(Stream): upstream_selector=upstream_selector) +# noinspection PyMethodOverriding class MergeOutputsNode(Node): - def __init__(self, streams, name): - super(MergeOutputsNode, self).__init__( + def __init_fromscratch__(self, streams, name): + super(MergeOutputsNode, self).__init_fromscratch__( stream_spec=streams, name=name, incoming_stream_types={OutputStream}, @@ -263,9 +338,10 @@ class MergeOutputsNode(Node): ) +# noinspection PyMethodOverriding class GlobalNode(Node): - def __init__(self, stream, name, args=[], kwargs={}): - super(GlobalNode, self).__init__( + def __init_fromscratch__(self, stream, name, args=[], kwargs={}): + super(GlobalNode, self).__init_fromscratch__( stream_spec=stream, name=name, incoming_stream_types={OutputStream}, @@ -276,6 +352,9 @@ class GlobalNode(Node): kwargs=kwargs ) + def __init_fromnode__(self, old_node, stream_spec): + raise TypeError("{} can't be constructed from an existing node".format(self.__class__.__name__)) + def stream_operator(stream_classes={Stream}, name=None): def decorator(func): diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index e6d8186..07ae212 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -166,11 +166,12 @@ def test_map_same_effect_as_output(): i1 = ffmpeg.input(TEST_INPUT_FILE1) i2 = ffmpeg.input(TEST_OVERLAY_FILE) - o_map = i1.output(TEST_OUTPUT_FILE1) - o_map.map(i2) + _o_map = i1.output(TEST_OUTPUT_FILE1) + o_map = _o_map.map(i2) o_nomap = ffmpeg.output(i1, i2, TEST_OUTPUT_FILE1) + assert id(o_map) != id(_o_map) # Checks immutability assert o_map.node.incoming_edge_map == o_nomap.node.incoming_edge_map assert o_map.get_args() == o_nomap.get_args() == ['-i', TEST_INPUT_FILE1, '-i', TEST_OVERLAY_FILE, From df9bd7316f4d34db1fd6e016332ff32dd2f9394d Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 9 Jan 2018 15:41:40 +0100 Subject: [PATCH 34/39] Replace past.builtins.basestring with a custom one to workaround bug in Ubuntu's Python3 --- ffmpeg/_ffmpeg.py | 2 +- ffmpeg/_run.py | 2 +- ffmpeg/_utils.py | 41 ++++++++++++++++++++++++++++++++++++++--- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/ffmpeg/_ffmpeg.py b/ffmpeg/_ffmpeg.py index 231783a..cd455cc 100644 --- a/ffmpeg/_ffmpeg.py +++ b/ffmpeg/_ffmpeg.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from past.builtins import basestring +from ._utils import basestring from .nodes import ( filter_operator, diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index d7f8cd2..73b5428 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from .dag import get_outgoing_edges, topo_sort from functools import reduce -from past.builtins import basestring +from ._utils import basestring import copy import operator import subprocess as _subprocess diff --git a/ffmpeg/_utils.py b/ffmpeg/_utils.py index 9b575a0..20eb1af 100644 --- a/ffmpeg/_utils.py +++ b/ffmpeg/_utils.py @@ -1,8 +1,42 @@ from __future__ import unicode_literals - -from builtins import str -from past.builtins import basestring import hashlib +import sys + +if sys.version_info.major == 2: + # noinspection PyUnresolvedReferences,PyShadowingBuiltins + str = unicode + + +# `past.builtins.basestring` module can't be imported on Python3 in some environments (Ubuntu). +# This code is copy-pasted from it to avoid crashes. +class BaseBaseString(type): + def __instancecheck__(cls, instance): + return isinstance(instance, (bytes, str)) + + def __subclasshook__(cls, thing): + # TODO: What should go here? + raise NotImplemented + + +def with_metaclass(meta, *bases): + class metaclass(meta): + __call__ = type.__call__ + __init__ = type.__init__ + + def __new__(cls, name, this_bases, d): + if this_bases is None: + return type.__new__(cls, name, (), d) + return meta(name, bases, d) + + return metaclass('temporary_class', None, {}) + + +if sys.version_info.major >= 3: + class basestring(with_metaclass(BaseBaseString)): + pass +else: + # noinspection PyUnresolvedReferences,PyCompatibility + from builtins import basestring def _recursive_repr(item): @@ -27,6 +61,7 @@ def get_hash(item): repr_ = _recursive_repr(item).encode('utf-8') return hashlib.md5(repr_).hexdigest() + def get_hash_int(item): return int(get_hash(item), base=16) From ea90d91dfe93400226a5cfa361d3221fe0ddb82d Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Tue, 9 Jan 2018 15:44:11 +0100 Subject: [PATCH 35/39] Expand unclear one-line implicit conditional statement --- ffmpeg/nodes.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index 89fdc11..a0eb62d 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -1,7 +1,4 @@ from __future__ import unicode_literals - -import warnings - from .dag import KwargReprNode from ._utils import escape_chars, get_hash_int from builtins import object @@ -199,7 +196,11 @@ class Node(KwargReprNode): # "1+" is for `self` argc = 1 + len(args) + len(kwargs) - first_arg = "old_node" in kwargs and kwargs["old_node"] or args[0] + first_arg = None + if "old_node" in kwargs: + first_arg = kwargs["old_node"] + elif len(args) > 0: + first_arg = args[0] if argc == _get_arg_count(self.__init_fromnode__) and type(first_arg) == type(self): self.__init_fromnode__(*args, **kwargs) From 6169b89321c16b847524112fba887bcd35a399ea Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Sun, 11 Mar 2018 20:02:56 -0700 Subject: [PATCH 36/39] Minor improvements (formatting, etc) --- ffmpeg/_ffmpeg.py | 8 ++---- ffmpeg/_run.py | 10 +++---- ffmpeg/nodes.py | 26 ++++++++--------- ffmpeg/tests/test_ffmpeg.py | 56 ++++++++++++++++++++----------------- 4 files changed, 52 insertions(+), 48 deletions(-) diff --git a/ffmpeg/_ffmpeg.py b/ffmpeg/_ffmpeg.py index cd455cc..8d67a3f 100644 --- a/ffmpeg/_ffmpeg.py +++ b/ffmpeg/_ffmpeg.py @@ -11,8 +11,6 @@ from .nodes import ( output_operator, OutputStream) -_py_map = map - def input(filename, **kwargs): """Input file URL (ffmpeg ``-i`` option) @@ -56,9 +54,9 @@ def output(*streams_and_filename, **kwargs): Official documentation: `Synopsis `__ """ streams_and_filename = list(streams_and_filename) - if "filename" not in kwargs: + if 'filename' not in kwargs: if not isinstance(streams_and_filename[-1], basestring): - raise ValueError("You must provide a filename") + raise ValueError('A filename must be provided') kwargs['filename'] = streams_and_filename.pop(-1) streams = streams_and_filename @@ -78,7 +76,7 @@ def map(*streams): tail = streams[1:] if not isinstance(head, OutputStream): - raise ValueError("First argument must be an output stream") + raise ValueError('First argument must be an output stream') if not tail: return head diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index 8fa13ab..804264d 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -53,14 +53,14 @@ def _get_input_args(input_node): def _format_input_stream_name(stream_name_map, edge): prefix = stream_name_map[edge.upstream_node, edge.upstream_label] if not edge.upstream_selector: - suffix = "" + suffix = '' else: - suffix = ":{}".format(edge.upstream_selector) - return "[{}{}]".format(prefix, suffix) + suffix = ':{}'.format(edge.upstream_selector) + return '[{}{}]'.format(prefix, suffix) def _format_output_stream_name(stream_name_map, edge): - return "[{}]".format(stream_name_map[edge.upstream_node, edge.upstream_label]) + return '[{}]'.format(stream_name_map[edge.upstream_node, edge.upstream_label]) def _get_filter_spec(node, outgoing_edge_map, stream_name_map): @@ -104,7 +104,7 @@ def _get_output_args(node, stream_name_map): args = [] if len(node.incoming_edges) == 0: - raise ValueError("Output node {} has no mapped streams") + raise ValueError('Output node {} has no mapped streams'.format(node)) for edge in node.incoming_edges: # edge = node.incoming_edges[0] diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index 88f62fe..184f2ff 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -46,22 +46,22 @@ class Stream(object): def __repr__(self): node_repr = self.node.long_repr(include_hash=False) - selector = "" + selector = '' if self.selector: - selector = ":{}".format(self.selector) + selector = ':{}'.format(self.selector) out = '{}[{!r}{}] <{}>'.format(node_repr, self.label, selector, self.node.short_hash) return out - def __getitem__(self, item): + def __getitem__(self, index): """ Select a component of the stream. `stream[:X]` is analogous to `stream.node.stream(select=X)`. Please note that this can only be used to select a substream that already exist. If you want to split the stream, use the `split` filter. """ - if not isinstance(item, slice) or item.start is not None: - raise ValueError("Invalid syntax. Use 'stream[:\"something\"]', not 'stream[\"something\"]'.") + if not isinstance(index, slice) or index.start is not None: + raise ValueError("Invalid syntax. Use `stream[:\'something\']`, not `stream[\'something\']`.") - return self.node.stream(select=item.stop) + return self.node.stream(select=index.stop) def get_stream_map(stream_spec): @@ -147,7 +147,7 @@ class Node(KwargReprNode): def __init_fromnode__(self, old_node, stream_spec): # Make sure old node and new node are of the same type if type(self) != type(old_node): - raise ValueError("'old_node' should be of type {}".format(self.__class__.__name__)) + raise TypeError('`old_node` should be of type {}'.format(self.__class__.__name__)) # Copy needed data from old node name = old_node.name @@ -197,8 +197,8 @@ class Node(KwargReprNode): argc = 1 + len(args) + len(kwargs) first_arg = None - if "old_node" in kwargs: - first_arg = kwargs["old_node"] + if 'old_node' in kwargs: + first_arg = kwargs['old_node'] elif len(args) > 0: first_arg = args[0] @@ -207,8 +207,8 @@ class Node(KwargReprNode): else: if isinstance(first_arg, Node): raise ValueError( - "{}.__init__() received an instance of {} as the first argument. If you want to create a " - "copy of an existing node, the types must match and you must provide an additional stream_spec." + '{}.__init__() received an instance of {} as the first argument. If you want to create a ' + 'copy of an existing node, the types must match and you must provide an additional stream_spec.' .format(self.__class__.__name__, first_arg.__class__.__name__) ) self.__init_fromscratch__(*args, **kwargs) @@ -222,8 +222,8 @@ class Node(KwargReprNode): def __getitem__(self, item): """Create an outgoing stream originating from this node; syntactic sugar for ``self.stream(label)``. - It can also be used to apply a selector: e.g. node[0:"audio"] returns a stream with label 0 and - selector "audio", which is the same as ``node.stream(label=0, select="audio")``. + It can also be used to apply a selector: e.g. ``node[0:'audio']`` returns a stream with label 0 and + selector ``'audio'``, which is the same as ``node.stream(label=0, select='audio')``. """ if isinstance(item, slice): return self.stream(label=item.start, select=item.stop) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index bd709fb..4bc3d0e 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -82,21 +82,21 @@ def test_node_repr(): trim3 = ffmpeg.trim(in_file, start_frame=50, end_frame=60) concatted = ffmpeg.concat(trim1, trim2, trim3) output = ffmpeg.output(concatted, 'dummy2.mp4') - assert repr(in_file.node) == "input(filename={!r}) <{}>".format('dummy.mp4', in_file.node.short_hash) - assert repr(trim1.node) == "trim(end_frame=20, start_frame=10) <{}>".format(trim1.node.short_hash) - assert repr(trim2.node) == "trim(end_frame=40, start_frame=30) <{}>".format(trim2.node.short_hash) - assert repr(trim3.node) == "trim(end_frame=60, start_frame=50) <{}>".format(trim3.node.short_hash) - assert repr(concatted.node) == "concat(n=3) <{}>".format(concatted.node.short_hash) - assert repr(output.node) == "output(filename={!r}) <{}>".format('dummy2.mp4', output.node.short_hash) + assert repr(in_file.node) == 'input(filename={!r}) <{}>'.format('dummy.mp4', in_file.node.short_hash) + assert repr(trim1.node) == 'trim(end_frame=20, start_frame=10) <{}>'.format(trim1.node.short_hash) + assert repr(trim2.node) == 'trim(end_frame=40, start_frame=30) <{}>'.format(trim2.node.short_hash) + assert repr(trim3.node) == 'trim(end_frame=60, start_frame=50) <{}>'.format(trim3.node.short_hash) + assert repr(concatted.node) == 'concat(n=3) <{}>'.format(concatted.node.short_hash) + assert repr(output.node) == 'output(filename={!r}) <{}>'.format('dummy2.mp4', output.node.short_hash) def test_stream_repr(): in_file = ffmpeg.input('dummy.mp4') - assert repr(in_file) == "input(filename={!r})[None] <{}>".format('dummy.mp4', in_file.node.short_hash) + assert repr(in_file) == 'input(filename={!r})[None] <{}>'.format('dummy.mp4', in_file.node.short_hash) split0 = in_file.filter_multi_output('split')[0] - assert repr(split0) == "split()[0] <{}>".format(split0.node.short_hash) + assert repr(split0) == 'split()[0] <{}>'.format(split0.node.short_hash) dummy_out = in_file.filter_multi_output('dummy')['out'] - assert repr(dummy_out) == "dummy()[{!r}] <{}>".format(dummy_out.label, dummy_out.node.short_hash) + assert repr(dummy_out) == 'dummy()[{!r}] <{}>'.format(dummy_out.label, dummy_out.node.short_hash) def test_get_args_simple(): @@ -146,21 +146,25 @@ def test_get_args_complex_filter(): '-y' ] + def _get_filter_with_select_example(): i = ffmpeg.input(TEST_INPUT_FILE1) - v1 = i[:"v"].hflip() - a1 = i[:"a"].filter_("aecho", 0.8, 0.9, 1000, 0.3) + v1 = i[:'v'].hflip() + a1 = i[:'a'].filter_('aecho', 0.8, 0.9, 1000, 0.3) return ffmpeg.output(a1, v1, TEST_OUTPUT_FILE1) + def test_filter_with_select(): - assert _get_filter_with_select_example().get_args() \ - == ['-i', TEST_INPUT_FILE1, - '-filter_complex', - '[0:a]aecho=0.8:0.9:1000:0.3[s0];' \ - '[0:v]hflip[s1]', - '-map', '[s0]', '-map', '[s1]', - TEST_OUTPUT_FILE1] + assert _get_filter_with_select_example().get_args() == [ + '-i', TEST_INPUT_FILE1, + '-filter_complex', + '[0:a]aecho=0.8:0.9:1000:0.3[s0];' \ + '[0:v]hflip[s1]', + '-map', '[s0]', '-map', '[s1]', + TEST_OUTPUT_FILE1 + ] + def test_map_same_effect_as_output(): i1 = ffmpeg.input(TEST_INPUT_FILE1) @@ -173,11 +177,13 @@ def test_map_same_effect_as_output(): assert id(o_map) != id(_o_map) # Checks immutability assert o_map.node.incoming_edge_map == o_nomap.node.incoming_edge_map - assert o_map.get_args() == o_nomap.get_args() == ['-i', TEST_INPUT_FILE1, - '-i', TEST_OVERLAY_FILE, - '-map', '[0]', - '-map', '[1]', - TEST_OUTPUT_FILE1] + assert o_map.get_args() == o_nomap.get_args() == [ + '-i', TEST_INPUT_FILE1, + '-i', TEST_OVERLAY_FILE, + '-map', '[0]', + '-map', '[1]', + TEST_OUTPUT_FILE1 + ] def _get_complex_filter_asplit_example(): @@ -191,8 +197,8 @@ def _get_complex_filter_asplit_example(): return (ffmpeg .concat( - split0.filter_("atrim", start=10, end=20), - split1.filter_("atrim", start=30, end=40), + split0.filter_('atrim', start=10, end=20), + split1.filter_('atrim', start=30, end=40), ) .output(TEST_OUTPUT_FILE1) .overwrite_output() From 57abf6e86edbf1d9ff1448302d4c8bf970092a03 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Sun, 11 Mar 2018 21:27:26 -0700 Subject: [PATCH 37/39] Change selector syntax from `[:a]` to `[a]`; remove `map` operator (for now) --- ffmpeg/_ffmpeg.py | 19 +---- ffmpeg/dag.py | 16 +--- ffmpeg/nodes.py | 162 ++++++++---------------------------- ffmpeg/tests/test_ffmpeg.py | 47 ++++------- 4 files changed, 57 insertions(+), 187 deletions(-) diff --git a/ffmpeg/_ffmpeg.py b/ffmpeg/_ffmpeg.py index 8d67a3f..1e7690e 100644 --- a/ffmpeg/_ffmpeg.py +++ b/ffmpeg/_ffmpeg.py @@ -9,7 +9,7 @@ from .nodes import ( MergeOutputsNode, OutputNode, output_operator, - OutputStream) +) def input(filename, **kwargs): @@ -68,26 +68,9 @@ def output(*streams_and_filename, **kwargs): return OutputNode(streams, output.__name__, kwargs=kwargs).stream() -@output_operator() -def map(*streams): - """Map multiple streams to the same output - """ - head = streams[0] - tail = streams[1:] - - if not isinstance(head, OutputStream): - raise ValueError('First argument must be an output stream') - - if not tail: - return head - - return OutputNode(head.node, tail).stream() - - __all__ = [ 'input', 'merge_outputs', 'output', - 'map', 'overwrite_output', ] diff --git a/ffmpeg/dag.py b/ffmpeg/dag.py index 7dc02f6..335a060 100644 --- a/ffmpeg/dag.py +++ b/ffmpeg/dag.py @@ -76,10 +76,7 @@ DagEdge = namedtuple('DagEdge', ['downstream_node', 'downstream_label', 'upstrea def get_incoming_edges(downstream_node, incoming_edge_map): edges = [] for downstream_label, upstream_info in incoming_edge_map.items(): - # `upstream_info` may contain the upstream_selector. [:2] trims it away - upstream_node, upstream_label = upstream_info[:2] - # Take into account the stream selector if it's present (i.e. len(upstream_info) >= 3) - upstream_selector = None if len(upstream_info) < 3 else upstream_info[2] + upstream_node, upstream_label, upstream_selector = upstream_info edges += [DagEdge(downstream_node, downstream_label, upstream_node, upstream_label, upstream_selector)] return edges @@ -88,10 +85,7 @@ def get_outgoing_edges(upstream_node, outgoing_edge_map): edges = [] for upstream_label, downstream_infos in list(outgoing_edge_map.items()): for downstream_info in downstream_infos: - # `downstream_info` may contain the downstream_selector. [:2] trims it away - downstream_node, downstream_label = downstream_info[:2] - # Take into account the stream selector if it's present - downstream_selector = None if len(downstream_info) < 3 else downstream_info[2] + downstream_node, downstream_label, downstream_selector = downstream_info edges += [DagEdge(downstream_node, downstream_label, upstream_node, upstream_label, downstream_selector)] return edges @@ -104,10 +98,8 @@ class KwargReprNode(DagNode): def __upstream_hashes(self): hashes = [] for downstream_label, upstream_info in self.incoming_edge_map.items(): - # `upstream_info` may contain the upstream_selector. [:2] trims it away - upstream_node, upstream_label = upstream_info[:2] - # The stream selector is discarded when calculating the hash: the stream "as a whole" is still the same - hashes += [hash(x) for x in [downstream_label, upstream_node, upstream_label]] + upstream_node, upstream_label, upstream_selector = upstream_info + hashes += [hash(x) for x in [downstream_label, upstream_node, upstream_label, upstream_selector]] return hashes @property diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index 184f2ff..c809cb9 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals + from .dag import KwargReprNode from ._utils import escape_chars, get_hash_int from builtins import object -import os, sys -import inspect +import os def _is_of_types(obj, types): @@ -19,13 +19,6 @@ def _get_types_str(types): return ', '.join(['{}.{}'.format(x.__module__, x.__name__) for x in types]) -def _get_arg_count(callable): - if sys.version_info.major >= 3: - return len(inspect.getfullargspec(callable).args) - else: - return len(inspect.getargspec(callable).args) - - class Stream(object): """Represents the outgoing edge of an upstream node; may be used to create more downstream nodes.""" @@ -37,7 +30,6 @@ class Stream(object): self.label = upstream_label self.selector = upstream_selector - def __hash__(self): return get_hash_int([hash(self.node), hash(self.label)]) @@ -54,14 +46,22 @@ class Stream(object): def __getitem__(self, index): """ - Select a component of the stream. `stream[:X]` is analogous to `stream.node.stream(select=X)`. - Please note that this can only be used to select a substream that already exist. If you want to split - the stream, use the `split` filter. - """ - if not isinstance(index, slice) or index.start is not None: - raise ValueError("Invalid syntax. Use `stream[:\'something\']`, not `stream[\'something\']`.") + Select a component (audio, video) of the stream. - return self.node.stream(select=index.stop) + Example: + + Process the audio and video portions of a stream independently:: + + in = ffmpeg.input('in.mp4') + audio = in['a'].filter_("aecho", 0.8, 0.9, 1000, 0.3) + video = in['v'].hflip() + ffmpeg.output(audio, video, 'out.mp4') + """ + if self.selector is not None: + raise ValueError('Stream already has a selector: {}'.format(self)) + elif not isinstance(index, basestring): + raise TypeError("Expected string index (e.g. 'v'); got {!r}".format(index)) + return self.node.stream(label=self.label, selector=index) def get_stream_map(stream_spec): @@ -93,22 +93,6 @@ def get_stream_spec_nodes(stream_spec): class Node(KwargReprNode): """Node base""" - @property - def min_inputs(self): - return self.__min_inputs - - @property - def max_inputs(self): - return self.__max_inputs - - @property - def incoming_stream_types(self): - return self.__incoming_stream_types - - @property - def outgoing_stream_type(self): - return self.__outgoing_stream_type - @classmethod def __check_input_len(cls, stream_map, min_inputs, max_inputs): if min_inputs is not None and len(stream_map) < min_inputs: @@ -130,9 +114,8 @@ class Node(KwargReprNode): incoming_edge_map[downstream_label] = (upstream.node, upstream.label, upstream.selector) return incoming_edge_map - def __init_fromscratch__(self, stream_spec, name, incoming_stream_types, outgoing_stream_type, min_inputs, - max_inputs, args=[], - kwargs={}): + def __init__(self, stream_spec, name, incoming_stream_types, outgoing_stream_type, min_inputs, + max_inputs, args=[], kwargs={}): stream_map = get_stream_map(stream_spec) self.__check_input_len(stream_map, min_inputs, max_inputs) self.__check_input_types(stream_map, incoming_stream_types) @@ -141,92 +124,21 @@ class Node(KwargReprNode): super(Node, self).__init__(incoming_edge_map, name, args, kwargs) self.__outgoing_stream_type = outgoing_stream_type self.__incoming_stream_types = incoming_stream_types - self.__min_inputs = min_inputs - self.__max_inputs = max_inputs - def __init_fromnode__(self, old_node, stream_spec): - # Make sure old node and new node are of the same type - if type(self) != type(old_node): - raise TypeError('`old_node` should be of type {}'.format(self.__class__.__name__)) - - # Copy needed data from old node - name = old_node.name - incoming_stream_types = old_node.incoming_stream_types - outgoing_stream_type = old_node.outgoing_stream_type - min_inputs = old_node.min_inputs - max_inputs = old_node.max_inputs - prev_edges = old_node.incoming_edge_map.values() - args = old_node.args - kwargs = old_node.kwargs - - # Check new stream spec - the old spec should have already been checked - new_stream_map = get_stream_map(stream_spec) - self.__check_input_types(new_stream_map, incoming_stream_types) - - # Generate new edge map - new_inc_edge_map = self.__get_incoming_edge_map(new_stream_map) - new_edges = new_inc_edge_map.values() - - # Rename all edges - new_edge_map = dict(enumerate(list(prev_edges) + list(new_edges))) - - # Check new length - self.__check_input_len(new_edge_map, min_inputs, max_inputs) - - super(Node, self).__init__(new_edge_map, name, args, kwargs) - self.__outgoing_stream_type = outgoing_stream_type - self.__incoming_stream_types = incoming_stream_types - self.__min_inputs = min_inputs - self.__max_inputs = max_inputs - - # noinspection PyMissingConstructor - def __init__(self, *args, **kwargs): - """ - If called with the following arguments, the new Node is created from scratch: - - stream_spec, name, incoming_stream_types, outgoing_stream_type, min_inputs, max_inputs, args=[], kwargs={} - - If called with the following arguments, the new node is a copy of `old_node` that includes the additional - `stream_spec`: - - old_node, stream_spec - """ - # Python doesn't support constructor overloading. This hacky code detects how we want to construct the object - # based on the number of arguments and the type of the first argument, then calls the appropriate constructor - # helper method - - # "1+" is for `self` - argc = 1 + len(args) + len(kwargs) - - first_arg = None - if 'old_node' in kwargs: - first_arg = kwargs['old_node'] - elif len(args) > 0: - first_arg = args[0] - - if argc == _get_arg_count(self.__init_fromnode__) and type(first_arg) == type(self): - self.__init_fromnode__(*args, **kwargs) - else: - if isinstance(first_arg, Node): - raise ValueError( - '{}.__init__() received an instance of {} as the first argument. If you want to create a ' - 'copy of an existing node, the types must match and you must provide an additional stream_spec.' - .format(self.__class__.__name__, first_arg.__class__.__name__) - ) - self.__init_fromscratch__(*args, **kwargs) - - def stream(self, label=None, select=None): + def stream(self, label=None, selector=None): """Create an outgoing stream originating from this node. More nodes may be attached onto the outgoing stream. """ - return self.__outgoing_stream_type(self, label, upstream_selector=select) + return self.__outgoing_stream_type(self, label, upstream_selector=selector) def __getitem__(self, item): """Create an outgoing stream originating from this node; syntactic sugar for ``self.stream(label)``. It can also be used to apply a selector: e.g. ``node[0:'audio']`` returns a stream with label 0 and - selector ``'audio'``, which is the same as ``node.stream(label=0, select='audio')``. + selector ``'audio'``, which is the same as ``node.stream(label=0, selector='audio')``. """ if isinstance(item, slice): - return self.stream(label=item.start, select=item.stop) + return self.stream(label=item.start, selector=item.stop) else: return self.stream(label=item) @@ -241,8 +153,8 @@ class FilterableStream(Stream): class InputNode(Node): """InputNode type""" - def __init_fromscratch__(self, name, args=[], kwargs={}): - super(InputNode, self).__init_fromscratch__( + def __init__(self, name, args=[], kwargs={}): + super(InputNode, self).__init__( stream_spec=None, name=name, incoming_stream_types={}, @@ -253,9 +165,6 @@ class InputNode(Node): kwargs=kwargs ) - def __init_fromnode__(self, old_node, stream_spec): - raise TypeError("{} can't be constructed from an existing node".format(self.__class__.__name__)) - @property def short_repr(self): return os.path.basename(self.kwargs['filename']) @@ -263,8 +172,8 @@ class InputNode(Node): # noinspection PyMethodOverriding class FilterNode(Node): - def __init_fromscratch__(self, stream_spec, name, max_inputs=1, args=[], kwargs={}): - super(FilterNode, self).__init_fromscratch__( + def __init__(self, stream_spec, name, max_inputs=1, args=[], kwargs={}): + super(FilterNode, self).__init__( stream_spec=stream_spec, name=name, incoming_stream_types={FilterableStream}, @@ -303,13 +212,13 @@ class FilterNode(Node): # noinspection PyMethodOverriding class OutputNode(Node): - def __init_fromscratch__(self, stream, name, args=[], kwargs={}): - super(OutputNode, self).__init_fromscratch__( + def __init__(self, stream, name, args=[], kwargs={}): + super(OutputNode, self).__init__( stream_spec=stream, name=name, incoming_stream_types={FilterableStream}, outgoing_stream_type=OutputStream, - min_inputs=0, # Allow streams to be mapped afterwards + min_inputs=1, max_inputs=None, args=args, kwargs=kwargs @@ -328,8 +237,8 @@ class OutputStream(Stream): # noinspection PyMethodOverriding class MergeOutputsNode(Node): - def __init_fromscratch__(self, streams, name): - super(MergeOutputsNode, self).__init_fromscratch__( + def __init__(self, streams, name): + super(MergeOutputsNode, self).__init__( stream_spec=streams, name=name, incoming_stream_types={OutputStream}, @@ -341,8 +250,8 @@ class MergeOutputsNode(Node): # noinspection PyMethodOverriding class GlobalNode(Node): - def __init_fromscratch__(self, stream, name, args=[], kwargs={}): - super(GlobalNode, self).__init_fromscratch__( + def __init__(self, stream, name, args=[], kwargs={}): + super(GlobalNode, self).__init__( stream_spec=stream, name=name, incoming_stream_types={OutputStream}, @@ -353,9 +262,6 @@ class GlobalNode(Node): kwargs=kwargs ) - def __init_fromnode__(self, old_node, stream_spec): - raise TypeError("{} can't be constructed from an existing node".format(self.__class__.__name__)) - def stream_operator(stream_classes={Stream}, name=None): def decorator(func): diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 4bc3d0e..0457acf 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -147,16 +147,25 @@ def test_get_args_complex_filter(): ] -def _get_filter_with_select_example(): +def test_combined_output(): + i1 = ffmpeg.input(TEST_INPUT_FILE1) + i2 = ffmpeg.input(TEST_OVERLAY_FILE) + out = ffmpeg.output(i1, i2, TEST_OUTPUT_FILE1) + assert out.get_args() == [ + '-i', TEST_INPUT_FILE1, + '-i', TEST_OVERLAY_FILE, + '-map', '[0]', + '-map', '[1]', + TEST_OUTPUT_FILE1 + ] + + +def test_filter_with_selector(): i = ffmpeg.input(TEST_INPUT_FILE1) - v1 = i[:'v'].hflip() - a1 = i[:'a'].filter_('aecho', 0.8, 0.9, 1000, 0.3) - - return ffmpeg.output(a1, v1, TEST_OUTPUT_FILE1) - - -def test_filter_with_select(): - assert _get_filter_with_select_example().get_args() == [ + v1 = i['v'].hflip() + a1 = i['a'].filter_('aecho', 0.8, 0.9, 1000, 0.3) + out = ffmpeg.output(a1, v1, TEST_OUTPUT_FILE1) + assert out.get_args() == [ '-i', TEST_INPUT_FILE1, '-filter_complex', '[0:a]aecho=0.8:0.9:1000:0.3[s0];' \ @@ -166,26 +175,6 @@ def test_filter_with_select(): ] -def test_map_same_effect_as_output(): - i1 = ffmpeg.input(TEST_INPUT_FILE1) - i2 = ffmpeg.input(TEST_OVERLAY_FILE) - - _o_map = i1.output(TEST_OUTPUT_FILE1) - o_map = _o_map.map(i2) - - o_nomap = ffmpeg.output(i1, i2, TEST_OUTPUT_FILE1) - - assert id(o_map) != id(_o_map) # Checks immutability - assert o_map.node.incoming_edge_map == o_nomap.node.incoming_edge_map - assert o_map.get_args() == o_nomap.get_args() == [ - '-i', TEST_INPUT_FILE1, - '-i', TEST_OVERLAY_FILE, - '-map', '[0]', - '-map', '[1]', - TEST_OUTPUT_FILE1 - ] - - def _get_complex_filter_asplit_example(): split = (ffmpeg .input(TEST_INPUT_FILE1) From 1e63419a9385b5382f4a6c1814401b371f382ca0 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Sun, 11 Mar 2018 21:33:32 -0700 Subject: [PATCH 38/39] Test bad stream selectors --- ffmpeg/nodes.py | 10 +++++----- ffmpeg/tests/test_ffmpeg.py | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index c809cb9..f59b3eb 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -52,15 +52,15 @@ class Stream(object): Process the audio and video portions of a stream independently:: - in = ffmpeg.input('in.mp4') - audio = in['a'].filter_("aecho", 0.8, 0.9, 1000, 0.3) - video = in['v'].hflip() - ffmpeg.output(audio, video, 'out.mp4') + input = ffmpeg.input('in.mp4') + audio = input['a'].filter_("aecho", 0.8, 0.9, 1000, 0.3) + video = input['v'].hflip() + out = ffmpeg.output(audio, video, 'out.mp4') """ if self.selector is not None: raise ValueError('Stream already has a selector: {}'.format(self)) elif not isinstance(index, basestring): - raise TypeError("Expected string index (e.g. 'v'); got {!r}".format(index)) + raise TypeError("Expected string index (e.g. 'a'); got {!r}".format(index)) return self.node.stream(label=self.label, selector=index) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 0457acf..2312552 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -175,6 +175,22 @@ def test_filter_with_selector(): ] +def test_filter_with_bad_selectors(): + input = ffmpeg.input(TEST_INPUT_FILE1) + + with pytest.raises(ValueError) as excinfo: + input['a']['a'] + assert str(excinfo.value).startswith('Stream already has a selector:') + + with pytest.raises(TypeError) as excinfo: + input[:'a'] + assert str(excinfo.value).startswith("Expected string index (e.g. 'a')") + + with pytest.raises(TypeError) as excinfo: + input[5] + assert str(excinfo.value).startswith("Expected string index (e.g. 'a')") + + def _get_complex_filter_asplit_example(): split = (ffmpeg .input(TEST_INPUT_FILE1) From c162eab2a9d4af50653d460cf2ed30eff00f4475 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Wed, 9 May 2018 01:26:28 -0500 Subject: [PATCH 39/39] Update docs --- ffmpeg/nodes.py | 17 ++++++++++++----- ffmpeg/tests/test_ffmpeg.py | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index f59b3eb..e861822 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -49,12 +49,11 @@ class Stream(object): Select a component (audio, video) of the stream. Example: - Process the audio and video portions of a stream independently:: input = ffmpeg.input('in.mp4') - audio = input['a'].filter_("aecho", 0.8, 0.9, 1000, 0.3) - video = input['v'].hflip() + audio = input[:'a'].filter_("aecho", 0.8, 0.9, 1000, 0.3) + video = input[:'v'].hflip() out = ffmpeg.output(audio, video, 'out.mp4') """ if self.selector is not None: @@ -134,8 +133,16 @@ class Node(KwargReprNode): def __getitem__(self, item): """Create an outgoing stream originating from this node; syntactic sugar for ``self.stream(label)``. - It can also be used to apply a selector: e.g. ``node[0:'audio']`` returns a stream with label 0 and - selector ``'audio'``, which is the same as ``node.stream(label=0, selector='audio')``. + It can also be used to apply a selector: e.g. ``node[0:'a']`` returns a stream with label 0 and + selector ``'a'``, which is the same as ``node.stream(label=0, selector='a')``. + + Example: + Process the audio and video portions of a stream independently:: + + input = ffmpeg.input('in.mp4') + audio = input[:'a'].filter_("aecho", 0.8, 0.9, 1000, 0.3) + video = input[:'v'].hflip() + out = ffmpeg.output(audio, video, 'out.mp4') """ if isinstance(item, slice): return self.stream(label=item.start, selector=item.stop) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 2312552..b59fa88 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -175,7 +175,7 @@ def test_filter_with_selector(): ] -def test_filter_with_bad_selectors(): +def test_get_item_with_bad_selectors(): input = ffmpeg.input(TEST_INPUT_FILE1) with pytest.raises(ValueError) as excinfo: