kinemotion 0.45.0__py3-none-any.whl → 0.45.1__py3-none-any.whl

kinemotion/api.py

@@ -78,6 +78,69 @@ class DropJumpVideoConfig:
     tracking_confidence: float | None = None
 
 
+def _generate_debug_video(
+    output_video: str,
+    frames: list,
+    frame_indices: list[int],
+    video_fps: float,
+    smoothed_landmarks: list,
+    contact_states: list,
+    metrics: DropJumpMetrics,
+    timer: PerformanceTimer | None,
+    verbose: bool,
+) -> None:
+    """Generate debug video with overlay."""
+    if verbose:
+        print(f"Generating debug video: {output_video}")
+
+    if not frames:
+        return
+
+    debug_h, debug_w = frames[0].shape[:2]
+
+    if video_fps > 30:
+        debug_fps = video_fps / (video_fps / 30.0)
+    else:
+        debug_fps = video_fps
+
+    if len(frames) < len(smoothed_landmarks):
+        step = max(1, int(video_fps / 30.0))
+        debug_fps = video_fps / step
+
+    def _render_frames(renderer: DebugOverlayRenderer) -> None:
+        for frame, idx in zip(frames, frame_indices, strict=True):
+            annotated = renderer.render_frame(
+                frame,
+                smoothed_landmarks[idx],
+                contact_states[idx],
+                idx,
+                metrics,
+                use_com=False,
+            )
+            renderer.write_frame(annotated)
+
+    renderer_context = DebugOverlayRenderer(
+        output_video,
+        debug_w,
+        debug_h,
+        debug_w,
+        debug_h,
+        debug_fps,
+        timer=timer,
+    )
+
+    if timer:
+        with timer.measure("debug_video_generation"):
+            with renderer_context as renderer:
+                _render_frames(renderer)
+    else:
+        with renderer_context as renderer:
+            _render_frames(renderer)
+
+    if verbose:
+        print(f"Debug video saved: {output_video}")
+
+
 def process_dropjump_video(
     video_path: str,
     quality: str = "balanced",
@@ -285,64 +348,17 @@ def process_dropjump_video(
                 print()
 
             if output_video:
-                if verbose:
-                    print(f"Generating debug video: {output_video}")
-
-                debug_h, debug_w = frames[0].shape[:2]
-                if video.fps > 30:
-                    debug_fps = video.fps / (video.fps / 30.0)
-                else:
-                    debug_fps = video.fps
-                if len(frames) < len(landmarks_sequence):
-                    step = max(1, int(video.fps / 30.0))
-                    debug_fps = video.fps / step
-
-                if timer:
-                    with timer.measure("debug_video_generation"):
-                        with DebugOverlayRenderer(
-                            output_video,
-                            debug_w,
-                            debug_h,
-                            debug_w,
-                            debug_h,
-                            debug_fps,
-                            timer=timer,
-                        ) as renderer:
-                            for frame, idx in zip(frames, frame_indices, strict=True):
-                                annotated = renderer.render_frame(
-                                    frame,
-                                    smoothed_landmarks[idx],
-                                    contact_states[idx],
-                                    idx,
-                                    metrics,
-                                    use_com=False,
-                                )
-                                renderer.write_frame(annotated)
-                    with timer.measure("debug_video_reencode"):
-                        pass
-                else:
-                    with DebugOverlayRenderer(
-                        output_video,
-                        debug_w,
-                        debug_h,
-                        debug_w,
-                        debug_h,
-                        debug_fps,
-                        timer=timer,
-                    ) as renderer:
-                        for frame, idx in zip(frames, frame_indices, strict=True):
-                            annotated = renderer.render_frame(
-                                frame,
-                                smoothed_landmarks[idx],
-                                contact_states[idx],
-                                idx,
-                                metrics,
-                                use_com=False,
-                            )
-                            renderer.write_frame(annotated)
-
-                if verbose:
-                    print(f"Debug video saved: {output_video}")
+                _generate_debug_video(
+                    output_video,
+                    frames,
+                    frame_indices,
+                    video.fps,
+                    smoothed_landmarks,
+                    contact_states,
+                    metrics,
+                    timer,
+                    verbose,
+                )
 
             with timer.measure("metrics_validation"):
                 validator = DropJumpMetricsValidator()
@@ -738,8 +754,6 @@ def process_cmj_video(
                                     frame, smoothed_landmarks[idx], idx, metrics
                                 )
                                 renderer.write_frame(annotated)
-                    with timer.measure("debug_video_reencode"):
-                        pass
                 else:
                     with CMJDebugOverlayRenderer(
                         output_video,

kinemotion/cmj/cli.py

@@ -3,11 +3,10 @@
 import json
 import sys
 from dataclasses import dataclass
-from typing import Any
 
 import click
 
-from ..api import process_cmj_video
+from ..api import CMJMetrics, process_cmj_video
 from ..core.auto_tuning import QualityPreset
 from ..core.cli_utils import (
     collect_video_files,
@@ -287,7 +286,7 @@ def _process_single(
         sys.exit(1)
 
 
-def _output_results(metrics: Any, json_output: str | None) -> None:
+def _output_results(metrics: CMJMetrics, json_output: str | None) -> None:
     """Output analysis results."""
     results = metrics.to_dict()
 

kinemotion/core/debug_overlay_utils.py

@@ -5,6 +5,7 @@ import shutil
 import subprocess
 import time
 from pathlib import Path
+from typing import Self
 
 import cv2
 import numpy as np
@@ -251,7 +252,7 @@ class BaseDebugOverlayRenderer:
                 if temp_path and os.path.exists(temp_path):
                     os.remove(temp_path)
 
-    def __enter__(self) -> "BaseDebugOverlayRenderer":
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(self, _exc_type, _exc_val, _exc_tb) -> None:  # type: ignore[no-untyped-def]

kinemotion/core/pipeline_utils.py

@@ -1,4 +1,4 @@
-"""Shared pipeline utilities for kinematic analysis."""
+"Shared pipeline utilities for kinematic analysis."
 
 from collections.abc import Callable
 from concurrent.futures import ProcessPoolExecutor, as_completed
@@ -140,6 +140,44 @@ def print_verbose_parameters(
     print("=" * 60 + "\n")
 
 
+def _process_frames_loop(
+    video: VideoProcessor,
+    tracker: PoseTracker,
+    step: int,
+    should_resize: bool,
+    debug_w: int,
+    debug_h: int,
+) -> tuple[list, list, list]:
+    """Internal loop for processing frames to reduce complexity."""
+    landmarks_sequence = []
+    debug_frames = []
+    frame_indices = []
+    frame_idx = 0
+
+    while True:
+        frame = video.read_frame()
+        if frame is None:
+            break
+
+        landmarks = tracker.process_frame(frame)
+        landmarks_sequence.append(landmarks)
+
+        if frame_idx % step == 0:
+            if should_resize:
+                processed_frame = cv2.resize(
+                    frame, (debug_w, debug_h), interpolation=cv2.INTER_LINEAR
+                )
+            else:
+                processed_frame = frame
+
+            debug_frames.append(processed_frame)
+            frame_indices.append(frame_idx)
+
+        frame_idx += 1
+
+    return debug_frames, landmarks_sequence, frame_indices
+
+
 def process_all_frames(
     video: VideoProcessor,
     tracker: PoseTracker,
@@ -169,10 +207,6 @@ def process_all_frames(
     if verbose:
         print("Tracking pose landmarks...")
 
-    landmarks_sequence = []
-    debug_frames = []
-    frame_indices = []
-
     step = max(1, int(video.fps / target_debug_fps))
 
     w, h = video.display_width, video.display_height
@@ -184,51 +218,15 @@ def process_all_frames(
     debug_h = int(h * scale) // 2 * 2
     should_resize = (debug_w != video.width) or (debug_h != video.height)
 
-    frame_idx = 0
-
     if timer:
         with timer.measure("pose_tracking"):
-            while True:
-                frame = video.read_frame()
-                if frame is None:
-                    break
-
-                landmarks = tracker.process_frame(frame)
-                landmarks_sequence.append(landmarks)
-
-                if frame_idx % step == 0:
-                    if should_resize:
-                        processed_frame = cv2.resize(
-                            frame, (debug_w, debug_h), interpolation=cv2.INTER_LINEAR
-                        )
-                    else:
-                        processed_frame = frame
-
-                    debug_frames.append(processed_frame)
-                    frame_indices.append(frame_idx)
-
-                frame_idx += 1
+            debug_frames, landmarks_sequence, frame_indices = _process_frames_loop(
+                video, tracker, step, should_resize, debug_w, debug_h
+            )
     else:
-        while True:
-            frame = video.read_frame()
-            if frame is None:
-                break
-
-            landmarks = tracker.process_frame(frame)
-            landmarks_sequence.append(landmarks)
-
-            if frame_idx % step == 0:
-                if should_resize:
-                    processed_frame = cv2.resize(
-                        frame, (debug_w, debug_h), interpolation=cv2.INTER_LINEAR
-                    )
-                else:
-                    processed_frame = frame
-
-                debug_frames.append(processed_frame)
-                frame_indices.append(frame_idx)
-
-            frame_idx += 1
+        debug_frames, landmarks_sequence, frame_indices = _process_frames_loop(
+            video, tracker, step, should_resize, debug_w, debug_h
+        )
 
     if close_tracker:
         tracker.close()
@@ -256,22 +254,19 @@ def apply_smoothing(
     Returns:
         Smoothed landmarks sequence
     """
-    if params.outlier_rejection or params.bilateral_filter:
-        if verbose:
+    use_advanced = params.outlier_rejection or params.bilateral_filter
+
+    if verbose:
+        if use_advanced:
             if params.outlier_rejection:
                 print("Smoothing landmarks with outlier rejection...")
             if params.bilateral_filter:
                 print("Using bilateral temporal filter...")
-        if timer:
-            with timer.measure("smoothing"):
-                return smooth_landmarks_advanced(
-                    landmarks_sequence,
-                    window_length=params.smoothing_window,
-                    polyorder=params.polyorder,
-                    use_outlier_rejection=params.outlier_rejection,
-                    use_bilateral=params.bilateral_filter,
-                )
         else:
+            print("Smoothing landmarks...")
+
+    def _run_smoothing() -> list:
+        if use_advanced:
             return smooth_landmarks_advanced(
                 landmarks_sequence,
                 window_length=params.smoothing_window,
@@ -279,16 +274,6 @@ def apply_smoothing(
                 use_outlier_rejection=params.outlier_rejection,
                 use_bilateral=params.bilateral_filter,
             )
-    else:
-        if verbose:
-            print("Smoothing landmarks...")
-        if timer:
-            with timer.measure("smoothing"):
-                return smooth_landmarks(
-                    landmarks_sequence,
-                    window_length=params.smoothing_window,
-                    polyorder=params.polyorder,
-                )
         else:
             return smooth_landmarks(
                 landmarks_sequence,
@@ -296,6 +281,11 @@ def apply_smoothing(
                 polyorder=params.polyorder,
             )
 
+    if timer:
+        with timer.measure("smoothing"):
+            return _run_smoothing()
+    return _run_smoothing()
+
 
 def calculate_foot_visibility(frame_landmarks: dict) -> float:
     """Calculate average visibility of foot landmarks.

{kinemotion-0.45.0.dist-info → kinemotion-0.45.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinemotion
-Version: 0.45.0
+Version: 0.45.1
 Summary: Video-based kinematic analysis for athletic performance
 Project-URL: Homepage, https://github.com/feniix/kinemotion
 Project-URL: Repository, https://github.com/feniix/kinemotion

{kinemotion-0.45.0.dist-info → kinemotion-0.45.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 kinemotion/__init__.py,sha256=wPItmyGJUOFM6GPRVhAEvRz0-ErI7e2qiUREYJ9EfPQ,943
-kinemotion/api.py,sha256=ltOsxG9QGFqkBW15czaQ0Rn_Ed9Nh_qKYXBTiSBopXU,33181
+kinemotion/api.py,sha256=AWURqiz0SI1BGh6mTlywTOWKFGrXyoZJbmo_t6sRkjQ,32538
 kinemotion/cli.py,sha256=cqYV_7URH0JUDy1VQ_EDLv63FmNO4Ns20m6s1XAjiP4,464
 kinemotion/cmj/__init__.py,sha256=Ynv0-Oco4I3Y1Ubj25m3h9h2XFqeNwpAewXmAYOmwfU,127
 kinemotion/cmj/analysis.py,sha256=qtULzp9uYzm5M0_Qu5YGJpuwjg9fz1VKAg6xg4NJxvM,21639
-kinemotion/cmj/cli.py,sha256=d3_lX-zstch52BxDZUQJyTBpkr2YKwkOE0gUW6nAUb0,9908
+kinemotion/cmj/cli.py,sha256=HpZgLWoLjcgsfOZu6EQ_26tg6QwTgFjR-Ly8WCBg24c,9904
 kinemotion/cmj/debug_overlay.py,sha256=fXmWoHhqMLGo4vTtB6Ezs3yLUDOLw63zLIgU2gFlJQU,15892
 kinemotion/cmj/joint_angles.py,sha256=HmheIEiKcQz39cRezk4h-htorOhGNPsqKIR9RsAEKts,9960
 kinemotion/cmj/kinematics.py,sha256=Lq9m9MNQxnXv31VhKmXVrlM7rRkhi8PxW50N_CC8_8Y,11860
@@ -12,13 +12,13 @@ kinemotion/cmj/validation_bounds.py,sha256=9ZTo68fl3ooyWjXXyTMRLpK9tFANa_rQf3oHh
 kinemotion/core/__init__.py,sha256=GTLnE_gGIk7HC51epWUXVuNxcvS5lf7UL6qeWRlgMV0,1352
 kinemotion/core/auto_tuning.py,sha256=wtCUMOhBChVJNXfEeku3GCMW4qED6MF-O_mv2sPTiVQ,11324
 kinemotion/core/cli_utils.py,sha256=sQPbT6XWWau-sm9yuN5c3eS5xNzoQGGXwSz6hQXtRvM,1859
-kinemotion/core/debug_overlay_utils.py,sha256=vOoWv3vlNdNgPI2R-UwAZKtSpugUUsiokR_kvaz1UWg,9025
+kinemotion/core/debug_overlay_utils.py,sha256=Eu4GXm8VeaDhU7voDjPJ4JvR-7ypT1mYmCz0d-M39N4,9027
 kinemotion/core/determinism.py,sha256=NwVrHqJiVxxFHTBPVy8aDBJH2SLIcYIpdGFp7glblB8,2515
 kinemotion/core/experimental.py,sha256=IK05AF4aZS15ke85hF3TWCqRIXU1AlD_XKzFz735Ua8,3640
 kinemotion/core/filtering.py,sha256=GsC9BB71V07LJJHgS2lsaxUAtJsupcUiwtZFDgODh8c,11417
 kinemotion/core/formatting.py,sha256=G_3eqgOtym9RFOZVEwCxye4A2cyrmgvtQ214vIshowU,2480
 kinemotion/core/metadata.py,sha256=bJAVa4nym__zx1hNowSZduMGKBSGOPxTbBQkjm6N0D0,7207
-kinemotion/core/pipeline_utils.py,sha256=s-2AJEt_beugjbCsiNyKVSc7YBdlgc9aocR_ZSX9PfQ,14783
+kinemotion/core/pipeline_utils.py,sha256=n6ee90xOYfBGkDCM1_F2rpYVsC3wWyKSTtWpAFz0Fh0,14161
 kinemotion/core/pose.py,sha256=Tq4VS0YmMzrprVUsELm6FQczyLhP8UKurM9ccYn1LLU,8959
 kinemotion/core/quality.py,sha256=dPGQp08y8DdEUbUdjTThnUOUsALgF0D2sdz50cm6wLI,13098
 kinemotion/core/smoothing.py,sha256=GAfC-jxu1eqNyDjsUXqUBicKx9um5hrk49wz1FxfRNM,15219
@@ -33,8 +33,8 @@ kinemotion/dropjump/kinematics.py,sha256=kH-XM66wlOCYMpjvyb6_Qh5ZebyOfFZ47rmhgE1
 kinemotion/dropjump/metrics_validator.py,sha256=CrTlGup8q2kyPXtA6HNwm7_yq0AsBaDllG7RVZdXmYA,9342
 kinemotion/dropjump/validation_bounds.py,sha256=5b4I3CKPybuvrbn-nP5yCcGF_sH4Vtyw3a5AWWvWnBk,4645
 kinemotion/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kinemotion-0.45.0.dist-info/METADATA,sha256=pzhaPBL4rK6K3JJvLgFSQDL4rzS0cDRY77yke4iV7b4,26020
-kinemotion-0.45.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-kinemotion-0.45.0.dist-info/entry_points.txt,sha256=zaqnAnjLvcdrk1Qvj5nvXZCZ2gp0prS7it1zTJygcIY,50
-kinemotion-0.45.0.dist-info/licenses/LICENSE,sha256=KZajvqsHw0NoOHOi2q0FZ4NBe9HdV6oey-IPYAtHXfg,1088
-kinemotion-0.45.0.dist-info/RECORD,,
+kinemotion-0.45.1.dist-info/METADATA,sha256=MwXnUwq8AHXBwGJkLbfzc956Bwr15ZfANbyaCMCstDQ,26020
+kinemotion-0.45.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+kinemotion-0.45.1.dist-info/entry_points.txt,sha256=zaqnAnjLvcdrk1Qvj5nvXZCZ2gp0prS7it1zTJygcIY,50
+kinemotion-0.45.1.dist-info/licenses/LICENSE,sha256=KZajvqsHw0NoOHOi2q0FZ4NBe9HdV6oey-IPYAtHXfg,1088
+kinemotion-0.45.1.dist-info/RECORD,,