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

use mutex provided by opencv itself

Browse Source 
add getoclcontext and getoclcommandqueue so that other opencl program can interactive with opencv ocl module
correct haar test cases
add face detection sample
This commit is contained in:
niko
2012-08-31 14:08:52 +08:00
parent 11e16a7204
commit 6f6e990988
8 changed files with 416 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/ocl/src/initialization.cpp
View File

@@ -44,7 +44,6 @@
//M*/
#include "precomp.hpp"
#include "threadsafe.h"
#include <iomanip>
#include "binarycaching.hpp"
@@ -348,7 +347,14 @@ namespace cv
}
Context::setContext(oclinfo);
}
void* getoclContext()
{
return &(Context::getContext()->impl->clContext);
}
void* getoclCommandQueue()
{
return &(Context::getContext()->impl->clCmdQueue);
}
void openCLReadBuffer(Context *clCxt, cl_mem dst_buffer, void *host_buffer, size_t size)
{
cl_int status;
@@ -772,12 +778,12 @@ namespace cv
/////////////////////////////OpenCL initialization/////////////////
auto_ptr<Context> Context::clCxt;
int Context::val = 0;
CriticalSection cs;
Mutex cs;
Context *Context::getContext()
{
if(val == 0)
{
myAutoLock al(&cs);
AutoLock al(cs);
if( NULL == clCxt.get())
clCxt.reset(new Context);

83
modules/ocl/src/threadsafe.cpp
View File

@@ -1,83 +0,0 @@
/*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, Institute Of Software Chinese Academy Of Science, all rights reserved.
// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
// Third party copyrights are property of their respective owners.
//
// @Authors
// Niko Li, newlife20080214@gmail.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"
#include "threadsafe.h"
CriticalSection::CriticalSection()
{
#if defined WIN32 || defined _WIN32
InitializeCriticalSection(&m_CritSec);
#else
pthread_mutex_init(&m_CritSec, NULL);
#endif
}
CriticalSection::~CriticalSection()
{
#if defined WIN32 || defined _WIN32
DeleteCriticalSection(&m_CritSec);
#else
pthread_mutex_destroy(&m_CritSec);
#endif
}
void CriticalSection::Lock()
{
#if defined WIN32 || defined _WIN32
EnterCriticalSection(&m_CritSec);
#else
pthread_mutex_lock(&m_CritSec);
#endif
}
void CriticalSection::Unlock()
{
#if defined WIN32 || defined _WIN32
LeaveCriticalSection(&m_CritSec);
#else
pthread_mutex_unlock(&m_CritSec);
#endif
}

92
modules/ocl/src/threadsafe.h
View File

@@ -1,92 +0,0 @@
/*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, Institute Of Software Chinese Academy Of Science, all rights reserved.
// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
// Third party copyrights are property of their respective owners.
//
//
// 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 GpuMaterials 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*/
#if defined WIN32 || defined _WIN32
#include <Windows.h>
#undef min
#undef max
#else
#include <pthread.h>
#endif
class CriticalSection
{
public:
CriticalSection();
~CriticalSection();
// Jia Haipeng, jiahaipeng95@gmail.com
void Lock();
void Unlock();
protected:
#if defined WIN32 || defined _WIN32
CRITICAL_SECTION m_CritSec;
#else
pthread_mutex_t m_CritSec;
#endif
};
class myAutoLock
{
public:
explicit myAutoLock(CriticalSection *lock)
{
m_lock = lock;
m_lock->Lock();
};
~myAutoLock()
{
m_lock->Unlock();
};
protected:
CriticalSection *m_lock;
};