mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-03-04 03:13:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

cabana: fix incorrect current ts in live stream mode (#27578)

Browse Source
This commit is contained in:
Dean Lee
2023-03-15 02:31:57 +08:00
committed by GitHub
parent 0afd3bab34
commit 696cbb3e24
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/cabana/streams/livestream.cc
View File

@@ -45,12 +45,11 @@ void LiveStream::streamThread() {
}
void LiveStream::handleEvent(Event *evt) {
current_ts = evt->mono_time;
if (start_ts == 0 || current_ts < start_ts) {
if (current_ts < start_ts) {
if (start_ts == 0 || evt->mono_time < start_ts) {
if (evt->mono_time < start_ts) {
qDebug() << "stream is looping back to old time stamp";
}
start_ts = current_ts.load();
start_ts = current_ts = evt->mono_time;
emit streamStarted();
}
@@ -58,19 +57,19 @@ void LiveStream::handleEvent(Event *evt) {
can_events.push_back(evt);
if (!pause_) {
if (speed_ < 1 && last_update_ts > 0) {
auto it = std::upper_bound(can_events.begin(), can_events.end(), last_update_event_ts, [](uint64_t ts, auto &e) {
auto it = std::upper_bound(can_events.cbegin(), can_events.cend(), current_ts, [](uint64_t ts, auto &e) {
return ts < e->mono_time;
});
if (it != can_events.cend()) {
bool skip = (nanos_since_boot() - last_update_ts) < ((*it)->mono_time - current_ts) / speed_;
if (skip) return;
if (it != can_events.end() &&
(nanos_since_boot() - last_update_ts) < ((*it)->mono_time - last_update_event_ts) / speed_) {
return;
evt = *it;
}
evt = (*it);
}
updateEvent(evt);
last_update_event_ts = evt->mono_time;
current_ts = evt->mono_time;
last_update_ts = nanos_since_boot();
updateEvent(evt);
}
}

1
tools/cabana/streams/livestream.h
View File

@@ -32,7 +32,6 @@ protected:
std::atomic<uint64_t> current_ts = 0;
std::atomic<float> speed_ = 1;
std::atomic<bool> pause_ = false;
uint64_t last_update_event_ts = 0;
uint64_t last_update_ts = 0;
const QString zmq_address;