generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2438 from ilya-lavrenov:tapi_flip

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-03-07 13:54:34 +04:00 committed by OpenCV Buildbot
commit 5dbe73f94d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/core/src/copy.cpp
View File

@ -481,14 +481,13 @@ enum { FLIP_COLS = 1 << 0, FLIP_ROWS = 1 << 1, FLIP_BOTH = FLIP_ROWS | FLIP_COLS
static bool ocl_flip(InputArray _src, OutputArray _dst, int flipCode ) static bool ocl_flip(InputArray _src, OutputArray _dst, int flipCode )
{ {
int type = _src.type(), cn = CV_MAT_CN(type); CV_Assert(flipCode >= - 1 && flipCode <= 1);
int type = _src.type(), cn = CV_MAT_CN(type), flipType;
if (cn > 4 || cn == 3) if (cn > 4 || cn == 3)
return false; return false;
const char * kernelName; const char * kernelName;
int flipType;
if (flipCode == 0) if (flipCode == 0)
kernelName = "arithm_flip_rows", flipType = FLIP_ROWS; kernelName = "arithm_flip_rows", flipType = FLIP_ROWS;
else if (flipCode > 0) else if (flipCode > 0)
@ -514,11 +513,16 @@ static bool ocl_flip(InputArray _src, OutputArray _dst, int flipCode )
_dst.create(size, type); _dst.create(size, type);
UMat src = _src.getUMat(), dst = _dst.getUMat(); UMat src = _src.getUMat(), dst = _dst.getUMat();
cols = flipType == FLIP_COLS ? ((cols+1)/2) : cols; cols = flipType == FLIP_COLS ? (cols + 1) >> 1 : cols;
rows = flipType & FLIP_ROWS ? ((rows+1)/2) : rows; rows = flipType & FLIP_ROWS ? (rows + 1) >> 1 : rows;
size_t globalsize[2] = { cols, rows }; k.args(ocl::KernelArg::ReadOnlyNoSize(src),
return k.args(ocl::KernelArg::ReadOnlyNoSize(src), ocl::KernelArg::WriteOnly(dst), rows, cols).run(2, globalsize, NULL, false); ocl::KernelArg::WriteOnly(dst), rows, cols);
size_t maxWorkGroupSize = ocl::Device::getDefault().maxWorkGroupSize();
CV_Assert(maxWorkGroupSize % 4 == 0);
size_t globalsize[2] = { cols, rows }, localsize[2] = { maxWorkGroupSize / 4, 4 };
return k.run(2, globalsize, flipType == FLIP_COLS ? localsize : NULL, false);
} }
#endif #endif