replay: send frames based on encodeIdx packet (#22361)

* send frames based on encodeIdx

* use start of frame time if set

* also use end of frame if set

* fix timestamp for encode packets

* handle all cameras

* add comment

* add twice

selfdrive/ui/replay/logreader.cc

@@ -38,27 +38,20 @@ bool LogReader::load(const std::string &file) {
     return false;
   }
 
-  auto insertEidx = [&](CameraType type, const cereal::EncodeIndex::Reader &e) {
-    eidx[type][e.getFrameId()] = {e.getSegmentNum(), e.getSegmentId()};
-  };
-
   kj::ArrayPtr<const capnp::word> words((const capnp::word *)raw_.data(), raw_.size() / sizeof(capnp::word));
   while (words.size() > 0) {
     try {
       std::unique_ptr<Event> evt = std::make_unique<Event>(words);
-      switch (evt->which) {
-        case cereal::Event::ROAD_ENCODE_IDX:
-          insertEidx(RoadCam, evt->event.getRoadEncodeIdx());
-          break;
-        case cereal::Event::DRIVER_ENCODE_IDX:
-          insertEidx(DriverCam, evt->event.getDriverEncodeIdx());
-          break;
-        case cereal::Event::WIDE_ROAD_ENCODE_IDX:
-          insertEidx(WideRoadCam, evt->event.getWideRoadEncodeIdx());
-          break;
-        default:
-          break;
+
+      // Add encodeIdx packet again as a frame packet for the video stream
+      if (evt->which == cereal::Event::ROAD_ENCODE_IDX ||
+          evt->which == cereal::Event::DRIVER_ENCODE_IDX ||
+          evt->which == cereal::Event::WIDE_ROAD_ENCODE_IDX) {
+
+          std::unique_ptr<Event> frame_evt = std::make_unique<Event>(words, true);
+          events.push_back(frame_evt.release());
       }
+
       words = kj::arrayPtr(evt->reader.getEnd(), words.end());
       events.push_back(evt.release());
     } catch (const kj::Exception &e) {

selfdrive/ui/replay/logreader.h

@@ -2,6 +2,7 @@
 
 #include <unordered_map>
 #include <vector>
+#include <cassert>
 
 #include <capnp/serialize.h>
 #include "cereal/gen/cpp/log.capnp.h"
@@ -9,10 +10,7 @@
 
 const CameraType ALL_CAMERAS[] = {RoadCam, DriverCam, WideRoadCam};
 const int MAX_CAMERAS = std::size(ALL_CAMERAS);
-struct EncodeIdx {
-  int segmentNum;
-  uint32_t frameEncodeId;
-};
+
 class Event {
 public:
   Event(cereal::Event::Which which, uint64_t mono_time) : reader(kj::ArrayPtr<capnp::word>{}) {
@@ -20,11 +18,35 @@ public:
     this->which = which;
     this->mono_time = mono_time;
   }
-  Event(const kj::ArrayPtr<const capnp::word> &amsg) : reader(amsg) {
+  Event(const kj::ArrayPtr<const capnp::word> &amsg, bool frame=false) : reader(amsg), frame(frame) {
     words = kj::ArrayPtr<const capnp::word>(amsg.begin(), reader.getEnd());
     event = reader.getRoot<cereal::Event>();
     which = event.which();
     mono_time = event.getLogMonoTime();
+
+    // 1) Send video data at t=timestampEof/timestampSof
+    // 2) Send encodeIndex packet at t=logMonoTime
+    if (frame) {
+      cereal::EncodeIndex::Reader idx;
+      if (which == cereal::Event::ROAD_ENCODE_IDX) {
+        idx = event.getRoadEncodeIdx();
+      } else if (which == cereal::Event::DRIVER_ENCODE_IDX) {
+        idx = event.getDriverEncodeIdx();
+      } else if (which == cereal::Event::WIDE_ROAD_ENCODE_IDX) {
+        idx = event.getWideRoadEncodeIdx();
+      } else {
+        assert(false);
+      }
+
+      // C2 only has eof set, and some older routes have neither
+      uint64_t sof = idx.getTimestampSof();
+      uint64_t eof = idx.getTimestampEof();
+      if (sof > 0) {
+        mono_time = sof;
+      } else if (eof > 0) {
+        mono_time = eof;
+      }
+    }
   }
   inline kj::ArrayPtr<const capnp::byte> bytes() const { return words.asBytes(); }
 
@@ -39,6 +61,7 @@ public:
   cereal::Event::Reader event;
   capnp::FlatArrayMessageReader reader;
   kj::ArrayPtr<const capnp::word> words;
+  bool frame;
 };
 
 class LogReader {
@@ -48,7 +71,6 @@ public:
   bool load(const std::string &file);
 
   std::vector<Event*> events;
-  std::unordered_map<uint32_t, EncodeIdx> eidx[MAX_CAMERAS] = {};
 
 private:
   std::vector<uint8_t> raw_;

selfdrive/ui/replay/replay.cc

@@ -150,19 +150,14 @@ void Replay::mergeSegments(int cur_seg, int end_idx) {
 
     // merge & sort events
     std::vector<Event *> *new_events = new std::vector<Event *>();
-    std::unordered_map<uint32_t, EncodeIdx> *new_eidx = new std::unordered_map<uint32_t, EncodeIdx>[MAX_CAMERAS];
     for (int n : segments_need_merge) {
       auto &log = segments_[n]->log;
       auto middle = new_events->insert(new_events->end(), log->events.begin(), log->events.end());
       std::inplace_merge(new_events->begin(), middle, new_events->end(), Event::lessThan());
-      for (CameraType cam_type : ALL_CAMERAS) {
-        new_eidx[cam_type].insert(log->eidx[cam_type].begin(), log->eidx[cam_type].end());
-      }
     }
 
     // update events
     auto prev_events = events_;
-    auto prev_eidx = eidx_;
     updateEvents([&]() {
       if (route_start_ts_ == 0) {
         // get route start time from initData
@@ -174,12 +169,10 @@ void Replay::mergeSegments(int cur_seg, int end_idx) {
       }
 
       events_ = new_events;
-      eidx_ = new_eidx;
       segments_merged_ = segments_need_merge;
       return true;
     });
     delete prev_events;
-    delete[] prev_eidx;
   }
 
   // free segments out of current semgnt window.
@@ -239,14 +232,15 @@ void Replay::stream() {
         }
 
         // publish frame
+        if (evt->frame) {
           // TODO: publish all frames
-        if (evt->which == cereal::Event::ROAD_CAMERA_STATE) {
-          auto it_ = eidx_[RoadCam].find(evt->event.getRoadCameraState().getFrameId());
-          if (it_ != eidx_[RoadCam].end()) {
-            EncodeIdx &e = it_->second;
-            auto &seg = segments_[e.segmentNum]; 
-            if (seg && seg->isLoaded()) {
+          if (evt->which == cereal::Event::ROAD_ENCODE_IDX) {
+            auto idx = evt->event.getRoadEncodeIdx();
+            auto &seg = segments_[idx.getSegmentNum()];
+
+            if (seg && seg->isLoaded() && idx.getType() == cereal::EncodeIndex::Type::FULL_H_E_V_C) {
               auto &frm = seg->frames[RoadCam];
+
               if (vipc_server == nullptr) {
                 cl_device_id device_id = cl_get_device_id(CL_DEVICE_TYPE_DEFAULT);
                 cl_context context = CL_CHECK_ERR(clCreateContext(NULL, 1, &device_id, NULL, NULL, &err));
@@ -257,7 +251,7 @@ void Replay::stream() {
                 vipc_server->start_listener();
               }
 
-              uint8_t *dat = frm->get(e.frameEncodeId);
+              uint8_t *dat = frm->get(idx.getSegmentId());
               if (dat) {
                 VisionIpcBufExtra extra = {};
                 VisionBuf *buf = vipc_server->get_buffer(VisionStreamType::VISION_STREAM_RGB_BACK);
@@ -266,9 +260,9 @@ void Replay::stream() {
               }
             }
           }
-        }
 
         // publish msg
+        } else {
           if (sm == nullptr) {
             auto bytes = evt->bytes();
             pm->send(type.c_str(), (capnp::byte *)bytes.begin(), bytes.size());
@@ -278,4 +272,5 @@ void Replay::stream() {
         }
       }
     }
+  }
 }

selfdrive/ui/replay/replay.h

@@ -48,7 +48,6 @@ protected:
   uint64_t route_start_ts_ = 0;
   uint64_t cur_mono_time_ = 0;
   std::vector<Event *> *events_ = nullptr;
-  std::unordered_map<uint32_t, EncodeIdx> *eidx_ = nullptr;
   std::vector<std::unique_ptr<Segment>> segments_;
   std::vector<int> segments_merged_;