removed division

diff --git a/modules/gpu/src/cascadeclassifier.cpp b/modules/gpu/src/cascadeclassifier.cpp
index d340593..594a5f7 100644 (file)
--- a/modules/gpu/src/cascadeclassifier.cpp
+++ b/modules/gpu/src/cascadeclassifier.cpp
@@ -371,8 +371,9 @@ int cv::gpu::CascadeClassifier_GPU_LBP::detectMultiScale(const GpuMat& image, Gp
     {\r
         int acc = level.sFrame.width + 1;\r
         float iniScale = level.scale;\r
+\r
         cv::Size area = level.workArea;\r
-        float step = (float)(1 + (level.scale <= 2.f));\r
+        int step = 1 + (level.scale <= 2.f);\r
 \r
         int total = 0, prev  = 0;\r
 \r
@@ -387,19 +388,22 @@ int cv::gpu::CascadeClassifier_GPU_LBP::detectMultiScale(const GpuMat& image, Gp
             gpu::resize(image, src, level.sFrame, 0, 0, CV_INTER_LINEAR);\r
             gpu::integralBuffered(src, sint, buff);\r
 \r
-            total += cvCeil(area.width / step) * cvCeil(area.height / step);\r
-            // std::cout << "Total for scale: " << total <<  " this step contribution " <<  cvCeil(area.width / step) * cvCeil(area.height / step) << " previous width shift " << prev << " acc " <<  acc << " scales: " << cvCeil(area.width / step) << std::endl;\r
+            // calculate job\r
+            int totalWidth = level.workArea.width / step;\r
+            // totalWidth  = ((totalWidth + WARP_MASK) / WARP_SIZE) << WARP_LOG;\r
+\r
+            total += totalWidth * (level.workArea.height / step);\r
 \r
-            // increment pyr lavel\r
+            // go to next pyramide level\r
             level = level.next(scaleFactor, image.size(), NxM);\r
             area = level.workArea;\r
 \r
-            step =  (float)(1 + (level.scale <= 2.f));\r
+            step = (1 + (level.scale <= 2.f));\r
             prev = acc;\r
             acc += level.sFrame.width + 1;\r
         }\r
 \r
-        device::lbp::classifyPyramid(image.cols, image.rows, NxM.width, NxM.height, iniScale, scaleFactor, total, stage_mat, stage_mat.cols / sizeof(Stage), nodes_mat,\r
+        device::lbp::classifyPyramid(image.cols, image.rows, NxM.width - 1, NxM.height - 1, iniScale, scaleFactor, total, stage_mat, stage_mat.cols / sizeof(Stage), nodes_mat,\r
             leaves_mat, subsets_mat, features_mat, subsetSize, candidates, dclassified.ptr<unsigned int>(), integral);\r
     }\r
 \r
@@ -412,8 +416,6 @@ int cv::gpu::CascadeClassifier_GPU_LBP::detectMultiScale(const GpuMat& image, Gp
     // candidates.copyTo(objects);\r
     cudaSafeCall( cudaMemcpy(&classified, dclassified.ptr(), sizeof(int), cudaMemcpyDeviceToHost) );\r
     cudaSafeCall( cudaDeviceSynchronize() );\r
-    // std::cout << classified << " !!!!!!!!!!" <<  std::endl;\r
-\r
     return classified;\r
 }\r
 \r

diff --git a/modules/gpu/src/cuda/lbp.cu b/modules/gpu/src/cuda/lbp.cu
index bb65e26..bbbe0bf 100644 (file)
--- a/modules/gpu/src/cuda/lbp.cu
+++ b/modules/gpu/src/cuda/lbp.cu
@@ -240,59 +240,47 @@ namespace cv { namespace gpu { namespace device
 
         // stepShift, scale, width_k, sum_prev => y =  sum_prev + tid_k / width_k, x = tid_k - tid_k / width_k
         __global__ void lbp_cascade(const Cascade cascade, int frameW, int frameH, int windowW, int windowH, float scale, const float factor,
-            const int workAmount, int* integral, const int pitch, DevMem2D_<int4> objects, unsigned int* classified)
+            const int total, int* integral, const int pitch, DevMem2D_<int4> objects, unsigned int* classified)
         {
             int ftid = blockIdx.x * blockDim.x + threadIdx.x;
-            if (ftid >= workAmount ) return;
+            if (ftid >= total) return;
 
-            int sum = 0;
-            // float scale = 1.0f;
-            float stepShift = (scale <= 2.f) ? 2.0 : 1.0;
-            int w = ceilf( ( __float2int_rn(frameW / scale) - windowW + 1) / stepShift);
-            int h = ceilf( ( __float2int_rn(frameH / scale) - windowH + 1) / stepShift);
+            int step = (scale <= 2.f);
 
-            // if (!ftid)
-                // printf("!!!!: %d %d", w, h);
+            int windowsForLine = (__float2int_rn( __fdividef(frameW, scale)) - windowW) >> step;
+            int stotal = windowsForLine * ( (__float2int_rn( __fdividef(frameH, scale)) - windowH) >> step);
+            int wshift = 0;
 
-            int framTid = ftid;
-            int i = 0;
+            int scaleTid = ftid;
 
-            while (1)
+            while (scaleTid >= stotal)
             {
-                if (framTid < (w - 1) * (h - 1)) break;
-                i++;
-                sum +=  __float2int_rn(frameW / scale) + 1;
-                framTid -= w * h;
+                scaleTid -= stotal;
+                wshift += __float2int_rn(__fdividef(frameW, scale)) + 1;
                 scale *= factor;
-                stepShift = (scale <= 2.f) ? 2.0 : 1.0;
-                int w = ceilf( ( __float2int_rn(frameW / scale) - windowW + 1) / stepShift);
-                int h = ceilf( ( __float2int_rn(frameH / scale) - windowH + 1) / stepShift);
+                step = (scale <= 2.f);
+                windowsForLine = ( ((__float2int_rn(__fdividef(frameW, scale)) - windowW) >> step));
+                stotal = windowsForLine * ( (__float2int_rn(__fdividef(frameH, scale)) - windowH) >> step);
             }
 
-            int y = (framTid / w);
-            int x = (framTid - y * w) * stepShift;
-            y *= stepShift;
-            x += sum;
+            int y = __fdividef(scaleTid, windowsForLine);
+            int x = scaleTid - y * windowsForLine;
 
-            // if (i == 2)
-            // printf("!!!!!!!!!!!!!! %f %d %d %d\n", windowW * scale, sum, y, x);
+            x <<= step;
+            y <<= step;
 
-            if (cascade(y, x, integral, pitch))
+            if (cascade(y, x + wshift, integral, pitch))
             {
-                int4 rect;
-                rect.x = roundf( (x - sum) * scale);
-                rect.y = roundf(y * scale);
-                rect.z = roundf(windowW * scale);
-                rect.w = roundf(windowH * scale);
-
-                if (rect.x > frameW || rect.y > frameH) return;
-                    // printf("OUTLAUER %d %d %d %d %d %d %d %d %d %f %f\n", x, y, ftid, framTid, rect.x, rect.y, sum, w, h, stepShift, scale);
+                if(x >= __float2int_rn(__fdividef(frameW, scale)) - windowW) return;
 
-                // printf("passed: %d %d ---- %d %d %d %d %d\n", y, x, rect.x, rect.y, rect.z, rect.w, sum);
+                int4 rect;
+                rect.x = __float2int_rn(x * scale);
+                rect.y = __float2int_rn(y * scale);
+                rect.z = __float2int_rn(windowW * scale);
+                rect.w = __float2int_rn(windowH * scale);
 
                 int res = Emulation::smem::atomicInc(classified, (unsigned int)objects.cols);
                 objects(0, res) = rect;
-
             }
         }