From 313668fff4b60bf3a1b84fe05a50ea39a406a143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AF=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9A=D0=B0?= =?UTF-8?q?=D1=80=D1=82=D0=B0=D1=88=D0=BE=D0=B2?= Date: Wed, 11 Nov 2026 16:54:20 +0700 Subject: [PATCH] Report sampled HFOV settling bounds and frame age --- .../calibrate_tele_profile.py | 40 +++++++++++++++++-- .../test_calibrate_tele_profile.py | 6 +++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/integration/ptz_field_calibration/calibrate_tele_profile.py b/integration/ptz_field_calibration/calibrate_tele_profile.py index 9188907..34a3c11 100644 --- a/integration/ptz_field_calibration/calibrate_tele_profile.py +++ b/integration/ptz_field_calibration/calibrate_tele_profile.py @@ -143,6 +143,23 @@ def cadence(times): "gap_ms": stats(gaps)} +def settled_band_bracket(samples, before, first, after, stop, stop_ack): + """ISAPI sample interval bracketing entry into the final 0.10° band.""" + series = {at: [hfov] for at, hfov in (before, first, after)} + for at, values in samples.items(): + if before[0] <= at <= after[0]: + series.setdefault(at, []).extend(values) + if any(max(values) - min(values) > .10 for values in series.values()): + return None + ordered = sorted((at, median(values)) for at, values in series.items()) + outside = [i for i, (_, hfov) in enumerate(ordered) if abs(hfov - after[1]) > .10 + 1e-9] + if not outside: + return None + lower, upper = ordered[outside[-1]][0], ordered[outside[-1] + 1][0] + return {"from_stop_issue_ms": [max(0., (at - stop) * 1000) for at in (lower, upper)], + "from_stop_ack_ms": [max(0., (at - stop_ack) * 1000) for at in (lower, upper)]} + + def analyze_pulse(row, stops, samples, limits): before, at_stop, first, after = (fov(row, k) for k in ("HFOV_before", "HFOV_stop_sample", "HFOV_first_post_stop", "HFOV_after")) @@ -209,7 +226,7 @@ def analyze_pulse(row, stops, samples, limits): "effective_log_rate_s": None, "effective_hfov_narrowing_deg_s": None, "pre_stop_log_rate_s": None, "pre_stop_hfov_narrowing_deg_s": None, "post_stop_tail_deg": None, "stop_bracket_narrowing_deg": None, - "stop_bracket_log_narrowing": None} + "stop_bracket_log_narrowing": None, "settled_band_0_10deg_bracket": None} if reasons: return result rise = focal(at_stop) - focal(before) @@ -221,6 +238,8 @@ def analyze_pulse(row, stops, samples, limits): post_stop_tail_deg=max(0., first - after), stop_bracket_narrowing_deg=max(0., at_stop - after), stop_bracket_log_narrowing=max(0., focal(after) - focal(at_stop)), + settled_band_0_10deg_bracket=settled_band_bracket( + samples, (stop_sample, at_stop), (first_post, first), (after_at, after), stop, stop_ack), ) return result @@ -265,6 +284,8 @@ def episode_report(owner, rows, limits): statuses = status_samples([*ticks, *fresh_rows]) frame_times = [at for row in ticks if (at := val(row, "frame_utc")) is not None and 0 < at <= row["utc"]] + frame_ages = [(row["utc"] - at) * 1000 for row in ticks + if (at := val(row, "frame_utc")) is not None and 0 < at <= row["utc"]] stops = defaultdict(list) for row in by_event["stop"]: stops[row.get("request")].append(row) @@ -338,6 +359,7 @@ def episode_report(owner, rows, limits): "fresh_optics": cadence(row["FOV_status_utc"] for row in fresh_rows), }, "control_sampled_frame_cadence": cadence(frame_times), + "control_sampled_frame_age_ms": stats(frame_ages), "tele_observed_s": tele_s, "tele_center_fraction": None, "tele_center_covered_s": 0., "min_independently_measured_edge_margin": None, "tele_center_availability": "PR10 ticks omit target center coordinates", @@ -461,6 +483,13 @@ def range_report(pulses, profile): "pre_stop_hfov_narrowing_deg_s", "post_stop_tail_deg", "stop_bracket_narrowing_deg", "stop_bracket_log_narrowing", "put_rtt_ms", "stop_rtt_ms"): result[key] = stats(p[key] for p in accepted) + for reference in ("from_stop_issue_ms", "from_stop_ack_ms"): + windows = [p["settled_band_0_10deg_bracket"][reference] for p in accepted + if p["settled_band_0_10deg_bracket"] is not None] + result["settled_band_0_10deg_" + reference] = { + "lower": stats(window[0] for window in windows), + "upper": stats(window[1] for window in windows), + } if profile is not None: nominal, upper = (profile[key] * FULL_SWEEP_LOG_RATE for key in ("nominal_gain", "upper_gain")) median_observed = result["effective_log_rate_s"]["p50"] @@ -624,7 +653,7 @@ def markdown(report, candidate): lines.append(f'- PTZ{ep["camera"]}, TRACK {ep["track_start_utc"]:.3f} · {reasons}') lines += ["", "## Частота статуса во время TRACK", "", "| Камера | TRACK UTC (Unix s) | Свежий HFOV, Гц | Интервал HFOV p95 / max, мс | " - "Ответ статуса p95, мс | Интервал кадров в TRACK p95, мс |", + "Ответ статуса p95, мс | Интервал / возраст кадров в TRACK p95, мс |", "|---|---:|---:|---:|---:|---:|"] for ep in report["episodes"]: status = ep["isapi_track_status"] @@ -632,7 +661,8 @@ def markdown(report, candidate): lines.append(f'| PTZ{ep["camera"]} | {ep["track_start_utc"]:.3f} | ' f'{md_number(optics["hz"])} | {md_number(optics["gap_ms"]["p95"])} / ' f'{md_number(optics["gap_ms"]["max"])} | {md_number(status["request_ms"]["p95"])} | ' - f'{md_number(ep["control_sampled_frame_cadence"]["gap_ms"]["p95"])} |') + f'{md_number(ep["control_sampled_frame_cadence"]["gap_ms"]["p95"])} / ' + f'{md_number(ep["control_sampled_frame_age_ms"]["p95"])} |') lines += ["", "Интервал кадров рассчитан по кадрам, дошедшим до контроллера. " "Для оценки джиттера всего видеопотока нужны метки времени исходных кадров.", "", "## Отклик оптики и RTT", "", @@ -650,7 +680,9 @@ def markdown(report, candidate): f'{md_number(value["completed_stop_rtt_ms"]["p95"])} |') lines += ["", "Скорость до STOP оценивается по статусу от PUT до последнего замера перед STOP. " "Остаточное сужение от первого замера после STOP даёт нижнюю оценку. " - "Интервал от последнего замера до STOP даёт верхнюю наблюдаемую скобку при монотонном движении.", "", + "Интервал от последнего замера до STOP даёт верхнюю наблюдаемую скобку при монотонном движении. " + "В JSON также приведены интервалы входа HFOV в полосу 0,10° от установившегося значения, " + "отсчитанные от отправки STOP и от ACK. Частота ISAPI и задержка сети ограничивают точность этого замера.", "", "## Следующий предел HFOV", ""] for camera, row in candidate["cameras"].items(): f = row["next_floor_review"] diff --git a/integration/ptz_field_calibration/test_calibrate_tele_profile.py b/integration/ptz_field_calibration/test_calibrate_tele_profile.py index 9d8e552..223ae7b 100644 --- a/integration/ptz_field_calibration/test_calibrate_tele_profile.py +++ b/integration/ptz_field_calibration/test_calibrate_tele_profile.py @@ -96,6 +96,12 @@ class CalibrationTests(unittest.TestCase): self.assertAlmostEqual(bins["effective_log_rate_s"]["p50"],expected) self.assertAlmostEqual(bins["pre_stop_hfov_narrowing_deg_s"]["p50"],3.) self.assertAlmostEqual(bins["post_stop_tail_deg"]["p95"],.10) + stop_window = bins["settled_band_0_10deg_from_stop_issue_ms"] + self.assertEqual(stop_window["lower"]["p50"], 0.) + self.assertAlmostEqual(stop_window["upper"]["p50"], 80.) + ack_window = bins["settled_band_0_10deg_from_stop_ack_ms"] + self.assertAlmostEqual(ack_window["upper"]["p50"], 30.) + self.assertAlmostEqual(report["episodes"][0]["control_sampled_frame_age_ms"]["p95"], 100.) self.assertAlmostEqual(bins["stop_bracket_narrowing_deg"]["max"],.30) self.assertEqual(bins["put_rtt_ms"]["p95"],40.) self.assertEqual(bins["stop_rtt_ms"]["p95"],50.)