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

ui: destroy egl_images in main thread (#30253)

Browse Source 
* call eglDestroyImageKHR in ui thread

* assert
This commit is contained in:
Dean Lee
2023-12-14 12:18:45 +08:00
committed by GitHub
parent 5f24078a48
commit dbda641cee
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
selfdrive/ui/qt/widgets/cameraview.cc
View File

@@ -187,12 +187,23 @@ void CameraWidget::showEvent(QShowEvent *event) {
}
void CameraWidget::stopVipcThread() {
makeCurrent();
if (vipc_thread) {
vipc_thread->requestInterruption();
vipc_thread->quit();
vipc_thread->wait();
vipc_thread = nullptr;
}
#ifdef QCOM2
EGLDisplay egl_display = eglGetCurrentDisplay();
assert(egl_display != EGL_NO_DISPLAY);
for (auto &pair : egl_images) {
eglDestroyImageKHR(egl_display, pair.second);
assert(eglGetError() == EGL_SUCCESS);
}
egl_images.clear();
#endif
}
void CameraWidget::availableStreamsUpdated(std::set<VisionStreamType> streams) {
@@ -323,8 +334,8 @@ void CameraWidget::vipcConnected(VisionIpcClient *vipc_client) {
stream_stride = vipc_client->buffers[0].stride;
#ifdef QCOM2
egl_display = eglGetCurrentDisplay();
EGLDisplay egl_display = eglGetCurrentDisplay();
assert(egl_display != EGL_NO_DISPLAY);
for (auto &pair : egl_images) {
eglDestroyImageKHR(egl_display, pair.second);
}
@@ -415,13 +426,6 @@ void CameraWidget::vipcThread() {
}
}
}
#ifdef QCOM2
for (auto &pair : egl_images) {
eglDestroyImageKHR(egl_display, pair.second);
}
egl_images.clear();
#endif
}
void CameraWidget::clearFrames() {

1
selfdrive/ui/qt/widgets/cameraview.h
View File

@@ -70,7 +70,6 @@ protected:
QColor bg = QColor("#000000");
#ifdef QCOM2
EGLDisplay egl_display;
std::map<int, EGLImageKHR> egl_images;
#endif