Add optional original, annotated and JSON frame outputs

.gitignore

@@ -18,3 +18,6 @@ logs/
 .env
 .env.*
 !.env.example
+
+# Optional per-frame output, including standalone Orin runs
+output/

CMakeLists.txt

@@ -12,7 +12,7 @@ find_library(TENSORRT_LIBRARY nvinfer REQUIRED)
 add_library(camera_risk_core
   src/trt_engine.cpp src/pose_engine.cu src/gpu_preprocess.cu src/uyvy_converter.cu
   src/detector.cpp src/v4l2_capture.cpp src/camera.cpp src/can_comm.cpp src/can_state.cpp
-  src/door_risk.cpp src/door_zone.cpp src/camera_pipeline.cpp src/config.cpp src/serialization.cpp)
+  src/door_risk.cpp src/door_zone.cpp src/camera_pipeline.cpp src/output_writer.cpp src/result_renderer.cpp src/config.cpp src/serialization.cpp)
 target_include_directories(camera_risk_core PUBLIC include third_party ${TENSORRT_INCLUDE_DIR} ${OpenCV_INCLUDE_DIRS})
 target_link_libraries(camera_risk_core PUBLIC ${TENSORRT_LIBRARY} ${OpenCV_LIBS} Threads::Threads CUDA::cudart CUDA::nppc CUDA::nppig CUDA::nppidei CUDA::nppicc
   "${CMAKE_SOURCE_DIR}/orin/lib/libusbcanfd.so" "${CMAKE_SOURCE_DIR}/orin/lib/libusb-1.0.so")

README.md

@@ -92,3 +92,22 @@ pipeline.join();
 - `orin/`：可单独复制的 ELF 程序、模型、驱动、CAN 库和配置。
 
 修改源码后，在 Orin 重新编译并执行 `./scripts/package_orin.sh`，或执行 `make package`。运行、打包均不使用 Python。打包后可在 orin 目录运行 `sha256sum -c SHA256SUMS`。
+
+## 可选保存（默认全部关闭）
+
+三个独立参数可以单独使用，也可以组合：
+
+```bash
+./run_camera.sh --save-original --save-annotated --save-results
+# 独立包：./orin/run.sh --save-original --save-annotated --save-results
+```
+
+开启任一项时，程序自动创建可执行文件所属工程的 `output/` 及三个子目录：
+
+- `original/`：`--save-original` 保存未叠加的原图，JPEG 质量 95。
+- `annotated/`：`--save-annotated` 保存带框、关键点及风险文字的 JPEG，无需开启可视化窗口。
+- `results/`：`--save-results` 每个完成推理的帧保存一个 JSON，包含帧号、检测框、跟踪 ID、关键点及置信度、风险和耗时；有 CAN 的分支还包含相应状态。
+
+同一帧三类文件同名（扩展名不同），文件名包含运行标识和帧号，多次运行不覆盖。JSON 的 `images` 提供相对于 `output/` 的图片路径，未选择保存的图片为 null。源码入口写入工程 `output/`；独立包入口写入 `orin/output/`。默认不创建目录、不保存文件。
+
+保存对象是完成推理的帧；惰性分支暂停时不新增文件。开启保存会增加编码和磁盘 I/O 开销。写入失败时报告错误并停止，不静默丢失文件。

include/camera_pipeline.hpp

@@ -1,12 +1,14 @@
 #pragma once
 #include "camera.hpp"
 #include "frame_result.hpp"
+#include "output_writer.hpp"
 #include <filesystem>
 #include <memory>
 
 namespace cms {
 struct PipelineConfig {
     CameraConfig camera;
+    OutputOptions output;
     std::filesystem::path engines,door_mask,door_zone_config;
     bool can_enabled{true};
     std::string can_side{"left"},active_door{"can"};

include/output_writer.hpp

@@ -0,0 +1,20 @@
+#pragma once
+#include "frame_result.hpp"
+#include <filesystem>
+#include <string>
+namespace cms {
+struct OutputOptions {
+    bool original{},annotated{},results{};
+    std::filesystem::path directory;
+    bool enabled() const {return original||annotated||results;}
+};
+// Called by the inference worker; one matching filename stem per completed frame.
+class OutputWriter {
+public:
+    explicit OutputWriter(OutputOptions options);
+    void write(FrameResult const& result);
+private:
+    OutputOptions options_;
+    std::string runId_;
+};
+}

orin/README.md

@@ -20,3 +20,21 @@ CAN 0x391 data[0..3] 为左前、右前、左后、右后。默认左侧，`--ca
 最新结果保存在进程内的 `shared_ptr<const cms::FrameResult>`；C++ 下游调用 `pipeline.latest()` 读取。接口头文件位于仓库 include/，不是 Python 变量或跨进程共享内存。
 
 模型、驱动和编译产物绑定目标 GPU、TensorRT 与内核环境。标定文件需匹配实际机位，默认 calibration_verified=false。系统 CUDA/TensorRT/OpenCV 库由 JetPack 提供。
+
+## 可选保存（默认全部关闭）
+
+三个独立参数可以单独使用，也可以组合：
+
+```bash
+./run.sh --save-original --save-annotated --save-results
+```
+
+开启任一项时，程序自动创建可执行文件所属工程的 `output/` 及三个子目录：
+
+- `original/`：`--save-original` 保存未叠加的原图，JPEG 质量 95。
+- `annotated/`：`--save-annotated` 保存带框、关键点及风险文字的 JPEG，无需开启可视化窗口。
+- `results/`：`--save-results` 每个完成推理的帧保存一个 JSON，包含帧号、检测框、跟踪 ID、关键点及置信度、风险和耗时；有 CAN 的分支还包含相应状态。
+
+同一帧三类文件同名（扩展名不同），文件名包含运行标识和帧号，多次运行不覆盖。JSON 的 `images` 提供相对于 `output/` 的图片路径，未选择保存的图片为 null。源码入口写入工程 `output/`；独立包入口写入 `orin/output/`。默认不创建目录、不保存文件。
+
+保存对象是完成推理的帧；惰性分支暂停时不新增文件。开启保存会增加编码和磁盘 I/O 开销。写入失败时报告错误并停止，不静默丢失文件。

orin/SHA256SUMS

@@ -1,10 +1,10 @@
-1cff77e5547d14cd188b3bb38ba9332e9ae5904646f9248c2a3904a199318738  ./README.md
+13f46e3ef5f6c1370814e42102494efe3dc739a16fa188126e66535f07a0e1fb  ./README.md
 9ba768d559fd3b64e833b50c62c70f2adfd6c169620aea5fba32cfb1b4c5b0e9  ./annotations/constant_door_mask.json
 3544fb1c7b1b27b39db27d8f849d5e8652f5d09a950a59c5dd0c7703086b4f6b  ./annotations/door_zone_multifeature.json
 6d5e874fd27fcfd75d303d7e35d9672028af71041f52dcc82a1e83676faefa65  ./bin/drivers/max9295.ko
 8a78d04ef8be44e9b62a5e4ee315d3d6d679e34aedff02a234bbf4d40e222933  ./bin/drivers/max9296.ko
 3da628587477cc35d5e3f8aee86e718e2ddf16808e893e00ba6e164b2307e843  ./bin/drivers/sgx-yuv-gmsl2.ko
-d37bb5880f921ef8d5f937e5bf9dba38539929d95430f4fb8f575a2ede691a78  ./build/camera_risk
+46d0d06a7353a4c8a7f9275ea6b23249b43030bd8a3753d75fcbc657e02f5e2f  ./build/camera_risk
 718c43eba7c9a86178b272404b14e201445a3998dae81cd32b840f83018ba2b5  ./config/camera.json
 8dae8c557deadbe6bd7241c0dcd7025cb007077ee39a79b115e953a2b22cd9c1  ./lib/libusb-1.0.so
 ab8b7f7249d5fb73d1d33d14fa7532a522088ffb6c25f37ba334daf4c6b4d313  ./lib/libusbcanfd.so

scripts/package_orin.sh

@@ -12,7 +12,7 @@ sed 's|../orin/models/engines|../models/engines|' "$root/config/camera.json" > "
 cp -p "$root/scripts/initialize_camera.sh" "$package/scripts/initialize_camera_impl.sh"
 (
   cd "$package"
-  find . -type f ! -path './outputs/*' ! -path './logs/*' ! -name SHA256SUMS -print0 |
+  find . -type f ! -path './output/*' ! -path './outputs/*' ! -path './logs/*' ! -name SHA256SUMS -print0 |
     sort -z | xargs -0 sha256sum > SHA256SUMS
 )
 echo "C++ runtime ready: $package/build/camera_risk"

src/camera_pipeline.cpp

@@ -54,6 +54,7 @@ struct CameraPipeline::Impl {
     BoundedQueue<CapturedFrame> captures;
     BoundedQueue<Detected> detections;
     LatestResult results;
+    std::unique_ptr<OutputWriter> outputWriter;
     fangjia::TrtLogger logger;
     std::unique_ptr<Detector> detector;
     std::unique_ptr<fangjia::RtmwEngine> pose;
@@ -104,6 +105,7 @@ struct CameraPipeline::Impl {
     void start() {
         {std::lock_guard<std::mutex> lock(stateMutex);if(started||stopped)throw std::logic_error("CameraPipeline can only be started once");started=true;}
         try {
+            outputWriter=std::make_unique<OutputWriter>(config.output);
             detector=std::make_unique<Detector>(config.engines/"yolo11s.engine",logger,config.detector_confidence,config.max_people);
             pose=std::make_unique<fangjia::RtmwEngine>(config.engines/"rtmw_l_384.engine",logger,config.camera.width,config.camera.height,config.max_people);
             DoorOptions options;options.constant=config.door_mask;options.warning=config.warning_relative;options.release=config.release_relative;
@@ -190,6 +192,7 @@ struct CameraPipeline::Impl {
             FrameResultPtr immutable=result;
             results.publish(std::move(immutable));
             {std::lock_guard<std::mutex> lock(stateMutex);totalLatency+=result->timing.capture_to_result_ms;++published;}
+            outputWriter->write(*result);
             if(output.is_open())output<<serializeResult(*result).dump()<<'\n';
             if(poseOutput.is_open())poseOutput<<record.dump()<<'\n';
             if(config.max_frames&&processed>=config.max_frames){stop();break;}

src/main.cpp

@@ -18,10 +18,10 @@ int main(int argc,char** argv)try {
     for(int i=1;i<argc;++i)if(std::string(argv[i])=="--help"||std::string(argv[i])=="-h") {
         std::cout<<"camera_risk [--config FILE] [--visualize] [--active-door can|front|rear|both|none]\n"
                  <<"  [--can-side left|right] [--no-can] [--duration SECONDS] [--max-frames N]\n"
-                 <<"  [--video FILE] [--save-results FILE.jsonl] [--save-pose-records FILE.jsonl]\n"
+                 <<"  [--video FILE] [--save-original] [--save-annotated] [--save-results [FILE.jsonl]] [--save-pose-records FILE.jsonl]\n"
                  <<"Pure C++ inference; the latest immutable FrameResult is kept in memory.\n";return 0;
     }
-    auto config=cms::loadConfig(configPath);bool visualize=false;double duration=0;
+    auto config=cms::loadConfig(configPath);config.output.directory=root/"output";bool visualize=false;double duration=0;
     auto value=[&](int& i){if(++i>=argc)throw std::invalid_argument("Missing option value");return std::string(argv[i]);};
     for(int i=1;i<argc;++i) {
         std::string arg=argv[i];
@@ -31,7 +31,12 @@ int main(int argc,char** argv)try {
         else if(arg=="--active-door")config.active_door=value(i);
         else if(arg=="--can-side")config.can_side=value(i);
         else if(arg=="--video")config.camera.video=value(i);
-        else if(arg=="--save-results")config.results_path=value(i);
+        else if(arg=="--save-original")config.output.original=true;
+        else if(arg=="--save-annotated")config.output.annotated=true;
+        else if(arg=="--save-results") {
+            if(i+1<argc&&std::string(argv[i+1]).rfind("--",0)!=0)config.results_path=value(i); // Existing explicit JSONL path.
+            else config.output.results=true;
+        }
         else if(arg=="--save-pose-records")config.pose_records_path=value(i);
         else if(arg=="--max-frames"){auto n=std::stoll(value(i));if(n<0)throw std::invalid_argument("Negative frame count");config.max_frames=n;}
         else if(arg=="--duration"){duration=std::stod(value(i));if(!std::isfinite(duration)||duration<0)throw std::invalid_argument("Invalid duration");}

src/output_writer.cpp

@@ -0,0 +1,69 @@
+#include "output_writer.hpp"
+#include "serialization.hpp"
+#include "visualizer.hpp"
+#include <opencv2/imgcodecs.hpp>
+#include <chrono>
+#include <ctime>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
+#include <sstream>
+#include <unistd.h>
+
+namespace cms {
+namespace {
+void writeFile(std::filesystem::path const& path,char const* data,std::size_t size) {
+    auto temporary=path;temporary+=".tmp";
+    try {
+        std::ofstream file;file.exceptions(std::ios::failbit|std::ios::badbit);
+        file.open(temporary,std::ios::binary|std::ios::trunc);
+        file.write(data,static_cast<std::streamsize>(size));file.close();
+        std::filesystem::rename(temporary,path);
+    } catch(...) {
+        std::error_code ignored;std::filesystem::remove(temporary,ignored);
+        throw std::runtime_error("Cannot save output file: "+path.string());
+    }
+}
+void writeJpeg(std::filesystem::path const& path,cv::Mat const& image) {
+    std::vector<unsigned char> encoded;
+    if(!cv::imencode(".jpg",image,encoded,{cv::IMWRITE_JPEG_QUALITY,95}))
+        throw std::runtime_error("JPEG encoding failed: "+path.string());
+    writeFile(path,reinterpret_cast<char const*>(encoded.data()),encoded.size());
+}
+}
+OutputWriter::OutputWriter(OutputOptions options):options_(std::move(options)) {
+    if(!options_.enabled())return;
+    if(options_.directory.empty())options_.directory=std::filesystem::current_path()/"output";
+    for(auto name:{"original","annotated","results"})std::filesystem::create_directories(options_.directory/name);
+    // Nanosecond wall-clock + PID prevents a later run from overwriting earlier frames.
+    auto now=std::chrono::system_clock::now();auto time=std::chrono::system_clock::to_time_t(now);
+    std::tm utc{};gmtime_r(&time,&utc);
+    auto ns=std::chrono::duration_cast<std::chrono::nanoseconds>(now.time_since_epoch()).count()%1000000000;
+    std::ostringstream id;id<<std::put_time(&utc,"%Y%m%dT%H%M%S")<<'_'<<std::setw(9)<<std::setfill('0')<<ns<<"Z_"<<getpid();
+    runId_=id.str();
+    std::cout<<"Saving selected outputs to "<<options_.directory<<std::endl;
+}
+void OutputWriter::write(FrameResult const& result) {
+    if(!options_.enabled())return;
+    std::ostringstream name;name<<runId_<<"_frame_"<<std::setw(10)<<std::setfill('0')<<result.frame_index;
+    auto stem=name.str();Json original=nullptr,annotated=nullptr;
+    if(options_.original) {
+        if(!result.image)throw std::runtime_error("Cannot save original image: frame is missing");
+        auto const& image=*result.image;
+        if(image.width<=0||image.height<=0||image.stride<image.width*3||image.pixels.size()<std::size_t(image.stride)*image.height)
+            throw std::runtime_error("Cannot save malformed original image");
+        cv::Mat view(image.height,image.width,CV_8UC3,const_cast<std::uint8_t*>(image.pixels.data()),image.stride);
+        auto path=std::filesystem::path("original")/(stem+".jpg");writeJpeg(options_.directory/path,view);original=path.generic_string();
+    }
+    if(options_.annotated) {
+        auto path=std::filesystem::path("annotated")/(stem+".jpg");
+        writeJpeg(options_.directory/path,renderResult(result));annotated=path.generic_string();
+    }
+    if(options_.results) {
+        auto document=serializeResult(result);document["schema_version"]=1;document["run_id"]=runId_;
+        document["images"]={{"original",original},{"annotated",annotated}};
+        auto contents=document.dump(2)+"\n";
+        writeFile(options_.directory/"results"/(stem+".json"),contents.data(),contents.size());
+    }
+}
+}

src/result_renderer.cpp

@@ -0,0 +1,82 @@
+#include "visualizer.hpp"
+#include <opencv2/imgproc.hpp>
+#include <algorithm>
+#include <cmath>
+#include <iomanip>
+#include <sstream>
+#include <stdexcept>
+
+namespace cms {
+namespace {
+cv::Point point(PosePoint const& p){return {int(std::nearbyint(p.x)),int(std::nearbyint(p.y))};}
+cv::Scalar color(std::string const& level) {
+    if(level=="danger")return {40,40,255};
+    if(level=="warning")return {0,160,255};
+    if(level=="watch")return {0,240,240};
+    if(level=="clear")return {80,220,90};
+    return {190,190,190};
+}
+void segment(cv::Mat& image,cv::Point a,cv::Point b,cv::Scalar c,int thickness,bool dashed) {
+    if(!dashed){cv::line(image,a,b,c,thickness,cv::LINE_AA);return;}
+    cv::Point2d d=b-a;double length=cv::norm(d);if(length<1)return;d*=1.0/length;
+    for(double x=0;x<length;x+=14)cv::line(image,cv::Point2d(a)+d*x,cv::Point2d(a)+d*std::min(x+8,length),c,thickness,cv::LINE_AA);
+}
+}
+cv::Mat renderResult(FrameResult const& r) {
+    if(!r.image)throw std::invalid_argument("Result has no frame image");
+    auto const& image=*r.image;
+    if(image.width<=0||image.height<=0||image.stride<image.width*3||image.pixels.size()<std::size_t(image.stride)*image.height)
+        throw std::invalid_argument("Malformed result image");
+    cv::Mat view(image.height,image.width,CV_8UC3,const_cast<std::uint8_t*>(image.pixels.data()),image.stride);
+    auto canvas=view.clone();
+    if(r.door_mask_pixels) {
+        auto const& m=*r.door_mask_pixels;
+        if(m.width!=image.width||m.height!=image.height||m.stride<m.width||m.pixels.size()<std::size_t(m.stride)*m.height)
+            throw std::invalid_argument("Result mask does not match image");
+        cv::Mat mask(m.height,m.width,CV_8U,const_cast<std::uint8_t*>(m.pixels.data()),m.stride);
+        auto tint=canvas.clone();tint.setTo(cv::Scalar(255,180,0),mask);
+        cv::addWeighted(canvas,0.75,tint,0.25,0,canvas);
+        std::vector<std::vector<cv::Point>> contours;cv::findContours(mask.clone(),contours,cv::RETR_EXTERNAL,cv::CHAIN_APPROX_SIMPLE);
+        cv::drawContours(canvas,contours,-1,{255,180,0},2);
+    }
+    for(auto const& person:r.persons) {
+        auto const& b=person.box;
+        cv::rectangle(canvas,{int(b[0]),int(b[1])},{int(b[2]),int(b[3])},{0,220,255},2);
+        std::ostringstream text;text<<"ID "<<person.track_id<<" "<<std::fixed<<std::setprecision(2)<<person.confidence;
+        cv::putText(canvas,text.str(),{int(b[0])+4,std::max(180,int(b[1])+25)},cv::FONT_HERSHEY_SIMPLEX,.8,{0,220,255},2,cv::LINE_AA);
+        for(auto const& a:r.door_assignments)if(a.track_id==person.track_id)
+            cv::putText(canvas,a.door_zone,{int(b[0])+4,std::max(155,int(b[1])-8)},cv::FONT_HERSHEY_SIMPLEX,.7,{0,220,255},2,cv::LINE_AA);
+        for(int s=0;s<2;++s) {
+            auto const& state=person.hands[s];auto const& k=person.selected;
+            cv::Scalar arm=s==0?cv::Scalar(40,40,255):cv::Scalar(30,230,30);
+            for(auto e:std::vector<std::pair<int,int>>{{5+s,7+s},{7+s,9+s}}) {
+                segment(canvas,point(k[e.first]),point(k[e.second]),state.limb_consensus?arm:cv::Scalar(0,140,255),3,!state.limb_consensus);
+                cv::circle(canvas,point(k[e.second]),4,arm,-1,cv::LINE_AA);
+            }
+            if(state.state=="rejected")continue;
+            int start=s==0?91:112;
+            auto hand=state.distance_eligible?(s==0?cv::Scalar(255,80,220):cv::Scalar(255,190,40)):cv::Scalar(0,140,255);
+            for(int f=0;f<5;++f)for(int j=0;j<4;++j){int a=j==0?start:start+f*4+j;int b=start+1+f*4+j;segment(canvas,point(k[a]),point(k[b]),hand,2,!state.distance_eligible);}
+            for(int j=0;j<21;++j)cv::circle(canvas,point(k[start+j]),3,hand,-1,cv::LINE_AA);
+        }
+    }
+    for(auto const& h:r.hand_regions) {
+        std::vector<cv::Point> points,hull;for(auto const& p:h.keypoints)points.push_back(point(p));cv::convexHull(points,hull);
+        auto risk=std::find_if(r.risk.regions.begin(),r.risk.regions.end(),[&](auto const& item){return item.track_id==h.track_id&&item.side==h.side;});
+        auto c=color(risk==r.risk.regions.end()?"unavailable":risk->risk_level);
+        cv::polylines(canvas,std::vector<std::vector<cv::Point>>{hull},true,c,2,cv::LINE_AA);
+    }
+    for(auto const& region:r.risk.regions)if(region.source=="YOLO_BODY_BOX_FALLBACK") {
+        auto it=std::find(r.track_ids.begin(),r.track_ids.end(),region.track_id);
+        if(it!=r.track_ids.end()){auto const& b=r.boxes.at(it-r.track_ids.begin());cv::putText(canvas,"BODY FALLBACK",{int(b[0])+4,int(b[1])+50},cv::FONT_HERSHEY_SIMPLEX,.65,{0,160,255},2,cv::LINE_AA);}
+    }
+    cv::rectangle(canvas,{0,0},{canvas.cols,148},{20,24,30},-1);
+    std::ostringstream headline;headline<<r.risk.risk_type<<" ";if(r.risk.risk_score)headline<<std::fixed<<std::setprecision(3)<<*r.risk.risk_score;else headline<<"N/A";headline<<"  "<<r.risk.risk_level;
+    cv::putText(canvas,headline.str(),{24,40},cv::FONT_HERSHEY_SIMPLEX,1.0,color(r.risk.risk_level),2,cv::LINE_AA);
+    std::ostringstream status;status<<"camera frame "<<r.frame_index<<" | seq "<<r.capture.driver_sequence<<" | latency "<<std::fixed<<std::setprecision(1)<<r.timing.capture_to_result_ms<<" ms";
+    cv::putText(canvas,status.str(),{24,82},cv::FONT_HERSHEY_SIMPLEX,.72,{235,235,235},2,cv::LINE_AA);
+    std::string calibration=r.door_mask_calibration_verified?"door calibration verified":"door calibration NOT verified (bring-up)";
+    cv::putText(canvas,calibration+" | CAN "+r.can.source+" | q/Esc: close preview",{24,123},cv::FONT_HERSHEY_SIMPLEX,.70,{0,190,255},2,cv::LINE_AA);
+    return canvas;
+}
+}

src/serialization.cpp

@@ -32,6 +32,18 @@ Json serializeResult(FrameResult const& r) {
     for(auto const& a:r.door_assignments)out["door_assignments"].push_back({{"track_id",a.track_id},{"person_index",a.person_index},{"door_zone",a.door_zone},{"raw_door_zone",a.raw_door_zone},{"front_probability",a.front_probability},{"smoothed_front_probability",a.smoothed_front_probability},{"confidence",a.confidence},{"evidence_source",a.evidence_source},{"pose_feature_count",a.pose_feature_count},{"history_frames",a.history_frames},{"features",a.features},{"feature_frontness",a.feature_frontness}});
     for(auto const& entry:r.door_risks)out["door_risks"][entry.first]=riskJson(entry.second);
     out["can"]={{"positions",r.can.positions},{"age_ms",r.can.age_ms},{"valid",r.can.valid},{"source",r.can.source},{"side",r.can.side}};
+    for(std::size_t i=0;i<r.persons.size();++i) {
+        auto const& p=r.persons[i];auto& skeleton=out["skeletons"][i];
+        skeleton["confidence"]=p.confidence;skeleton["keypoint_scores"]=Json::array();
+        skeleton["smoothed_keypoints"]=Json::array();skeleton["temporal_keypoints"]=Json::array();
+        for(std::size_t k=0;k<p.selected.size();++k) {
+            skeleton["keypoint_scores"].push_back(p.selected[k].score);
+            auto const& a=p.smoothed[k];auto const& b=p.temporal[k];
+            skeleton["smoothed_keypoints"].push_back({a.x,a.y,a.score});
+            skeleton["temporal_keypoints"].push_back({b.x,b.y,b.score});
+        }
+    }
+    out["timing"]={{"detector_ms",r.timing.detector_ms},{"pose_ms",r.timing.pose_ms},{"fusion_risk_ms",r.timing.fusion_risk_ms},{"capture_to_result_ms",r.timing.capture_to_result_ms}};
     out["capture"]={{"sequence",r.capture.driver_sequence},{"capture_monotonic_ms",r.capture.capture_monotonic_ns*1e-6},{"driver_timestamp_ms",r.capture.driver_timestamp_ns*1e-6}};
     out["capture_to_result_ms"]=rounded(r.timing.capture_to_result_ms,3);out["calibration_verified"]=r.door_mask_calibration_verified;return out;
 }

src/visualizer.cpp

@@ -3,86 +3,8 @@
 #include <opencv2/highgui.hpp>
 #include <opencv2/highgui/highgui_c.h>
 #include <opencv2/imgproc.hpp>
-#include <algorithm>
-#include <cmath>
-#include <iomanip>
-#include <sstream>
-#include <stdexcept>
-
 namespace cms {
-namespace {
-constexpr char windowName[]="CMS Camera Risk";
-cv::Point point(PosePoint const& p){return {int(std::nearbyint(p.x)),int(std::nearbyint(p.y))};}
-cv::Scalar color(std::string const& level) {
-    if(level=="danger")return {40,40,255};
-    if(level=="warning")return {0,160,255};
-    if(level=="watch")return {0,240,240};
-    if(level=="clear")return {80,220,90};
-    return {190,190,190};
-}
-void segment(cv::Mat& image,cv::Point a,cv::Point b,cv::Scalar c,int thickness,bool dashed) {
-    if(!dashed){cv::line(image,a,b,c,thickness,cv::LINE_AA);return;}
-    cv::Point2d d=b-a;double length=cv::norm(d);if(length<1)return;d*=1.0/length;
-    for(double x=0;x<length;x+=14)cv::line(image,cv::Point2d(a)+d*x,cv::Point2d(a)+d*std::min(x+8,length),c,thickness,cv::LINE_AA);
-}
-}
-cv::Mat renderResult(FrameResult const& r) {
-    if(!r.image)throw std::invalid_argument("Result has no frame image");
-    auto const& image=*r.image;
-    if(image.width<=0||image.height<=0||image.stride<image.width*3||image.pixels.size()<std::size_t(image.stride)*image.height)
-        throw std::invalid_argument("Malformed result image");
-    cv::Mat view(image.height,image.width,CV_8UC3,const_cast<std::uint8_t*>(image.pixels.data()),image.stride);
-    auto canvas=view.clone();
-    if(r.door_mask_pixels) {
-        auto const& m=*r.door_mask_pixels;
-        if(m.width!=image.width||m.height!=image.height||m.stride<m.width||m.pixels.size()<std::size_t(m.stride)*m.height)
-            throw std::invalid_argument("Result mask does not match image");
-        cv::Mat mask(m.height,m.width,CV_8U,const_cast<std::uint8_t*>(m.pixels.data()),m.stride);
-        auto tint=canvas.clone();tint.setTo(cv::Scalar(255,180,0),mask);
-        cv::addWeighted(canvas,0.75,tint,0.25,0,canvas);
-        std::vector<std::vector<cv::Point>> contours;cv::findContours(mask.clone(),contours,cv::RETR_EXTERNAL,cv::CHAIN_APPROX_SIMPLE);
-        cv::drawContours(canvas,contours,-1,{255,180,0},2);
-    }
-    for(auto const& person:r.persons) {
-        auto const& b=person.box;
-        cv::rectangle(canvas,{int(b[0]),int(b[1])},{int(b[2]),int(b[3])},{0,220,255},2);
-        std::ostringstream text;text<<"ID "<<person.track_id<<" "<<std::fixed<<std::setprecision(2)<<person.confidence;
-        cv::putText(canvas,text.str(),{int(b[0])+4,std::max(180,int(b[1])+25)},cv::FONT_HERSHEY_SIMPLEX,.8,{0,220,255},2,cv::LINE_AA);
-        for(auto const& a:r.door_assignments)if(a.track_id==person.track_id)
-            cv::putText(canvas,a.door_zone,{int(b[0])+4,std::max(155,int(b[1])-8)},cv::FONT_HERSHEY_SIMPLEX,.7,{0,220,255},2,cv::LINE_AA);
-        for(int s=0;s<2;++s) {
-            auto const& state=person.hands[s];auto const& k=person.selected;
-            cv::Scalar arm=s==0?cv::Scalar(40,40,255):cv::Scalar(30,230,30);
-            for(auto e:std::vector<std::pair<int,int>>{{5+s,7+s},{7+s,9+s}}) {
-                segment(canvas,point(k[e.first]),point(k[e.second]),state.limb_consensus?arm:cv::Scalar(0,140,255),3,!state.limb_consensus);
-                cv::circle(canvas,point(k[e.second]),4,arm,-1,cv::LINE_AA);
-            }
-            if(state.state=="rejected")continue;
-            int start=s==0?91:112;
-            auto hand=state.distance_eligible?(s==0?cv::Scalar(255,80,220):cv::Scalar(255,190,40)):cv::Scalar(0,140,255);
-            for(int f=0;f<5;++f)for(int j=0;j<4;++j){int a=j==0?start:start+f*4+j;int b=start+1+f*4+j;segment(canvas,point(k[a]),point(k[b]),hand,2,!state.distance_eligible);}
-            for(int j=0;j<21;++j)cv::circle(canvas,point(k[start+j]),3,hand,-1,cv::LINE_AA);
-        }
-    }
-    for(auto const& h:r.hand_regions) {
-        std::vector<cv::Point> points,hull;for(auto const& p:h.keypoints)points.push_back(point(p));cv::convexHull(points,hull);
-        auto risk=std::find_if(r.risk.regions.begin(),r.risk.regions.end(),[&](auto const& item){return item.track_id==h.track_id&&item.side==h.side;});
-        auto c=color(risk==r.risk.regions.end()?"unavailable":risk->risk_level);
-        cv::polylines(canvas,std::vector<std::vector<cv::Point>>{hull},true,c,2,cv::LINE_AA);
-    }
-    for(auto const& region:r.risk.regions)if(region.source=="YOLO_BODY_BOX_FALLBACK") {
-        auto it=std::find(r.track_ids.begin(),r.track_ids.end(),region.track_id);
-        if(it!=r.track_ids.end()){auto const& b=r.boxes.at(it-r.track_ids.begin());cv::putText(canvas,"BODY FALLBACK",{int(b[0])+4,int(b[1])+50},cv::FONT_HERSHEY_SIMPLEX,.65,{0,160,255},2,cv::LINE_AA);}
-    }
-    cv::rectangle(canvas,{0,0},{canvas.cols,148},{20,24,30},-1);
-    std::ostringstream headline;headline<<r.risk.risk_type<<" ";if(r.risk.risk_score)headline<<std::fixed<<std::setprecision(3)<<*r.risk.risk_score;else headline<<"N/A";headline<<"  "<<r.risk.risk_level;
-    cv::putText(canvas,headline.str(),{24,40},cv::FONT_HERSHEY_SIMPLEX,1.0,color(r.risk.risk_level),2,cv::LINE_AA);
-    std::ostringstream status;status<<"camera frame "<<r.frame_index<<" | seq "<<r.capture.driver_sequence<<" | latency "<<std::fixed<<std::setprecision(1)<<r.timing.capture_to_result_ms<<" ms";
-    cv::putText(canvas,status.str(),{24,82},cv::FONT_HERSHEY_SIMPLEX,.72,{235,235,235},2,cv::LINE_AA);
-    std::string calibration=r.door_mask_calibration_verified?"door calibration verified":"door calibration NOT verified (bring-up)";
-    cv::putText(canvas,calibration+" | CAN "+r.can.source+" | q/Esc: close preview",{24,123},cv::FONT_HERSHEY_SIMPLEX,.70,{0,190,255},2,cv::LINE_AA);
-    return canvas;
-}
+namespace { constexpr char windowName[]="CMS Camera Risk"; }
 void runLocalVisualization(CameraPipeline const& pipeline) {
     struct Window {
         Window(){cv::namedWindow(windowName,cv::WINDOW_NORMAL);cv::resizeWindow(windowName,1000,800);}