Update emotion.py

emotion.py

@@ -18,7 +18,7 @@ from deepface import DeepFace
 # =========================
 # 參數（可微調）
 # =========================
-ANALYZE_EVERY_SEC = 1.5          # ⭐ 建議 1.5~2.0：HF CPU 比較順
+ANALYZE_EVERY_SEC = 2.0          # ⭐ 建議 1.5~2.0：HF CPU 比較順
 EMA_ALPHA = 0.45
 CONF_TH = 40.0                   # DeepFace emotion confidence 門檻
 SWITCH_CONFIRM_SEC = 2.5         # 連續穩定多久才算完成
@@ -328,18 +328,46 @@ def _analyze_worker():
     _ANALYZE_THREAD = None
 
 
+def _resize_letterbox_rgb(img: np.ndarray, size: int = 224) -> np.ndarray:
+    """
+    把 ROI 變成 size×size，保持比例，用黑邊補滿（letterbox）。
+    好處：不會把臉拉伸變形，對情緒分類通常更穩。
+    """
+    img = _to_rgb_uint8(img)
+    h, w = img.shape[:2]
+    if h <= 0 or w <= 0:
+        return img
+
+    scale = size / max(h, w)
+    nh, nw = int(h * scale), int(w * scale)
+    nh = max(1, nh)
+    nw = max(1, nw)
+
+    resized = cv2.resize(img, (nw, nh), interpolation=cv2.INTER_AREA)
+
+    out = np.zeros((size, size, 3), dtype=np.uint8)
+    y0 = (size - nh) // 2
+    x0 = (size - nw) // 2
+    out[y0:y0+nh, x0:x0+nw] = resized
+    return out
+
+
 def _enqueue_analyze(face_roi: np.ndarray):
     """把最新 ROI 丟給背景 thread，若 thread 沒在跑就啟動。"""
     global _PENDING_FACE, _ANALYZE_THREAD
 
+    # ✅ 這行是你要的：先把 ROI 縮到固定大小（224×224）
+    face_small = _resize_letterbox_rgb(face_roi, size=224)
+
     with _ANALYZE_LOCK:
-        _PENDING_FACE = face_roi
+        _PENDING_FACE = face_small
 
     if _ANALYZE_THREAD is None:
         _ANALYZE_THREAD = threading.Thread(target=_analyze_worker, daemon=True)
         _ANALYZE_THREAD.start()
 
 
+
 # =========================
 # state helper
 # =========================