|
|
|
@ -143,6 +143,23 @@ def cadence(times):
|
|
|
|
"gap_ms": stats(gaps)}
|
|
|
|
"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):
|
|
|
|
def analyze_pulse(row, stops, samples, limits):
|
|
|
|
before, at_stop, first, after = (fov(row, k) for k in
|
|
|
|
before, at_stop, first, after = (fov(row, k) for k in
|
|
|
|
("HFOV_before", "HFOV_stop_sample", "HFOV_first_post_stop", "HFOV_after"))
|
|
|
|
("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,
|
|
|
|
"effective_log_rate_s": None, "effective_hfov_narrowing_deg_s": None,
|
|
|
|
"pre_stop_log_rate_s": None, "pre_stop_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,
|
|
|
|
"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:
|
|
|
|
if reasons:
|
|
|
|
return result
|
|
|
|
return result
|
|
|
|
rise = focal(at_stop) - focal(before)
|
|
|
|
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),
|
|
|
|
post_stop_tail_deg=max(0., first - after),
|
|
|
|
stop_bracket_narrowing_deg=max(0., at_stop - after),
|
|
|
|
stop_bracket_narrowing_deg=max(0., at_stop - after),
|
|
|
|
stop_bracket_log_narrowing=max(0., focal(after) - focal(at_stop)),
|
|
|
|
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
|
|
|
|
return result
|
|
|
|
|
|
|
|
|
|
|
|
@ -265,6 +284,8 @@ def episode_report(owner, rows, limits):
|
|
|
|
statuses = status_samples([*ticks, *fresh_rows])
|
|
|
|
statuses = status_samples([*ticks, *fresh_rows])
|
|
|
|
frame_times = [at for row in ticks if (at := val(row, "frame_utc")) is not None
|
|
|
|
frame_times = [at for row in ticks if (at := val(row, "frame_utc")) is not None
|
|
|
|
and 0 < at <= row["utc"]]
|
|
|
|
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)
|
|
|
|
stops = defaultdict(list)
|
|
|
|
for row in by_event["stop"]:
|
|
|
|
for row in by_event["stop"]:
|
|
|
|
stops[row.get("request")].append(row)
|
|
|
|
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),
|
|
|
|
"fresh_optics": cadence(row["FOV_status_utc"] for row in fresh_rows),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
"control_sampled_frame_cadence": cadence(frame_times),
|
|
|
|
"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.,
|
|
|
|
"tele_observed_s": tele_s, "tele_center_fraction": None, "tele_center_covered_s": 0.,
|
|
|
|
"min_independently_measured_edge_margin": None,
|
|
|
|
"min_independently_measured_edge_margin": None,
|
|
|
|
"tele_center_availability": "PR10 ticks omit target center coordinates",
|
|
|
|
"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",
|
|
|
|
"pre_stop_hfov_narrowing_deg_s", "post_stop_tail_deg", "stop_bracket_narrowing_deg",
|
|
|
|
"stop_bracket_log_narrowing", "put_rtt_ms", "stop_rtt_ms"):
|
|
|
|
"stop_bracket_log_narrowing", "put_rtt_ms", "stop_rtt_ms"):
|
|
|
|
result[key] = stats(p[key] for p in accepted)
|
|
|
|
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:
|
|
|
|
if profile is not None:
|
|
|
|
nominal, upper = (profile[key] * FULL_SWEEP_LOG_RATE for key in ("nominal_gain", "upper_gain"))
|
|
|
|
nominal, upper = (profile[key] * FULL_SWEEP_LOG_RATE for key in ("nominal_gain", "upper_gain"))
|
|
|
|
median_observed = result["effective_log_rate_s"]["p50"]
|
|
|
|
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.append(f'- PTZ{ep["camera"]}, TRACK {ep["track_start_utc"]:.3f} · {reasons}')
|
|
|
|
lines += ["", "## Частота статуса во время TRACK", "",
|
|
|
|
lines += ["", "## Частота статуса во время TRACK", "",
|
|
|
|
"| Камера | TRACK UTC (Unix s) | Свежий HFOV, Гц | Интервал HFOV p95 / max, мс | "
|
|
|
|
"| Камера | TRACK UTC (Unix s) | Свежий HFOV, Гц | Интервал HFOV p95 / max, мс | "
|
|
|
|
"Ответ статуса p95, мс | Интервал кадров в TRACK p95, мс |",
|
|
|
|
"Ответ статуса p95, мс | Интервал / возраст кадров в TRACK p95, мс |",
|
|
|
|
"|---|---:|---:|---:|---:|---:|"]
|
|
|
|
"|---|---:|---:|---:|---:|---:|"]
|
|
|
|
for ep in report["episodes"]:
|
|
|
|
for ep in report["episodes"]:
|
|
|
|
status = ep["isapi_track_status"]
|
|
|
|
status = ep["isapi_track_status"]
|
|
|
|
@ -632,7 +661,8 @@ def markdown(report, candidate):
|
|
|
|
lines.append(f'| PTZ{ep["camera"]} | {ep["track_start_utc"]:.3f} | '
|
|
|
|
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["hz"])} | {md_number(optics["gap_ms"]["p95"])} / '
|
|
|
|
f'{md_number(optics["gap_ms"]["max"])} | {md_number(status["request_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 += ["", "Интервал кадров рассчитан по кадрам, дошедшим до контроллера. "
|
|
|
|
lines += ["", "Интервал кадров рассчитан по кадрам, дошедшим до контроллера. "
|
|
|
|
"Для оценки джиттера всего видеопотока нужны метки времени исходных кадров.", "",
|
|
|
|
"Для оценки джиттера всего видеопотока нужны метки времени исходных кадров.", "",
|
|
|
|
"## Отклик оптики и RTT", "",
|
|
|
|
"## Отклик оптики и RTT", "",
|
|
|
|
@ -650,7 +680,9 @@ def markdown(report, candidate):
|
|
|
|
f'{md_number(value["completed_stop_rtt_ms"]["p95"])} |')
|
|
|
|
f'{md_number(value["completed_stop_rtt_ms"]["p95"])} |')
|
|
|
|
lines += ["", "Скорость до STOP оценивается по статусу от PUT до последнего замера перед STOP. "
|
|
|
|
lines += ["", "Скорость до STOP оценивается по статусу от PUT до последнего замера перед STOP. "
|
|
|
|
"Остаточное сужение от первого замера после STOP даёт нижнюю оценку. "
|
|
|
|
"Остаточное сужение от первого замера после STOP даёт нижнюю оценку. "
|
|
|
|
"Интервал от последнего замера до STOP даёт верхнюю наблюдаемую скобку при монотонном движении.", "",
|
|
|
|
"Интервал от последнего замера до STOP даёт верхнюю наблюдаемую скобку при монотонном движении. "
|
|
|
|
|
|
|
|
"В JSON также приведены интервалы входа HFOV в полосу 0,10° от установившегося значения, "
|
|
|
|
|
|
|
|
"отсчитанные от отправки STOP и от ACK. Частота ISAPI и задержка сети ограничивают точность этого замера.", "",
|
|
|
|
"## Следующий предел HFOV", ""]
|
|
|
|
"## Следующий предел HFOV", ""]
|
|
|
|
for camera, row in candidate["cameras"].items():
|
|
|
|
for camera, row in candidate["cameras"].items():
|
|
|
|
f = row["next_floor_review"]
|
|
|
|
f = row["next_floor_review"]
|
|
|
|
|