Update app.py

app.py

@@ -16,9 +16,10 @@ BALL_DIAMETER = 0.073  # meters (approx. cricket ball diameter)
 FRAME_RATE = 20  # Input video frame rate
 SLOW_MOTION_FACTOR = 3  # Adjusted for 20 FPS
 CONF_THRESHOLD = 0.25  # Confidence threshold for detection
-IMPACT_ZONE_Y = 0.85  # Fraction of frame height for impact zone
-PITCH_ZONE_Y = 0.75  # Fraction of frame height for pitch zone
-IMPACT_DELTA_Y = 50  # Pixels for detecting sudden y-position change
+IMPACT_ZONE_Y = 0.80  # Fraction of frame height for impact zone
+PITCH_ZONE_Y = 0.80  # Fraction of frame height for pitch zone
+IMPACT_DELTA_Y = 75  # Pixels for detecting sudden y-position change
+IMPACT_DELTA_X = 50  # Pixels for x-position stability
 
 def process_video(video_path):
     if not os.path.exists(video_path):
@@ -40,11 +41,15 @@ def process_video(video_path):
         detections = [det for det in results[0].boxes if det.cls == 0]  # Class 0 is cricketBall
         if len(detections) == 1:  # Only consider frames with exactly one detection
             x1, y1, x2, y2 = detections[0].xyxy[0].cpu().numpy()
-            ball_positions.append([(x1 + x2) / 2, (y1 + y2) / 2])
+            x_center = (x1 + x2) / 2
+            y_center = (y1 + y2) / 2
+            ball_positions.append([x_center, y_center])
             detection_frames.append(frame_count - 1)  # 0-based index
             cv2.rectangle(frame, (int(x1), int(y1)), (int(x2), int(y2)), (0, 255, 0), 2)
+            debug_log.append(f"Frame {frame_count}: 1 ball detection at (x: {x_center:.1f}, y: {y_center:.1f})")
+        else:
+            debug_log.append(f"Frame {frame_count}: {len(detections)} ball detections (ignored)")
         frames[-1] = frame
-        debug_log.append(f"Frame {frame_count}: {len(detections)} ball detections")
     cap.release()
 
     if not ball_positions:
@@ -64,28 +69,36 @@ def estimate_trajectory(ball_positions, detection_frames, frames):
     y_coords = [pos[1] for pos in ball_positions]
     times = np.array(detection_frames) / FRAME_RATE
 
-    # Pitch point: first valid detection or when y exceeds PITCH_ZONE_Y
+    # Pitch point: first detection where y exceeds PITCH_ZONE_Y
     pitch_idx = 0
     for i, y in enumerate(y_coords):
         if y > frame_height * PITCH_ZONE_Y:
             pitch_idx = i
             break
+    else:
+        debug_log = "Warning: No pitch point detected (y never exceeds PITCH_ZONE_Y), using first detection"
+        pitch_idx = 0
     pitch_point = ball_positions[pitch_idx]
     pitch_frame = detection_frames[pitch_idx]
 
-    # Impact point: sudden y-change or y exceeds IMPACT_ZONE_Y
+    # Impact point: sudden y-change, x stability, or y exceeds IMPACT_ZONE_Y
     impact_idx = None
     for i in range(1, len(y_coords)):
+        delta_y = abs(y_coords[i] - y_coords[i-1])
+        delta_x = abs(x_coords[i] - x_coords[i-1])
         if (y_coords[i] > frame_height * IMPACT_ZONE_Y or
-            abs(y_coords[i] - y_coords[i-1]) > IMPACT_DELTA_Y):
+            (delta_y > IMPACT_DELTA_Y and delta_x < IMPACT_DELTA_X)):
             impact_idx = i
             break
     if impact_idx is None:
         impact_idx = len(ball_positions) - 1
+        debug_log = f"Warning: No impact point detected (no sudden y-change or y > IMPACT_ZONE_Y), using last detection (frame {detection_frames[impact_idx] + 1})"
+    else:
+        debug_log = ""
     impact_point = ball_positions[impact_idx]
     impact_frame = detection_frames[impact_idx]
 
-    # Use only detected positions for trajectory
+    # Use only detected positions up to impact for trajectory
     x_coords = x_coords[:impact_idx + 1]
     y_coords = y_coords[:impact_idx + 1]
     times = times[:impact_idx + 1]
@@ -105,7 +118,7 @@ def estimate_trajectory(ball_positions, detection_frames, frames):
     y_full = fy(t_full)
     full_trajectory = list(zip(x_full, y_full))
 
-    debug_log = (f"Trajectory estimated successfully\n"
+    debug_log = (f"{debug_log}\nTrajectory estimated successfully\n"
                  f"Pitch point at frame {pitch_frame + 1}: ({pitch_point[0]:.1f}, {pitch_point[1]:.1f})\n"
                  f"Impact point at frame {impact_frame + 1}: ({impact_point[0]:.1f}, {impact_point[1]:.1f})")
     return full_trajectory, vis_trajectory, pitch_point, pitch_frame, impact_point, impact_frame, debug_log