Update emotion.py

emotion.py

@@ -8,6 +8,9 @@ from PIL import Image
 
 import cv2
 import mediapipe as mp
+from mediapipe.tasks import python
+from mediapipe.tasks.python import vision
+
 
 from deepface import DeepFace
 
@@ -28,11 +31,22 @@ ALIGN_FACE = True               # 保留參數（這版 ROI 已是人臉）
 
 
 # =========================
-# MediaPipe Face Detection（白框 + 紅點 keypoints）
+# MediaPipe Tasks Face Detector
 # =========================
-_mp_face = mp.solutions.face_detection
-_FACE_DET = _mp_face.FaceDetection(model_selection=0, min_detection_confidence=0.5)
-# model_selection=0 偏短距離偵測（接近 blaze_face_short_range）
+BaseOptions = python.BaseOptions
+FaceDetector = vision.FaceDetector
+FaceDetectorOptions = vision.FaceDetectorOptions
+VisionRunningMode = vision.RunningMode
+
+_face_detector = FaceDetector.create_from_options(
+    FaceDetectorOptions(
+        base_options=BaseOptions(
+            model_asset_path="blaze_face_short_range.tflite"
+        ),
+        running_mode=VisionRunningMode.IMAGE,
+    )
+)
+
 
 
 # =========================
@@ -196,70 +210,68 @@ def _zoom_center(frame: np.ndarray, zoom: float) -> np.ndarray:
     return cropped
 
 
-# =========================
-# MediaPipe：偵測臉 + 畫白框/紅點
-# =========================
-def _mp_detect_draw_bbox_kp_largest(frame_rgb: np.ndarray):
+def mp_tasks_detect_and_draw(frame_rgb: np.ndarray):
     """
-    最大臉策略：
-    - 多人入鏡：挑 bbox 面積最大者
-    回傳：
-      drawn_rgb：有臉就畫白框+紅點；沒臉回原圖
-      bbox_px： (x, y, w, h) pixel；沒臉則 None
+    使用 MediaPipe Tasks
+    - 有臉：畫白框 + 紅色 keypoints
+    - 回傳 bbox (x,y,w,h)
     """
-    if frame_rgb is None:
-        return frame_rgb, None
-
     h, w = frame_rgb.shape[:2]
-    res = _FACE_DET.process(frame_rgb)  # MediaPipe 吃 RGB
 
-    if not res.detections:
+    mp_image = mp.Image(
+        image_format=mp.ImageFormat.SRGB,
+        data=frame_rgb
+    )
+
+    result = _face_detector.detect(mp_image)
+
+    if not result.detections:
         return frame_rgb, None
 
+    # 取「最大臉」
     best_det = None
     best_area = -1
     best_bbox = None
 
-    # 逐個算 bbox 面積，挑最大
-    for det in res.detections:
-        loc = det.location_data
-        rbb = loc.relative_bounding_box
-        x = int(rbb.xmin * w)
-        y = int(rbb.ymin * h)
-        bw = int(rbb.width * w)
-        bh = int(rbb.height * h)
-
-        # clamp
-        x = max(0, min(w - 1, x))
-        y = max(0, min(h - 1, y))
-        bw = max(1, min(w - x, bw))
-        bh = max(1, min(h - y, bh))
-
-        area = bw * bh
+    for det in result.detections:
+        bbox = det.bounding_box
+        area = bbox.width * bbox.height
         if area > best_area:
             best_area = area
             best_det = det
-            best_bbox = (x, y, bw, bh)
+            best_bbox = bbox
 
-    if best_det is None or best_bbox is None:
-        return frame_rgb, None
+    lx = int(best_bbox.origin_x)
+    ly = int(best_bbox.origin_y)
+    bw = int(best_bbox.width)
+    bh = int(best_bbox.height)
 
-    x, y, bw, bh = best_bbox
-    loc = best_det.location_data
+    # clamp
+    lx = max(0, min(w - 1, lx))
+    ly = max(0, min(h - 1, ly))
+    bw = max(1, min(w - lx, bw))
+    bh = max(1, min(h - ly, bh))
 
     bgr = cv2.cvtColor(frame_rgb, cv2.COLOR_RGB2BGR)
 
-    # 白框
-    cv2.rectangle(bgr, (x, y), (x + bw, y + bh), (255, 255, 255), 3)
+    # 白色框
+    cv2.rectangle(
+        bgr,
+        (lx, ly),
+        (lx + bw, ly + bh),
+        (255, 255, 255),
+        3
+    )
 
-    # 紅點（五官特徵點）
-    for kp in loc.relative_keypoints:
+    # 紅色五官點
+    for kp in best_det.keypoints:
         cx = int(kp.x * w)
         cy = int(kp.y * h)
         cv2.circle(bgr, (cx, cy), 6, (0, 0, 255), -1)
 
     drawn = cv2.cvtColor(bgr, cv2.COLOR_BGR2RGB)
-    return drawn, (x, y, bw, bh)
+    return drawn, (lx, ly, bw, bh)
+
 
 
 def _reset_state_for_camera(st: AppState) -> AppState:
@@ -321,8 +333,8 @@ def on_stream(frame_rgb: np.ndarray, st: AppState):
     frame_rgb = _zoom_center(frame_rgb, ZOOM_FACTOR)
 
     # 每一幀先偵測臉：有臉才畫框/紅點
-    frame_drawn, bbox_px = _mp_detect_draw_bbox_kp_largest(frame_rgb)
-
+    frame_drawn, bbox_px = mp_tasks_detect_and_draw(frame_rgb)
+    
     # 沒有人臉：不畫框/點，並提醒
     if bbox_px is None:
         return (