Merge pull request #819 from bitwangyaoyao:2.4_haarBuf

modules/ocl/include/opencv2/ocl/ocl.hpp

@@ -802,6 +802,44 @@ namespace cv
                                         int minNeighbors, int flags, CvSize minSize = cvSize(0, 0), CvSize maxSize = cvSize(0, 0));
         };
 
+        class CV_EXPORTS OclCascadeClassifierBuf : public  cv::CascadeClassifier
+        {
+        public:
+            OclCascadeClassifierBuf() :
+                m_flags(0), initialized(false), m_scaleFactor(0), buffers(NULL) {}
+
+            ~OclCascadeClassifierBuf() {}
+
+            void detectMultiScale(oclMat &image, CV_OUT std::vector<cv::Rect>& faces,
+                                  double scaleFactor = 1.1, int minNeighbors = 3, int flags = 0,
+                                  Size minSize = Size(), Size maxSize = Size());
+            void release();
+
+        private:
+            void Init(const int rows, const int cols, double scaleFactor, int flags,
+                      const int outputsz, const size_t localThreads[],
+                      CvSize minSize, CvSize maxSize);
+            void CreateBaseBufs(const int datasize, const int totalclassifier, const int flags, const int outputsz);
+            void CreateFactorRelatedBufs(const int rows, const int cols, const int flags,
+                                         const double scaleFactor, const size_t localThreads[],
+                                         CvSize minSize, CvSize maxSize);
+            void GenResult(CV_OUT std::vector<cv::Rect>& faces, const std::vector<cv::Rect> &rectList, const std::vector<int> &rweights);
+
+            int m_rows;
+            int m_cols;
+            int m_flags;
+            int m_loopcount;
+            int m_nodenum;
+            bool findBiggestObject;
+            bool initialized;
+            double m_scaleFactor;
+            Size m_minSize;
+            Size m_maxSize;
+            vector<CvSize> sizev;
+            vector<float> scalev;
+            oclMat gimg1, gsum, gsqsum;
+            void * buffers;
+        };
 
 
         /////////////////////////////// Pyramid /////////////////////////////////////

modules/ocl/test/test_haar.cpp

@@ -16,6 +16,7 @@
 //
 // @Authors
 //    Jia Haipeng, jiahaipeng95@gmail.com
+//    Sen Liu, swjutls1987@126.com
 //
 // Redistribution and use in source and binary forms, with or without modification,
 // are permitted provided that the following conditions are met:
@@ -61,40 +62,31 @@ struct getRect
     }
 };
 
-PARAM_TEST_CASE(HaarTestBase, int, int)
+PARAM_TEST_CASE(Haar, double, int)
 {
-    //std::vector<cv::ocl::Info> oclinfo;
     cv::ocl::OclCascadeClassifier cascade, nestedCascade;
+    cv::ocl::OclCascadeClassifierBuf cascadebuf;
     cv::CascadeClassifier cpucascade, cpunestedCascade;
-    //    Mat img;
 
     double scale;
-    int index;
+    int flags;
 
     virtual void SetUp()
     {
-        scale = 1.0;
-        index = 0;
+        scale = GET_PARAM(0);
+        flags = GET_PARAM(1);
         string cascadeName = workdir + "../../data/haarcascades/haarcascade_frontalface_alt.xml";
 
-        if( (!cascade.load( cascadeName )) || (!cpucascade.load(cascadeName)))
+        if( (!cascade.load( cascadeName )) || (!cpucascade.load(cascadeName)) || (!cascadebuf.load( cascadeName )))
         {
             cout << "ERROR: Could not load classifier cascade" << endl;
             return;
         }
-        //int devnums = getDevice(oclinfo);
-        //CV_Assert(devnums>0);
-        ////if you want to use undefault device, set it here
-        ////setDevice(oclinfo[0]);
-        //cv::ocl::setBinpath("E:\\");
     }
 };
 
 ////////////////////////////////faceDetect/////////////////////////////////////////////////
-
-struct Haar : HaarTestBase {};
-
-TEST_F(Haar, FaceDetect)
+TEST_P(Haar, FaceDetect)
 {
     string imgName = workdir + "lena.jpg";
     Mat img = imread( imgName, 1 );
@@ -105,59 +97,65 @@ TEST_F(Haar, FaceDetect)
         return ;
     }
 
-    //int i = 0;
-    //double t = 0;
     vector<Rect> faces, oclfaces;
 
-    // const static Scalar colors[] =  { CV_RGB(0, 0, 255),
-    //                                   CV_RGB(0, 128, 255),
-    //                                   CV_RGB(0, 255, 255),
-    //                                   CV_RGB(0, 255, 0),
-    //                                   CV_RGB(255, 128, 0),
-    //                                   CV_RGB(255, 255, 0),
-    //                                   CV_RGB(255, 0, 0),
-    //                                   CV_RGB(255, 0, 255)
-    //                                 } ;
-
     Mat gray, smallImg(cvRound (img.rows / scale), cvRound(img.cols / scale), CV_8UC1 );
     MemStorage storage(cvCreateMemStorage(0));
     cvtColor( img, gray, CV_BGR2GRAY );
     resize( gray, smallImg, smallImg.size(), 0, 0, INTER_LINEAR );
     equalizeHist( smallImg, smallImg );
 
-
     cv::ocl::oclMat image;
     CvSeq *_objects;
     image.upload(smallImg);
     _objects = cascade.oclHaarDetectObjects( image, storage, 1.1,
-               3, 0
-               | CV_HAAR_SCALE_IMAGE
-               , Size(30, 30), Size(0, 0) );
+                   3, flags, Size(30, 30), Size(0, 0) );
     vector<CvAvgComp> vecAvgComp;
     Seq<CvAvgComp>(_objects).copyTo(vecAvgComp);
     oclfaces.resize(vecAvgComp.size());
     std::transform(vecAvgComp.begin(), vecAvgComp.end(), oclfaces.begin(), getRect());
 
-    cpucascade.detectMultiScale( smallImg, faces,  1.1,
-                                 3, 0
-                                 | CV_HAAR_SCALE_IMAGE
-                                 , Size(30, 30), Size(0, 0) );
+    cpucascade.detectMultiScale( smallImg, faces,  1.1, 3,
+                                 flags,
+                                 Size(30, 30), Size(0, 0) );
     EXPECT_EQ(faces.size(), oclfaces.size());
-    /*	for( vector<Rect>::const_iterator r = faces.begin(); r != faces.end(); r++, i++ )
+}
+
+TEST_P(Haar, FaceDetectUseBuf)
+{
+    string imgName = workdir + "lena.jpg";
+    Mat img = imread( imgName, 1 );
+
+    if(img.empty())
     {
-    Mat smallImgROI;
-    Point center;
-    Scalar color = colors[i%8];
-    int radius;
-    center.x = cvRound((r->x + r->width*0.5)*scale);
-    center.y = cvRound((r->y + r->height*0.5)*scale);
-    radius = cvRound((r->width + r->height)*0.25*scale);
-    circle( img, center, radius, color, 3, 8, 0 );
-    } */
-    //namedWindow("result");
-    //imshow("result",img);
-    //waitKey(0);
-    //destroyAllWindows();
+        std::cout << "Couldn't read " << imgName << std::endl;
+        return ;
+    }
 
+    vector<Rect> faces, oclfaces;
+
+    Mat gray, smallImg(cvRound (img.rows / scale), cvRound(img.cols / scale), CV_8UC1 );
+    MemStorage storage(cvCreateMemStorage(0));
+    cvtColor( img, gray, CV_BGR2GRAY );
+    resize( gray, smallImg, smallImg.size(), 0, 0, INTER_LINEAR );
+    equalizeHist( smallImg, smallImg );
+
+    cv::ocl::oclMat image;
+    image.upload(smallImg);
+
+    cascadebuf.detectMultiScale( image, oclfaces,  1.1, 3,
+                                 flags,
+                                 Size(30, 30), Size(0, 0) );
+    cascadebuf.release();
+
+    cpucascade.detectMultiScale( smallImg, faces,  1.1, 3,
+                                 flags,
+                                 Size(30, 30), Size(0, 0) );
+    EXPECT_EQ(faces.size(), oclfaces.size());
 }
+
+INSTANTIATE_TEST_CASE_P(FaceDetect, Haar,
+    Combine(Values(1.0),
+            Values(CV_HAAR_SCALE_IMAGE, 0)));
+
 #endif // HAVE_OPENCL