mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17294 from alalek:issue_17247

Browse Source
This commit is contained in:
Alexander Alekhin 2020-05-16 18:49:22 +00:00
commit de720ac34a
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
samples/opencl/opencl-opencv-interop.cpp
View File

@ -468,7 +468,6 @@ private:
cl_kernel m_kernelImg; cl_kernel m_kernelImg;
cl_mem m_img_src; // used as src in case processing of cl image cl_mem m_img_src; // used as src in case processing of cl image
cl_mem m_mem_obj; cl_mem m_mem_obj;
cl_event m_event;
}; };
@ -498,7 +497,6 @@ App::App(CommandLineParser& cmd)
m_kernelImg = 0; m_kernelImg = 0;
m_img_src = 0; m_img_src = 0;
m_mem_obj = 0; m_mem_obj = 0;
m_event = 0;
} // ctor } // ctor
@ -529,11 +527,6 @@ App::~App()
m_mem_obj = 0; m_mem_obj = 0;
} }
if (m_event)
{
clReleaseEvent(m_event);
}
if (m_kernelBuf) if (m_kernelBuf)
{ {
clReleaseKernel(m_kernelBuf); clReleaseKernel(m_kernelBuf);
@ -775,11 +768,13 @@ int App::process_frame_with_open_cl(cv::Mat& frame, bool use_buffer, cl_mem* mem
size_t origin[] = { 0, 0, 0 }; size_t origin[] = { 0, 0, 0 };
size_t region[] = { (size_t)frame.cols, (size_t)frame.rows, 1 }; size_t region[] = { (size_t)frame.cols, (size_t)frame.rows, 1 };
res = clEnqueueCopyImage(m_queue, m_img_src, mem, origin, origin, region, 0, 0, &m_event); cl_event asyncEvent = 0;
res = clEnqueueCopyImage(m_queue, m_img_src, mem, origin, origin, region, 0, 0, &asyncEvent);
if (CL_SUCCESS != res) if (CL_SUCCESS != res)
return -1; return -1;
res = clWaitForEvents(1, &m_event); res = clWaitForEvents(1, &asyncEvent);
clReleaseEvent(asyncEvent);
if (CL_SUCCESS != res) if (CL_SUCCESS != res)
return -1; return -1;
@ -795,19 +790,17 @@ int App::process_frame_with_open_cl(cv::Mat& frame, bool use_buffer, cl_mem* mem
} }
} }
m_event = clCreateUserEvent(m_context, &res);
if (0 == m_event || CL_SUCCESS != res)
return -1;
// process left half of frame in OpenCL // process left half of frame in OpenCL
size_t size[] = { (size_t)frame.cols / 2, (size_t)frame.rows }; size_t size[] = { (size_t)frame.cols / 2, (size_t)frame.rows };
res = clEnqueueNDRangeKernel(m_queue, kernel, 2, 0, size, 0, 0, 0, &m_event); cl_event asyncEvent = 0;
res = clEnqueueNDRangeKernel(m_queue, kernel, 2, 0, size, 0, 0, 0, &asyncEvent);
if (CL_SUCCESS != res) if (CL_SUCCESS != res)
return -1; return -1;
res = clWaitForEvents(1, &m_event); res = clWaitForEvents(1, &asyncEvent);
clReleaseEvent(asyncEvent);
if (CL_SUCCESS != res) if (CL_SUCCESS != res)
return - 1; return -1;
mem_obj[0] = mem; mem_obj[0] = mem;