FFmpegProcessor.crop() fails with non-overlapping cropping area.

eseifert · Aug 6, 2018 · a3c4cbd · a3c4cbd
1 parent 15a0bdb
commit a3c4cbd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/madam/ffmpeg.py b/madam/ffmpeg.py
@@ -419,6 +419,14 @@ def crop(self, asset, x, y, width, height):
         if x == 0 and y == 0 and width == asset.width and height == asset.height:
             return asset
 
+        max_x = max(0, min(asset.width, width + x))
+        max_y = max(0, min(asset.height, height + y))
+        min_x = max(0, min(asset.width, x))
+        min_y = max(0, min(asset.height, y))
+
+        if min_x == asset.width or min_y == asset.height or max_x <= min_x or max_y <= min_y:
+            raise OperatorError('Invalid cropping area: <x=%r, y=%r, width=%r, height=%r>' % (x, y, width, height))
+
         return None
 
 

diff --git a/tests/test_video.py b/tests/test_video.py
@@ -236,3 +236,14 @@ def test_crop_with_original_dimensions_returns_identical_asset(self, processor,
         cropped_asset = crop_operator(video_asset)
 
         assert cropped_asset is video_asset
+
+    @pytest.mark.parametrize('x, y, width, height', [
+        (-DEFAULT_WIDTH, -DEFAULT_HEIGHT, DEFAULT_WIDTH, DEFAULT_HEIGHT),
+        (DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_WIDTH, DEFAULT_HEIGHT),
+        (0, 0, -DEFAULT_WIDTH, -DEFAULT_HEIGHT),
+    ])
+    def test_crop_fails_with_non_overlapping_cropping_area(self, processor, video_asset, x, y, width, height):
+        crop_operator = processor.crop(x=x, y=y, width=width, height=height)
+
+        with pytest.raises(OperatorError):
+            crop_operator(video_asset)