fixed aspect ratio bug

perception_roi_server.py

@@ -215,6 +215,22 @@ def _ensure_even(v: int, min_v: int = 64) -> int:
     return v - (v % 2)
 
 
+def _fit_aspect(w: int, h: int, target_w: int, target_h: int) -> Optional[List[int]]:
+    if w <= 0 or h <= 0:
+        return None
+    if target_w and target_h:
+        scale = min(float(target_w) / float(w), float(target_h) / float(h))
+    elif target_w:
+        scale = float(target_w) / float(w)
+    elif target_h:
+        scale = float(target_h) / float(h)
+    else:
+        return None
+    if not math.isfinite(scale) or scale <= 0:
+        return None
+    return [int(w * scale), int(h * scale)]
+
+
 def _compute_target_params(w: int, h: int, fps: float, bandwidth_kbps: int, target_fps: int, target_w: int, target_h: int, scale: float):
     fps = max(1.0, float(fps or 1.0))
     budget = max(100, int(bandwidth_kbps or 1500))
@@ -222,8 +238,12 @@ def _compute_target_params(w: int, h: int, fps: float, bandwidth_kbps: int, targ
     base_kbps_orig = base_kbps_720p30 * (float(w) * float(h) * fps) / (1280.0 * 720.0 * 30.0)
     if not math.isfinite(base_kbps_orig) or base_kbps_orig <= 0:
         base_kbps_orig = base_kbps_720p30
-    if target_w and target_h:
-        tw, th = int(target_w), int(target_h)
+    if target_w or target_h:
+        fitted = _fit_aspect(w, h, int(target_w or 0), int(target_h or 0))
+        if fitted:
+            tw, th = fitted
+        else:
+            tw, th = int(target_w or w), int(target_h or h)
     else:
         scale = float(scale or 1.0)
         if scale < 0.1: