bae85660da
Pull requests: #943 from jet47:cuda-5.5-support #944 from jet47:cmake-2.8.11-cuda-fix #912 from SpecLad:contributing #934 from SpecLad:parallel-for #931 from jet47:gpu-test-fixes #932 from bitwangyaoyao:2.4_fixBFM #918 from bitwangyaoyao:2.4_samples #924 from pengx17:2.4_arithm_fix #925 from pengx17:2.4_canny_tmp_fix #927 from bitwangyaoyao:2.4_perf #930 from pengx17:2.4_haar_ext #928 from apavlenko:bugfix_3027 #920 from asmorkalov:android_move #910 from pengx17:2.4_oclgfft #913 from janm399:2.4 #916 from bitwangyaoyao:2.4_fixPyrLK #919 from abidrahmank:2.4 #923 from pengx17:2.4_macfix Conflicts: modules/calib3d/src/stereobm.cpp modules/features2d/src/detectors.cpp modules/gpu/src/error.cpp modules/gpu/src/precomp.hpp modules/imgproc/src/distransform.cpp modules/imgproc/src/morph.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_color.cpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/perf/precomp.cpp modules/ocl/perf/precomp.hpp modules/ocl/src/arithm.cpp modules/ocl/src/canny.cpp modules/ocl/src/filtering.cpp modules/ocl/src/haar.cpp modules/ocl/src/hog.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/src/pyrlk.cpp modules/video/src/bgfg_gaussmix2.cpp modules/video/src/lkpyramid.cpp platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh platforms/scripts/ABI_compat_generator.py samples/ocl/facedetect.cpp
148 lines
4.8 KiB
C++
148 lines
4.8 KiB
C++
/*M///////////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
|
|
//
|
|
// By downloading, copying, installing or using the software you agree to this license.
|
|
// If you do not agree to this license, do not download, install,
|
|
// copy or use the software.
|
|
//
|
|
//
|
|
// License Agreement
|
|
// For Open Source Computer Vision Library
|
|
//
|
|
// Copyright (C) 2010-2012, Multicoreware, Inc., all rights reserved.
|
|
// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
|
|
// Third party copyrights are property of their respective owners.
|
|
//
|
|
// @Authors
|
|
// Fangfang Bai, fangfang@multicorewareinc.com
|
|
// Jin Ma, jin@multicorewareinc.com
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without modification,
|
|
// are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistribution's of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
//
|
|
// * Redistribution's in binary form must reproduce the above copyright notice,
|
|
// this list of conditions and the following disclaimer in the documentation
|
|
// and/or other oclMaterials provided with the distribution.
|
|
//
|
|
// * The name of the copyright holders may not be used to endorse or promote products
|
|
// derived from this software without specific prior written permission.
|
|
//
|
|
// This software is provided by the copyright holders and contributors as is and
|
|
// any express or implied warranties, including, but not limited to, the implied
|
|
// warranties of merchantability and fitness for a particular purpose are disclaimed.
|
|
// In no event shall the Intel Corporation or contributors be liable for any direct,
|
|
// indirect, incidental, special, exemplary, or consequential damages
|
|
// (including, but not limited to, procurement of substitute goods or services;
|
|
// loss of use, data, or profits; or business interruption) however caused
|
|
// and on any theory of liability, whether in contract, strict liability,
|
|
// or tort (including negligence or otherwise) arising in any way out of
|
|
// the use of this software, even if advised of the possibility of such damage.
|
|
//
|
|
//M*/
|
|
#include "precomp.hpp"
|
|
|
|
#if 0
|
|
|
|
///////////// Haar ////////////////////////
|
|
namespace cv
|
|
{
|
|
namespace ocl
|
|
{
|
|
|
|
struct getRect
|
|
{
|
|
Rect operator()(const CvAvgComp &e) const
|
|
{
|
|
return e.rect;
|
|
}
|
|
};
|
|
|
|
class CascadeClassifier_GPU : public OclCascadeClassifier
|
|
{
|
|
public:
|
|
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)maxSize;
|
|
MemStorage storage(cvCreateMemStorage(0));
|
|
//CvMat img=image;
|
|
CvSeq *objs = oclHaarDetectObjects(image, storage, scaleFactor, minNeighbors, flags, minSize);
|
|
vector<CvAvgComp> vecAvgComp;
|
|
Seq<CvAvgComp>(objs).copyTo(vecAvgComp);
|
|
faces.resize(vecAvgComp.size());
|
|
std::transform(vecAvgComp.begin(), vecAvgComp.end(), faces.begin(), getRect());
|
|
}
|
|
|
|
};
|
|
|
|
}
|
|
}
|
|
PERFTEST(Haar)
|
|
{
|
|
Mat img = imread(abspath("basketball1.png"), IMREAD_GRAYSCALE);
|
|
|
|
if (img.empty())
|
|
{
|
|
throw runtime_error("can't open basketball1.png");
|
|
}
|
|
|
|
CascadeClassifier faceCascadeCPU;
|
|
|
|
if (!faceCascadeCPU.load(abspath("haarcascade_frontalface_alt.xml")))
|
|
{
|
|
throw runtime_error("can't load haarcascade_frontalface_alt.xml");
|
|
}
|
|
|
|
vector<Rect> faces;
|
|
|
|
SUBTEST << img.cols << "x" << img.rows << "; scale image";
|
|
CPU_ON;
|
|
faceCascadeCPU.detectMultiScale(img, faces,
|
|
1.1, 2, 0 | CV_HAAR_SCALE_IMAGE, Size(30, 30));
|
|
CPU_OFF;
|
|
|
|
|
|
vector<Rect> oclfaces;
|
|
ocl::CascadeClassifier_GPU faceCascade;
|
|
|
|
if (!faceCascade.load(abspath("haarcascade_frontalface_alt.xml")))
|
|
{
|
|
throw runtime_error("can't load haarcascade_frontalface_alt.xml");
|
|
}
|
|
|
|
ocl::oclMat d_img(img);
|
|
|
|
WARMUP_ON;
|
|
faceCascade.detectMultiScale(d_img, oclfaces,
|
|
1.1, 2, 0 | CV_HAAR_SCALE_IMAGE, Size(30, 30));
|
|
WARMUP_OFF;
|
|
|
|
if(faces.size() == oclfaces.size())
|
|
TestSystem::instance().setAccurate(1, 0);
|
|
else
|
|
TestSystem::instance().setAccurate(0, abs((int)faces.size() - (int)oclfaces.size()));
|
|
|
|
faces.clear();
|
|
|
|
GPU_ON;
|
|
faceCascade.detectMultiScale(d_img, oclfaces,
|
|
1.1, 2, 0 | CV_HAAR_SCALE_IMAGE, Size(30, 30));
|
|
GPU_OFF;
|
|
|
|
GPU_FULL_ON;
|
|
d_img.upload(img);
|
|
faceCascade.detectMultiScale(d_img, oclfaces,
|
|
1.1, 2, 0 | CV_HAAR_SCALE_IMAGE, Size(30, 30));
|
|
GPU_FULL_OFF;
|
|
}
|
|
|
|
#endif
|