diff --git a/selfdrive/ui/qt/widgets/cameraview.cc b/selfdrive/ui/qt/widgets/cameraview.cc index 43282dd765..c151191c61 100644 --- a/selfdrive/ui/qt/widgets/cameraview.cc +++ b/selfdrive/ui/qt/widgets/cameraview.cc @@ -103,7 +103,6 @@ mat4 get_fit_view_transform(float widget_aspect_ratio, float frame_aspect_ratio) CameraViewWidget::CameraViewWidget(std::string stream_name, VisionStreamType type, bool zoom, QWidget* parent) : stream_name(stream_name), stream_type(type), zoomed_view(zoom), QOpenGLWidget(parent) { setAttribute(Qt::WA_OpaquePaintEvent); - qRegisterMetaType("uint32_t"); connect(this, &CameraViewWidget::vipcThreadConnected, this, &CameraViewWidget::vipcConnected, Qt::BlockingQueuedConnection); connect(this, &CameraViewWidget::vipcThreadFrameReceived, this, &CameraViewWidget::vipcFrameReceived); } @@ -222,7 +221,7 @@ void CameraViewWidget::paintGL() { if (frames.size() == 0) return; VisionBuf *latest_frame; - std::deque::iterator it = std::find(frame_ids.begin(), frame_ids.end(), draw_frame_id); + std::deque::iterator it = std::find(frame_ids.begin(), frame_ids.end(), draw_frame_id); if (it == frame_ids.end()) { latest_frame = frames[frames.size() - 1]; } else { @@ -277,7 +276,7 @@ void CameraViewWidget::vipcConnected(VisionIpcClient *vipc_client) { updateFrameMat(width(), height()); } -void CameraViewWidget::vipcFrameReceived(VisionBuf *buf, uint32_t frame_id) { +void CameraViewWidget::vipcFrameReceived(VisionBuf *buf, quint32 frame_id) { frames.push_back(buf); frame_ids.push_back(frame_id); while (frames.size() > FRAME_BUFFER_LEN) { diff --git a/selfdrive/ui/qt/widgets/cameraview.h b/selfdrive/ui/qt/widgets/cameraview.h index 9f093ce20c..29050538a0 100644 --- a/selfdrive/ui/qt/widgets/cameraview.h +++ b/selfdrive/ui/qt/widgets/cameraview.h @@ -19,12 +19,12 @@ public: ~CameraViewWidget(); void setStreamType(VisionStreamType type) { stream_type = type; } void setBackgroundColor(const QColor &color) { bg = color; } - uint32_t draw_frame_id; + quint32 draw_frame_id; signals: void clicked(); void vipcThreadConnected(VisionIpcClient *); - void vipcThreadFrameReceived(VisionBuf *, uint32_t); + void vipcThreadFrameReceived(VisionBuf *, quint32); protected: void paintGL() override; @@ -38,7 +38,7 @@ protected: bool zoomed_view; std::deque frames; - std::deque frame_ids; + std::deque frame_ids; GLuint frame_vao, frame_vbo, frame_ibo; mat4 frame_mat; std::unique_ptr program; @@ -54,5 +54,5 @@ protected: protected slots: void vipcConnected(VisionIpcClient *vipc_client); - void vipcFrameReceived(VisionBuf *vipc_client, uint32_t frame_id); + void vipcFrameReceived(VisionBuf *vipc_client, quint32 frame_id); };