replay: do not use OpenCL (#22431)

pull/22434/head
Willem Melching 4 years ago committed by GitHub
parent 037624de60
commit 94afd0ea0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      selfdrive/ui/replay/camera.cc
  2. 2
      selfdrive/ui/replay/camera.h

@ -6,8 +6,6 @@
const int YUV_BUF_COUNT = 50; const int YUV_BUF_COUNT = 50;
CameraServer::CameraServer() { CameraServer::CameraServer() {
device_id_ = cl_get_device_id(CL_DEVICE_TYPE_DEFAULT);
context_ = CL_CHECK_ERR(clCreateContext(nullptr, 1, &device_id_, nullptr, nullptr, &err));
camera_thread_ = std::thread(&CameraServer::thread, this); camera_thread_ = std::thread(&CameraServer::thread, this);
} }
@ -15,12 +13,11 @@ CameraServer::~CameraServer() {
queue_.push({}); queue_.push({});
camera_thread_.join(); camera_thread_.join();
vipc_server_.reset(nullptr); vipc_server_.reset(nullptr);
CL_CHECK(clReleaseContext(context_));
} }
void CameraServer::startVipcServer() { void CameraServer::startVipcServer() {
std::cout << (vipc_server_ ? "start" : "restart") << " vipc server" << std::endl; std::cout << (vipc_server_ ? "start" : "restart") << " vipc server" << std::endl;
vipc_server_.reset(new VisionIpcServer("camerad", device_id_, context_)); vipc_server_.reset(new VisionIpcServer("camerad"));
for (auto &cam : cameras_) { for (auto &cam : cameras_) {
if (cam.width > 0 && cam.height > 0) { if (cam.width > 0 && cam.height > 0) {
vipc_server_->create_buffers(cam.rgb_type, UI_BUF_COUNT, true, cam.width, cam.height); vipc_server_->create_buffers(cam.rgb_type, UI_BUF_COUNT, true, cam.width, cam.height);

@ -33,8 +33,6 @@ protected:
{.rgb_type = VISION_STREAM_RGB_FRONT, .yuv_type = VISION_STREAM_YUV_FRONT}, {.rgb_type = VISION_STREAM_RGB_FRONT, .yuv_type = VISION_STREAM_YUV_FRONT},
{.rgb_type = VISION_STREAM_RGB_WIDE, .yuv_type = VISION_STREAM_YUV_WIDE}, {.rgb_type = VISION_STREAM_RGB_WIDE, .yuv_type = VISION_STREAM_YUV_WIDE},
}; };
cl_device_id device_id_;
cl_context context_;
std::thread camera_thread_; std::thread camera_thread_;
std::unique_ptr<VisionIpcServer> vipc_server_; std::unique_ptr<VisionIpcServer> vipc_server_;
SafeQueue<std::tuple<CameraType, FrameReader*, const cereal::EncodeIndex::Reader>> queue_; SafeQueue<std::tuple<CameraType, FrameReader*, const cereal::EncodeIndex::Reader>> queue_;

Loading…
Cancel
Save