Update deforum_warp.py

deforum_warp.py

@@ -12,8 +12,8 @@ def get_border(mode):
 
 def anim_frame_warp(prev_img, angle, zoom, tx, ty, border_mode):
     """
-    True Deforum 2D Perspective Warp.
-    Simulates camera movement rather than just image scaling.
+    True Perspective/Homography Warp.
+    Simulates camera movement (FOV) via Matrix math.
     """
     if prev_img is None: return None
     
@@ -21,16 +21,14 @@ def anim_frame_warp(prev_img, angle, zoom, tx, ty, border_mode):
     height, width = cv_img.shape[:2]
     center_x, center_y = width // 2, height // 2
     
-    # 1. Initialize Identity Matrix (3x3 for Perspective)
+    # 1. Initialize 3x3 Identity
     matrix = np.identity(3)
     
-    # 2. Apply Translation (Pan X/Y)
-    # We move the image opposite to the camera movement
+    # 2. Translation (Pan)
     matrix[0, 2] = tx
     matrix[1, 2] = ty
     
-    # 3. Apply Rotation (Angle)
-    # Convert degrees to radians
+    # 3. Rotation
     rot_rad = np.radians(angle)
     rot_mat = np.identity(3)
     rot_mat[0, 0] = np.cos(rot_rad)
@@ -38,42 +36,29 @@ def anim_frame_warp(prev_img, angle, zoom, tx, ty, border_mode):
     rot_mat[1, 0] = np.sin(rot_rad)
     rot_mat[1, 1] = np.cos(rot_rad)
     
-    # Rotate around center: Translate to origin -> Rotate -> Translate back
+    # Center Offset
     center_mat = np.identity(3)
     center_mat[0, 2] = -center_x
     center_mat[1, 2] = -center_y
+    inv_center = np.identity(3)
+    inv_center[0, 2] = center_x
+    inv_center[1, 2] = center_y
     
-    inv_center_mat = np.identity(3)
-    inv_center_mat[0, 2] = center_x
-    inv_center_mat[1, 2] = center_y
-    
-    matrix = inv_center_mat @ rot_mat @ center_mat @ matrix
-    
-    # 4. Apply Zoom (Scale)
-    # Deforum Zoom is actually scaling around center
-    # Zoom 1.0 = No change. Zoom 1.1 = Move closer (Image gets bigger)
-    scale_x = zoom
-    scale_y = zoom
+    # Apply Rotation around center
+    matrix = inv_center @ rot_mat @ center_mat @ matrix
     
+    # 4. Zoom (Scale)
     scale_mat = np.identity(3)
-    scale_mat[0, 0] = scale_x
-    scale_mat[1, 1] = scale_y
-    
-    # Scale around center
-    matrix = inv_center_mat @ scale_mat @ center_mat @ matrix
+    scale_mat[0, 0] = zoom
+    scale_mat[1, 1] = zoom
     
-    # 5. Perform Perspective Warp (Homography)
-    # Use WARP_INVERSE_MAP effectively by applying the matrix directly? 
-    # Standard cv2.warpPerspective applies the transformation matrix.
-    # Deforum usually applies the inverse to simulate camera move vs object move.
-    # Here we stick to direct application for WYSIWYG results.
+    # Apply Scale around center
+    matrix = inv_center @ scale_mat @ center_mat @ matrix
     
-    # Note: cv2.warpPerspective expects a 3x3 matrix
+    # 5. Warp Perspective
     result = cv2.warpPerspective(
-        cv_img, 
-        matrix, 
-        (width, height), 
-        borderMode=get_border(border_mode),
+        cv_img, matrix, (width, height), 
+        borderMode=get_border(border_mode), 
         flags=cv2.INTER_LINEAR
     )