From 00fb91a4c52332e38a12b1447b1a2f9552b39b68 Mon Sep 17 00:00:00 2001 From: Noah Stier Date: Thu, 5 Oct 2017 23:45:43 -0700 Subject: [PATCH 01/16] 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 84849ea814f867b70eef1566c25d3802407aaf78 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 21:12:11 -0700 Subject: [PATCH 02/16] 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 8a9302677331b161fbaa6b0a75b8e36acbf8af0f Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 21:12:29 -0700 Subject: [PATCH 03/16] 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 e04d5e4e9d865a67123a8ff0d021eee25650e906 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 22:41:55 -0700 Subject: [PATCH 04/16] 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 f729fbaec78b5eda227989d22c1155a991b50330 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:05:23 -0700 Subject: [PATCH 05/16] 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 38079c3d04c4b88d4845daeb35b844170c9fea7a Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:06:16 -0700 Subject: [PATCH 06/16] 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 c3a9e84eef4dc3870aed912535c976f862cca870 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:06:26 -0700 Subject: [PATCH 07/16] 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 13cee5ee30fdd5ff7b86f1fecbee880f7cdd68d5 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:07:09 -0700 Subject: [PATCH 08/16] 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 becc50672d1b27f38a9ce4efdc07cae9c13ce341 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:08:01 -0700 Subject: [PATCH 09/16] 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 e8daf8e61a40bbaa8f99454a1e72cd89f4667caa Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:11:03 -0700 Subject: [PATCH 10/16] 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 930ebfc15876532c4e5ead055ec33b401f8a880a Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:24:38 -0700 Subject: [PATCH 11/16] 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 e212c354f1749446c06e7db388b15bf498f13be8 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:37:53 -0700 Subject: [PATCH 12/16] 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 f1607d31f7ecad8ff7d0ec2e536ce3861866ba89 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:41:01 -0700 Subject: [PATCH 13/16] 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 a30db324d37a226f96b39f830ed6e2e72a1c9d88 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:42:16 -0700 Subject: [PATCH 14/16] 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 74f0eabf52aea9e1f2034b8f352125e4de4c6efc Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:45:53 -0700 Subject: [PATCH 15/16] 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 697808d7434ad9fd5188854c0a65c9cbb2cd4217 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Fri, 3 Nov 2017 23:46:50 -0700 Subject: [PATCH 16/16] 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.