mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-02-26 01:43:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

replay: fix hanging on exit if stream thread has not been started yet (#22770)

Browse Source
This commit is contained in:
Dean Lee
2021-11-02 07:06:39 +08:00
committed by GitHub
parent 6de66f2832
commit 6f78cc77fc
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
selfdrive/ui/replay/filereader.cc
View File

@@ -18,7 +18,7 @@ std::string cacheFilePath(const std::string &url) {
return comma_cache.back() == '/' ? comma_cache : comma_cache + "/";
}();
return cache_path + sha256(getUrlWithoutQuery(url));;
return cache_path + sha256(getUrlWithoutQuery(url));
}
std::string FileReader::read(const std::string &file, std::atomic<bool> *abort) {

1
selfdrive/ui/replay/framereader.cc
View File

@@ -44,7 +44,6 @@ FrameReader::FrameReader(bool local_cache, int chunk_size, int retries) : FileRe
av_frame_ = av_frame_alloc();
rgb_frame_ = av_frame_alloc();
yuv_frame_ = av_frame_alloc();;
}
FrameReader::~FrameReader() {

15
selfdrive/ui/replay/replay.cc
View File

@@ -41,15 +41,16 @@ Replay::~Replay() {
}
void Replay::stop() {
if (stream_thread_ == nullptr) return;
if (!stream_thread_ && segments_.empty()) return;
qDebug() << "shutdown: in progress...";
exit_ = updating_events_ = true;
stream_cv_.notify_one();
stream_thread_->quit();
stream_thread_->wait();
stream_thread_ = nullptr;
if (stream_thread_ != nullptr) {
exit_ = updating_events_ = true;
stream_cv_.notify_one();
stream_thread_->quit();
stream_thread_->wait();
stream_thread_ = nullptr;
}
segments_.clear();
camera_server_.reset(nullptr);
qDebug() << "shutdown: done";