fixed video_io transpose & rotate options

tikuma-lsuhsc · tikuma-lsuhsc · commit 34bd7fa6f6f2 · 2021-05-01T21:23:55.000-05:00
diff --git a/src/ffmpegio/configure.py b/src/ffmpegio/configure.py
@@ -846,23 +846,25 @@ def video_stream(
             vfilters.append("vflip")
 
     transpose = stream_opts.get("transpose", None)
-    if transpose:
-        vfilters.append(("transpose", transpose % 8))
-
-    rot = stream_opts.get("rotate", None)
-    if rot:
-        w, h = utils.get_rotated_shape(w, h, rot)
+    if transpose is not None:
+        vfilters.append(("transpose", transpose))
+        if h > w or (isinstance(transpose, int) and transpose < 4):
+            w, h = h, w
+            # 4-7, the transposition is only done if the input video geometry is portrait and not landscape
+
+    rotdeg = stream_opts.get("rotate", None)
+    if rotdeg:
+        w, h, rot = utils.get_rotated_shape(w, h, rotdeg)
         vfilters.append(("rotate", rot, w, h, {"c": bg_color}))
 
     size = stream_opts.get("size", None)
     scale = stream_opts.get("scale", None)
     if size or scale:
         if size:
-            if size[0] <= 0:
-                size[0] = size[1] * w / h
-            elif size[1] <= 0:
-                size[1] = size[0] * h / w
-            w, h = size
+            w, h = (
+                size[1] * w / h if size[0] <= 0 else size[0],
+                size[0] * h / w if size[1] <= 0 else size[1],
+            )
         else:
             sep = isinstance(scale, Sequence)
             w *= scale[0] if sep else scale
diff --git a/src/ffmpegio/utils.py b/src/ffmpegio/utils.py
@@ -172,7 +172,7 @@ def get_rotated_shape(w, h, deg):
     C = np.cos(theta)
     S = np.sin(theta)
     X = np.matmul([[C, -S], [S, C]], [[w, w, 0.0], [0.0, h, h]])
-    return int(round(abs(X[0, 0] - X[0, 2]))), int(round(abs(X[1, 1])))
+    return int(round(abs(X[0, 0] - X[0, 2]))), int(round(abs(X[1, 1]))), theta
 
 
 def get_audio_format(fmt):
diff --git a/tests/test_image.py b/tests/test_image.py
@@ -72,4 +72,28 @@ def test_read_write():
     # plt.show()
 
 
-# test_read_write()
+# test_read_write()
+
+if __name__ == "__main__":
+
+    from matplotlib import pyplot as plt
+    import logging
+
+    # logging.basicConfig(level=logging.DEBUG)
+
+    IM = image.read(
+        "tests/assets/ffmpeg-logo.png",
+        # crop=(0, 0, 200, 0),
+        # rotate=30,
+        pix_fmt='rgb24',
+        fill_color="blue",
+        transpose=0,
+        size=(200,-1)
+    )
+    print(IM.shape)
+
+    plt.figure(figsize=(IM.shape[1] / 96, IM.shape[0] / 96))
+    plt.imshow(IM)
+    plt.gca().set_position((0, 0, 1, 1))
+    # plt.axis('off')
+    plt.show()
