dockerfile/openalpr-base
1
0
Fork 0
mirror of https://github.com/kerberos-io/openalpr-base.git synced 2025-10-06 12:06:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed thread safety issue in Python binding

Browse Source
This commit is contained in:
Matt Hill
2015-08-02 11:41:29 -04:00
parent 7e54db681e
commit 91f0dd08e5
2 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/bindings/python/openalpr.py
View File

@@ -9,52 +9,56 @@ class Alpr():
if platform.system().lower().find("windows") != -1: if platform.system().lower().find("windows") != -1:
self._openalprpy_lib = ctypes.cdll.LoadLibrary("openalprpy.dll") self._openalprpy_lib = ctypes.cdll.LoadLibrary("openalprpy.dll")
else: else:
self._openalprpy_lib = ctypes.cdll.LoadLibrary("libopenalprpy.so") self._openalprpy_lib = ctypes.cdll.LoadLibrary("/storage/projects/alpr/src/build/Debug/libopenalprpy.so")
self._initialize_func = self._openalprpy_lib.initialize self._initialize_func = self._openalprpy_lib.initialize
self._initialize_func.restype = ctypes.c_void_p
self._initialize_func.argtypes = [ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p] self._initialize_func.argtypes = [ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p]
self._dispose_func = self._openalprpy_lib.dispose self._dispose_func = self._openalprpy_lib.dispose
self._dispose_func.argtypes = [ctypes.c_void_p]
self._is_loaded_func = self._openalprpy_lib.isLoaded self._is_loaded_func = self._openalprpy_lib.isLoaded
self._is_loaded_func.argtypes = [ctypes.c_void_p]
self._is_loaded_func.restype = ctypes.c_bool self._is_loaded_func.restype = ctypes.c_bool
self._recognize_file_func = self._openalprpy_lib.recognizeFile self._recognize_file_func = self._openalprpy_lib.recognizeFile
self._recognize_file_func.restype = ctypes.c_void_p self._recognize_file_func.restype = ctypes.c_void_p
self._recognize_file_func.argtypes = [ctypes.c_char_p] self._recognize_file_func.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
self._recognize_array_func = self._openalprpy_lib.recognizeArray self._recognize_array_func = self._openalprpy_lib.recognizeArray
self._recognize_array_func.restype = ctypes.c_void_p self._recognize_array_func.restype = ctypes.c_void_p
self._recognize_array_func.argtypes = [ctypes.POINTER(ctypes.c_ubyte), ctypes.c_uint] self._recognize_array_func.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_ubyte), ctypes.c_uint]
self._free_json_mem_func = self._openalprpy_lib.freeJsonMem self._free_json_mem_func = self._openalprpy_lib.freeJsonMem
self._set_default_region_func = self._openalprpy_lib.setDefaultRegion self._set_default_region_func = self._openalprpy_lib.setDefaultRegion
self._set_default_region_func.argtypes = [ctypes.c_char_p] self._set_default_region_func.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
self._set_detect_region_func = self._openalprpy_lib.setDetectRegion self._set_detect_region_func = self._openalprpy_lib.setDetectRegion
self._set_detect_region_func.argtypes = [ctypes.c_bool] self._set_detect_region_func.argtypes = [ctypes.c_void_p, ctypes.c_bool]
self._set_top_n_func = self._openalprpy_lib.setTopN self._set_top_n_func = self._openalprpy_lib.setTopN
self._set_top_n_func.argtypes = [ctypes.c_int] self._set_top_n_func.argtypes = [ctypes.c_void_p, ctypes.c_int]
self._get_version_func = self._openalprpy_lib.getVersion self._get_version_func = self._openalprpy_lib.getVersion
self._get_version_func.argtypes = [ctypes.c_void_p]
self._get_version_func.restype = ctypes.c_void_p self._get_version_func.restype = ctypes.c_void_p
self._initialize_func(country, config_file, runtime_dir) self.alpr_pointer = self._initialize_func(country, config_file, runtime_dir)
def unload(self): def unload(self):
self._openalprpy_lib.dispose() self._openalprpy_lib.dispose(self.alpr_pointer)
def is_loaded(self): def is_loaded(self):
return self._is_loaded_func() return self._is_loaded_func(self.alpr_pointer)
def recognize_file(self, file_path): def recognize_file(self, file_path):
ptr = self._recognize_file_func(file_path) ptr = self._recognize_file_func(self.alpr_pointer, file_path)
json_data = ctypes.cast(ptr, ctypes.c_char_p).value json_data = ctypes.cast(ptr, ctypes.c_char_p).value
response_obj = json.loads(json_data) response_obj = json.loads(json_data)
self._free_json_mem_func(ctypes.c_void_p(ptr)) self._free_json_mem_func(ctypes.c_void_p(ptr))
@@ -64,7 +68,7 @@ class Alpr():
def recognize_array(self, byte_array): def recognize_array(self, byte_array):
pb = ctypes.cast(byte_array, ctypes.POINTER(ctypes.c_ubyte)) pb = ctypes.cast(byte_array, ctypes.POINTER(ctypes.c_ubyte))
ptr = self._recognize_array_func(pb, len(byte_array)) ptr = self._recognize_array_func(self.alpr_pointer, pb, len(byte_array))
json_data = ctypes.cast(ptr, ctypes.c_char_p).value json_data = ctypes.cast(ptr, ctypes.c_char_p).value
response_obj = json.loads(json_data) response_obj = json.loads(json_data)
self._free_json_mem_func(ctypes.c_void_p(ptr)) self._free_json_mem_func(ctypes.c_void_p(ptr))
@@ -73,19 +77,19 @@ class Alpr():
def get_version(self): def get_version(self):
ptr = self._get_version_func() ptr = self._get_version_func(self.alpr_pointer)
version_number = ctypes.cast(ptr, ctypes.c_char_p).value version_number = ctypes.cast(ptr, ctypes.c_char_p).value
self._free_json_mem_func(ctypes.c_void_p(ptr)) self._free_json_mem_func(ctypes.c_void_p(ptr))
return version_number return version_number
def set_top_n(self, topn): def set_top_n(self, topn):
self._set_top_n_func(topn) self._set_top_n_func(self.alpr_pointer, topn)
def set_default_region(self, region): def set_default_region(self, region):
self._set_default_region_func(region) self._set_default_region_func(self.alpr_pointer, region)
def set_detect_region(self, enabled): def set_detect_region(self, enabled):
self._set_detect_region_func(enabled) self._set_detect_region_func(self.alpr_pointer, enabled)

31
src/bindings/python/openalprpy.cpp
View File

@@ -16,10 +16,8 @@ extern "C" {
using namespace alpr; using namespace alpr;
bool initialized = false;
static Alpr* nativeAlpr;
OPENALPR_EXPORT void initialize(char* ccountry, char* cconfigFile, char* cruntimeDir) OPENALPR_EXPORT Alpr* initialize(char* ccountry, char* cconfigFile, char* cruntimeDir)
{ {
//printf("Initialize"); //printf("Initialize");
@@ -29,35 +27,29 @@ extern "C" {
std::string runtimeDir(cruntimeDir); std::string runtimeDir(cruntimeDir);
//std::cout << country << std::endl << configFile << std::endl << runtimeDir << std::endl; //std::cout << country << std::endl << configFile << std::endl << runtimeDir << std::endl;
nativeAlpr = new alpr::Alpr(country, configFile, runtimeDir); Alpr* nativeAlpr = new alpr::Alpr(country, configFile, runtimeDir);
initialized = true; return nativeAlpr;
return;
} }
OPENALPR_EXPORT void dispose() OPENALPR_EXPORT void dispose(Alpr* nativeAlpr)
{ {
//printf("Dispose");
initialized = false;
delete nativeAlpr; delete nativeAlpr;
} }
OPENALPR_EXPORT bool isLoaded() OPENALPR_EXPORT bool isLoaded(Alpr* nativeAlpr)
{ {
//printf("IS LOADED"); //printf("IS LOADED");
if (!initialized)
return false;
return nativeAlpr->isLoaded(); return nativeAlpr->isLoaded();
} }
OPENALPR_EXPORT char* recognizeFile(char* cimageFile) OPENALPR_EXPORT char* recognizeFile(Alpr* nativeAlpr, char* cimageFile)
{ {
//printf("Recognize file"); //printf("Recognize file");
@@ -83,12 +75,13 @@ extern "C" {
} }
OPENALPR_EXPORT char* recognizeArray(unsigned char* buf, int len) OPENALPR_EXPORT char* recognizeArray(Alpr* nativeAlpr, unsigned char* buf, int len)
{ {
//printf("Recognize byte array"); //printf("Recognize byte array");
//printf("buffer pointer: %p\n", buf); //printf("buffer pointer: %p\n", buf);
//printf("buffer length: %d\n", len); //printf("buffer length: %d\n", len);
//std::cout << "Using instance: " << nativeAlpr << std::endl;
std::vector<char> cvec(buf, buf+len); std::vector<char> cvec(buf, buf+len);
@@ -103,7 +96,7 @@ extern "C" {
return membuffer; return membuffer;
} }
OPENALPR_EXPORT void setDefaultRegion(char* cdefault_region) OPENALPR_EXPORT void setDefaultRegion(Alpr* nativeAlpr, char* cdefault_region)
{ {
// Convert strings from java to C++ and release resources // Convert strings from java to C++ and release resources
std::string default_region(cdefault_region); std::string default_region(cdefault_region);
@@ -111,17 +104,17 @@ extern "C" {
nativeAlpr->setDefaultRegion(default_region); nativeAlpr->setDefaultRegion(default_region);
} }
OPENALPR_EXPORT void setDetectRegion(bool detect_region) OPENALPR_EXPORT void setDetectRegion(Alpr* nativeAlpr, bool detect_region)
{ {
nativeAlpr->setDetectRegion(detect_region); nativeAlpr->setDetectRegion(detect_region);
} }
OPENALPR_EXPORT void setTopN(int top_n) OPENALPR_EXPORT void setTopN(Alpr* nativeAlpr, int top_n)
{ {
nativeAlpr->setTopN(top_n); nativeAlpr->setTopN(top_n);
} }
OPENALPR_EXPORT char* getVersion() OPENALPR_EXPORT char* getVersion(Alpr* nativeAlpr)
{ {
std::string version = nativeAlpr->getVersion(); std::string version = nativeAlpr->getVersion();