+
请先选择摄像头并抓取画面
点击画面添加像素点，然后在右侧选择对应的现场控制点；至少 4 个拟合点和 3 个独立验证点。
@@ -53,7 +54,7 @@
{% block extra_js %}
{% endblock %}
diff --git a/workshop_monitor/migrations/0002_workshopcamera_preview_stream.py b/workshop_monitor/migrations/0002_workshopcamera_preview_stream.py
new file mode 100644
index 0000000..f348443
--- /dev/null
+++ b/workshop_monitor/migrations/0002_workshopcamera_preview_stream.py
@@ -0,0 +1,20 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+ dependencies = [("workshop_monitor", "0001_initial")]
+
+ operations = [
+ migrations.AddField(
+ model_name="workshopcamera",
+ name="preview_stream",
+ field=models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name="workshop_preview_bindings",
+ to="app.streammodel",
+ ),
+ ),
+ ]
diff --git a/workshop_monitor/models.py b/workshop_monitor/models.py
index 2503ed4..cc26d30 100644
--- a/workshop_monitor/models.py
+++ b/workshop_monitor/models.py
@@ -36,6 +36,10 @@ class WorkshopCamera(models.Model):
"app.StreamModel", null=True, blank=True, on_delete=models.SET_NULL,
related_name="workshop_bindings",
)
+ preview_stream = models.ForeignKey(
+ "app.StreamModel", null=True, blank=True, on_delete=models.SET_NULL,
+ related_name="workshop_preview_bindings",
+ )
slot = models.PositiveIntegerField(default=1)
display_name = models.CharField(max_length=100, default="")
enabled = models.BooleanField(default=True)
diff --git a/workshop_monitor/tests.py b/workshop_monitor/tests.py
index 67cd9d5..bb1e8f1 100644
--- a/workshop_monitor/tests.py
+++ b/workshop_monitor/tests.py
@@ -42,8 +42,47 @@ class WorkshopApiTests(TestCase):
self.assertEqual(payload["code"], 1000)
self.assertEqual(len(payload["data"]["cameras"]), 4)
self.assertTrue(all(c["stream_id"] for c in payload["data"]["cameras"]))
+ self.assertTrue(all(c["preview_stream_id"] is None for c in payload["data"]["cameras"]))
self.assertEqual(payload["data"]["site"]["width_m"], 130.0)
+ def test_separate_preview_substream_is_persisted(self):
+ config = self.client.get("/workshop/openConfig").json()["data"]
+ preview = make_stream("34020000001320000102", 102)
+ site = config["site"]
+ camera = config["cameras"][0]
+ response = self.client.post("/workshop/openSaveConfig", data=json.dumps({
+ "name": site["name"], "width_m": site["width_m"], "height_m": site["height_m"],
+ "analysis_fps": site["analysis_fps"], "target_labels": site["target_labels"],
+ "fusion_radius_m": site["fusion_radius_m"],
+ "observation_window_sec": site["observation_window_sec"],
+ "max_speed_mps": site["max_speed_mps"], "lost_ttl_sec": site["lost_ttl_sec"],
+ "trail_sec": site["trail_sec"], "detector_id": site["detector_id"],
+ "reid_model_id": site["reid_model_id"],
+ "cameras": [{**camera, "preview_stream_id": preview.id}],
+ }), content_type="application/json")
+ payload = response.json()
+ self.assertEqual(payload["code"], 1000)
+ saved = payload["data"]["cameras"][0]
+ self.assertEqual(saved["preview_stream_id"], preview.id)
+ self.assertEqual(saved["preview_stream_name"], preview.name)
+
+ def test_preview_substream_cannot_equal_analysis_stream(self):
+ config = self.client.get("/workshop/openConfig").json()["data"]
+ site = config["site"]
+ camera = config["cameras"][0]
+ response = self.client.post("/workshop/openSaveConfig", data=json.dumps({
+ "name": site["name"], "width_m": site["width_m"], "height_m": site["height_m"],
+ "analysis_fps": site["analysis_fps"], "target_labels": site["target_labels"],
+ "fusion_radius_m": site["fusion_radius_m"],
+ "observation_window_sec": site["observation_window_sec"],
+ "max_speed_mps": site["max_speed_mps"], "lost_ttl_sec": site["lost_ttl_sec"],
+ "trail_sec": site["trail_sec"], "detector_id": site["detector_id"],
+ "reid_model_id": site["reid_model_id"],
+ "cameras": [{**camera, "preview_stream_id": camera["stream_id"]}],
+ }), content_type="application/json")
+ self.assertEqual(response.json()["code"], 0)
+ self.assertIn("不能与定位/标定流相同", response.json()["msg"])
+
def test_calibration_activation_requires_validation_under_one_meter(self):
config = self.client.get("/workshop/openConfig").json()["data"]
camera_id = config["cameras"][0]["id"]
diff --git a/workshop_monitor/views.py b/workshop_monitor/views.py
index 5ecc8db..1a6f0fd 100644
--- a/workshop_monitor/views.py
+++ b/workshop_monitor/views.py
@@ -67,12 +67,19 @@ def _site():
def _camera_dict(camera):
stream = camera.stream
+ preview = camera.preview_stream
calibration = camera.active_calibration
return {
"id": camera.id, "slot": camera.slot, "display_name": camera.display_name,
"enabled": camera.enabled, "stream_id": camera.stream_id,
"stream_code": stream.code if stream else "", "stream_app": stream.app if stream else "",
"stream_name": stream.name if stream else "", "stream_nickname": stream.nickname if stream else "",
+ "preview_stream_id": camera.preview_stream_id,
+ "preview_stream_code": preview.code if preview else "",
+ "preview_stream_app": preview.app if preview else "",
+ "preview_stream_name": preview.name if preview else "",
+ "preview_stream_nickname": preview.nickname if preview else "",
+ "preview_stream_forward_state": preview.forward_state if preview else 0,
"install_x": camera.install_x, "install_y": camera.install_y, "install_z": camera.install_z,
"yaw_deg": camera.yaw_deg, "pitch_deg": camera.pitch_deg,
"calibration": ({
@@ -103,7 +110,7 @@ def _config_data(site):
"observation_window_sec": site.observation_window_sec,
"max_speed_mps": site.max_speed_mps, "lost_ttl_sec": site.lost_ttl_sec,
"trail_sec": site.trail_sec},
- "cameras": [_camera_dict(c) for c in site.cameras.select_related("stream")],
+ "cameras": [_camera_dict(c) for c in site.cameras.select_related("stream", "preview_stream")],
"control_points": points, "streams": streams, "algorithms": detectors,
"runtime": get_runtime_manager().snapshot(),
}
@@ -159,6 +166,11 @@ def open_save_config(request):
for row in params.get("cameras") or []:
camera = site.cameras.get(id=int(row["id"]))
camera.stream = StreamModel.objects.filter(id=int(row.get("stream_id") or 0)).first()
+ camera.preview_stream = StreamModel.objects.filter(
+ id=int(row.get("preview_stream_id") or 0)
+ ).first()
+ if camera.stream_id and camera.preview_stream_id == camera.stream_id:
+ raise ValueError("摄像头 %d 的预览子码流不能与定位/标定流相同" % camera.slot)
camera.display_name = str(row.get("display_name") or "摄像头 %d" % camera.slot)[:100]
camera.enabled = bool(row.get("enabled", True))
camera.install_x = float(row.get("install_x", 0))
@@ -209,6 +221,19 @@ def open_control_point_delete(request):
return _reply(False, msg=str(exc))
+def _ensure_stream_online(stream, timeout=12.0):
+ """标定抓帧前确保流在 ZLM 在线：未在线时触发拉流/GB28181 点播并轮询等待。"""
+ from app.utils.GlobalUtils import g_zlm, GlobalUtils
+ if not g_zlm.getMediaInfo(app=stream.app, name=stream.name):
+ GlobalUtils.addStreamProxy(stream)
+ deadline = time.monotonic() + timeout
+ while time.monotonic() < deadline:
+ if g_zlm.getMediaInfo(app=stream.app, name=stream.name):
+ return True
+ time.sleep(0.5)
+ return False
+
+
def open_capture(request):
ok, msg = f_checkRequestSafe(request)
if request.method != "POST" or not ok:
@@ -223,6 +248,8 @@ def open_capture(request):
url = AnalysisManager.build_rtsp_url(camera.stream)
if not url:
raise ValueError("无法生成摄像头 RTSP 地址")
+ if not _ensure_stream_online(camera.stream):
+ raise ValueError("视频流拉起失败，请确认摄像头在线")
cap = cv2.VideoCapture(url, cv2.CAP_FFMPEG)
frame = None
deadline = time.monotonic() + 8.0