Update app.py

app.py

@@ -17,7 +17,6 @@ FRAME_RATE = 30  # Input video frame rate
 SLOW_MOTION_FACTOR = 6  # For very slow motion (6x slower)
 CONF_THRESHOLD = 0.25  # Confidence threshold for detection
 IMPACT_ZONE_Y = 0.85  # Fraction of frame height where impact is likely (near stumps)
-IMPACT_DELTA_Y = 50  # Pixels for detecting sudden y-position change (impact)
 
 def process_video(video_path):
     if not os.path.exists(video_path):
@@ -55,32 +54,26 @@ def process_video(video_path):
 
     return frames, ball_positions, detection_frames, "\n".join(debug_log)
 
-def estimate_trajectory(ball_positions, frames, detection_frames):
+def estimate_trajectory(ball_positions, frames):
     if len(ball_positions) < 2:
-        return None, None, None, None, "Error: Fewer than 2 ball detections for trajectory"
+        return None, None, None, "Error: Fewer than 2 ball detections for trajectory"
     frame_height = frames[0].shape[0]
 
     # Extract x, y coordinates
     x_coords = [pos[0] for pos in ball_positions]
     y_coords = [pos[1] for pos in ball_positions]
-    times = np.array(detection_frames) / FRAME_RATE
+    times = np.arange(len(ball_positions)) / FRAME_RATE
 
-    # Identify pitch point (first detection)
-    pitch_point = ball_positions[0]
-    pitch_frame = detection_frames[0]
-
-    # Find impact point (sudden change in y or near stumps)
+    # Find impact point (closest to batsman, near stumps)
     impact_idx = None
-    impact_frame = None
-    for i in range(1, len(y_coords)):
-        if y_coords[i] > frame_height * IMPACT_ZONE_Y or abs(y_coords[i] - y_coords[i-1]) > IMPACT_DELTA_Y:
+    for i, y in enumerate(y_coords):
+        if y > frame_height * IMPACT_ZONE_Y:  # Ball is near stumps/batsman
             impact_idx = i
-            impact_frame = detection_frames[i]
             break
     if impact_idx is None:
-        impact_idx = len(ball_positions) - 1
-        impact_frame = detection_frames[-1]
+        impact_idx = len(ball_positions) - 1  # Fallback to last detection
 
+    pitch_point = ball_positions[0]
     impact_point = ball_positions[impact_idx]
 
     # Use positions up to impact for interpolation
@@ -92,7 +85,7 @@ def estimate_trajectory(ball_positions, frames, detection_frames):
         fx = interp1d(times, x_coords, kind='linear', fill_value="extrapolate")
         fy = interp1d(times, y_coords, kind='quadratic', fill_value="extrapolate")
     except Exception as e:
-        return None, None, None, None, f"Error in trajectory interpolation: {str(e)}"
+        return None, None, None, f"Error in trajectory interpolation: {str(e)}"
 
     # Project trajectory (detected + future for LBW decision)
     t_full = np.linspace(times[0], times[-1] + 0.5, len(times) + 10)
@@ -100,8 +93,7 @@ def estimate_trajectory(ball_positions, frames, detection_frames):
     y_full = fy(t_full)
     trajectory = list(zip(x_full, y_full))
 
-    debug_log = f"Trajectory estimated successfully\nPitch point at frame {pitch_frame + 1}: ({pitch_point[0]:.1f}, {pitch_point[1]:.1f})\nImpact point at frame {impact_frame + 1}: ({impact_point[0]:.1f}, {impact_point[1]:.1f})"
-    return trajectory, pitch_point, impact_point, pitch_frame, impact_frame, debug_log
+    return trajectory, pitch_point, impact_point, "Trajectory estimated successfully"
 
 def lbw_decision(ball_positions, trajectory, frames, pitch_point, impact_point):
     if not frames:
@@ -131,7 +123,7 @@ def lbw_decision(ball_positions, trajectory, frames, pitch_point, impact_point):
             return f"Out (Ball hits stumps, Pitch at x: {pitch_x:.1f}, y: {pitch_y:.1f}, Impact at x: {impact_x:.1f}, y: {impact_y:.1f})", trajectory, pitch_point, impact_point
     return f"Not Out (Missing stumps, Pitch at x: {pitch_x:.1f}, y: {pitch_y:.1f}, Impact at x: {impact_x:.1f}, y: {impact_y:.1f})", trajectory, pitch_point, impact_point
 
-def generate_slow_motion(frames, trajectory, pitch_point, impact_point, detection_frames, pitch_frame, impact_frame, output_path):
+def generate_slow_motion(frames, trajectory, pitch_point, impact_point, detection_frames, output_path):
     if not frames:
         return None
     fourcc = cv2.VideoWriter_fourcc(*'mp4v')
@@ -145,15 +137,15 @@ def generate_slow_motion(frames, trajectory, pitch_point, impact_point, detectio
         if i in detection_frames and trajectory_points.size > 0:
             cv2.polylines(frame, [trajectory_points[:detection_frames.index(i) + 1]], False, (255, 0, 0), 2)
 
-        # Draw pitch point (red circle with label) only in pitch frame
-        if pitch_point and i == pitch_frame:
+        # Draw pitch point (red circle with label)
+        if pitch_point and i >= detection_frames[0]:
             x, y = pitch_point
             cv2.circle(frame, (int(x), int(y)), 8, (0, 0, 255), -1)
             cv2.putText(frame, "Pitch Point", (int(x) + 10, int(y) - 10), 
                         cv2.FONT_HERSHEY_SIMPLEX, 0.6, (0, 0, 255), 2)
 
-        # Draw impact point (yellow circle with label) only in impact frame
-        if impact_point and i == impact_frame:
+        # Draw impact point (yellow circle with label) only in frames after impact
+        if impact_point and i >= detection_frames[min(len(detection_frames) - 1, detection_frames.index(detection_frames[-1]))]:
             x, y = impact_point
             cv2.circle(frame, (int(x), int(y)), 8, (0, 255, 255), -1)
             cv2.putText(frame, "Impact Point", (int(x) + 10, int(y) + 20), 
@@ -168,11 +160,11 @@ def drs_review(video):
     frames, ball_positions, detection_frames, debug_log = process_video(video)
     if not frames:
         return f"Error: Failed to process video\nDebug Log:\n{debug_log}", None
-    trajectory, pitch_point, impact_point, pitch_frame, impact_frame, trajectory_log = estimate_trajectory(ball_positions, frames, detection_frames)
+    trajectory, pitch_point, impact_point, trajectory_log = estimate_trajectory(ball_positions, frames)
     decision, trajectory, pitch_point, impact_point = lbw_decision(ball_positions, trajectory, frames, pitch_point, impact_point)
 
     output_path = f"output_{uuid.uuid4()}.mp4"
-    slow_motion_path = generate_slow_motion(frames, trajectory, pitch_point, impact_point, detection_frames, pitch_frame, impact_frame, output_path)
+    slow_motion_path = generate_slow_motion(frames, trajectory, pitch_point, impact_point, detection_frames, output_path)
 
     debug_output = f"{debug_log}\n{trajectory_log}"
     return f"DRS Decision: {decision}\nDebug Log:\n{debug_output}", slow_motion_path