From f7b83d6f02dd87df70f322ff20172d4356e1ca51 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Sat, 17 Sep 2022 12:10:26 +0800 Subject: [PATCH] camerad: make sure cl_context is valid for lifetime of camerad (#25735) old-commit-hash: 8ae3199578b3f771396cd35315ce51b7cce27e49 --- system/camerad/cameras/camera_common.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/system/camerad/cameras/camera_common.cc b/system/camerad/cameras/camera_common.cc index 787fd99306..580c4bc5ee 100644 --- a/system/camerad/cameras/camera_common.cc +++ b/system/camerad/cameras/camera_common.cc @@ -336,15 +336,17 @@ void camerad_thread() { cl_context context = CL_CHECK_ERR(clCreateContext(NULL, 1, &device_id, NULL, NULL, &err)); #endif - MultiCameraState cameras = {}; - VisionIpcServer vipc_server("camerad", device_id, context); + { + MultiCameraState cameras = {}; + VisionIpcServer vipc_server("camerad", device_id, context); - cameras_open(&cameras); - cameras_init(&vipc_server, &cameras, device_id, context); + cameras_open(&cameras); + cameras_init(&vipc_server, &cameras, device_id, context); - vipc_server.start_listener(); + vipc_server.start_listener(); - cameras_run(&cameras); + cameras_run(&cameras); + } CL_CHECK(clReleaseContext(context)); }