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

minor refactoring, no functional changes

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-12-18 00:15:02 +04:00
parent 5d5527d03e
commit e719bee2b8
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
samples/ocl/facedetect.cpp
View File

@ -11,7 +11,10 @@
using namespace std; using namespace std;
using namespace cv; using namespace cv;
#define LOOP_NUM 10 #define LOOP_NUM 10
#define MAX_THREADS 10
///////////////////////////single-threading faces detecting/////////////////////////////// ///////////////////////////single-threading faces detecting///////////////////////////////
@ -26,23 +29,23 @@ const static Scalar colors[] = { CV_RGB(0,0,255),
} ; } ;
int64 work_begin = 0; int64 work_begin[MAX_THREADS] = {0};
int64 work_end = 0; int64 work_end[MAX_THREADS] = {0};
string inputName, outputName, cascadeName; string inputName, outputName, cascadeName;
static void workBegin() static void workBegin(int i = 0)
{ {
work_begin = getTickCount(); work_begin[i] = getTickCount();
} }
static void workEnd() static void workEnd(int i = 0)
{ {
work_end += (getTickCount() - work_begin); work_end[i] += (getTickCount() - work_begin[i]);
} }
static double getTime() static double getTime(int i = 0)
{ {
return work_end /((double)cvGetTickFrequency() * 1000.); return work_end[i] /getTickFrequency() * 1000.;
} }
@ -96,7 +99,6 @@ static int facedetect_one_thread(bool useCPU, double scale )
} }
} }
cvNamedWindow( "result", 1 );
if( capture ) if( capture )
{ {
cout << "In capture ..." << endl; cout << "In capture ..." << endl;
@ -125,34 +127,34 @@ static int facedetect_one_thread(bool useCPU, double scale )
} }
else else
{ {
cout << "In image read" << endl; cout << "In image read " << image.size() << endl;
vector<Rect> faces; vector<Rect> faces;
vector<Rect> ref_rst; vector<Rect> ref_rst;
double accuracy = 0.; double accuracy = 0.;
for(int i = 0; i <= LOOP_NUM; i ++) cout << "loops: ";
for(int i = 0; i <= LOOP_NUM; i++)
{ {
cout << "loop" << i << endl; cout << i << ", ";
if(useCPU) if(useCPU)
detectCPU(image, faces, cpu_cascade, scale, i==0?false:true); detectCPU(image, faces, cpu_cascade, scale, i!=0);
else else
{ {
detect(image, faces, cascade, scale, i==0?false:true); detect(image, faces, cascade, scale, i!=0);
if(i == 0) if(i == 0)
{ {
detectCPU(image, ref_rst, cpu_cascade, scale, false); detectCPU(image, ref_rst, cpu_cascade, scale, false);
accuracy = checkRectSimilarity(image.size(), ref_rst, faces); accuracy = checkRectSimilarity(image.size(), ref_rst, faces);
} }
} }
if (i == LOOP_NUM)
{
if (useCPU)
cout << "average CPU time (noCamera) : ";
else
cout << "average GPU time (noCamera) : ";
cout << getTime() / LOOP_NUM << " ms" << endl;
cout << "accuracy value: " << accuracy <<endl;
}
} }
cout << "done!" << endl;
if (useCPU)
cout << "average CPU time (noCamera) : ";
else
cout << "average GPU time (noCamera) : ";
cout << getTime() / LOOP_NUM << " ms" << endl;
cout << "accuracy value: " << accuracy <<endl;
Draw(image, faces, scale); Draw(image, faces, scale);
waitKey(0); waitKey(0);
} }
@ -165,8 +167,6 @@ static int facedetect_one_thread(bool useCPU, double scale )
///////////////////////////////////////detectfaces with multithreading//////////////////////////////////////////// ///////////////////////////////////////detectfaces with multithreading////////////////////////////////////////////
#if defined(_MSC_VER) && (_MSC_VER >= 1700) #if defined(_MSC_VER) && (_MSC_VER >= 1700)
#define MAX_THREADS 10
static void detectFaces(std::string fileName) static void detectFaces(std::string fileName)
{ {
ocl::OclCascadeClassifier cascade; ocl::OclCascadeClassifier cascade;