mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10410 from GlueCrow:master

Browse Source
This commit is contained in:
Alexander Alekhin 2017-12-28 16:43:17 +00:00
commit 125f9f0be1
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/video/src/opencl/bgfg_mog2.cl
View File

@ -11,11 +11,6 @@
#define meanToFrame(a, b) *b = (float)a; #define meanToFrame(a, b) *b = (float)a;
#endif #endif
inline float sum(float val)
{
return val;
}
#else #else
#define T_MEAN float4 #define T_MEAN float4
@ -40,11 +35,6 @@ inline float sum(float val)
b.z = a[2]; \ b.z = a[2]; \
b.w = 0.0f; b.w = 0.0f;
inline float sum(const float4 val)
{
return (val.x + val.y + val.z);
}
#endif #endif
__kernel void mog2_kernel(__global const uchar* frame, int frame_step, int frame_offset, int frame_row, int frame_col, //uchar || uchar3 __kernel void mog2_kernel(__global const uchar* frame, int frame_step, int frame_offset, int frame_row, int frame_col, //uchar || uchar3
@ -210,9 +200,7 @@ __kernel void mog2_kernel(__global const uchar* frame, int frame_step, int frame
int mode_idx = mad24(mode, idx_step, pt_idx); int mode_idx = mad24(mode, idx_step, pt_idx);
T_MEAN c_mean = _mean[mode_idx]; T_MEAN c_mean = _mean[mode_idx];
T_MEAN pix_mean = pix * c_mean; float numerator = dot(pix, c_mean);
float numerator = sum(pix_mean);
float denominator = dot(c_mean, c_mean); float denominator = dot(c_mean, c_mean);
if (denominator == 0) if (denominator == 0)