From 79e9891452ca13f5a556cabd5c4b200aa7f666cd Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@iotlink.com> Date: 星期二, 05 一月 2021 17:39:01 +0800 Subject: [PATCH] update lib face so --- app/src/main/jniLibs/armeabi-v7a/libTHFaceImage.so | 0 app/src/main/jniLibs/armeabi-v7a/libTHFeature.so | 0 app/src/main/include/THFeature_i.h | 16 ++++++++++++++-- app/src/main/assets/libTHDetect_ko.so | 0 app/src/main/include/THFaceImage_i.h | 14 +++++++++++++- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/src/main/assets/libTHDetect_ko.so b/app/src/main/assets/libTHDetect_ko.so index 60d648d..0bda830 100644 --- a/app/src/main/assets/libTHDetect_ko.so +++ b/app/src/main/assets/libTHDetect_ko.so Binary files differ diff --git a/app/src/main/include/THFaceImage_i.h b/app/src/main/include/THFaceImage_i.h index c2ec86e..de91e64 100644 --- a/app/src/main/include/THFaceImage_i.h +++ b/app/src/main/include/THFaceImage_i.h @@ -157,7 +157,7 @@ This function only can be called one time at program exit. */ -THFACEIMAGE_API int THFI_Create_Ex(short nChannelNum, int omp_thread_num=2); +THFACEIMAGE_API int THFI_Create_Ex(short nChannelNum, int omp_thread_num=1); /* The THFI_Create_Ex function will initialize the algorithm engine module with openmp thread num @@ -224,4 +224,16 @@ 1.image data buffer(pImage) size must be nWidth*(bpp/8)*nHeight. */ +THFACEIMAGE_API int THFI_Create_Allin(short nChannelNum,int cpu_mode=0,int omp_thread_num=1,int using_gpu=0); +/* +描述：初始化人脸检测模块，建议在应用程序初始化时调用一次 +参数： + nChannelNum[intput],算法通道数，一个线程使用一个通道 + cpu_mode[input],CPU使用模式：0-大小核，1-仅小核，2-仅大核 + omp_thread_num[input],并行计算时的线程数，建议小于实际启用的CPU核心数 + using_gpu[input],启用GPU计算：0-不启用GPU计算，1-启用GPU计算。CPU版本库中该参数忽略，只有在GPU版本库才有效 +返回值： + 大于0为成功初始化的通道数，小于等于0为加载模型失败 +*/ + #endif diff --git a/app/src/main/include/THFeature_i.h b/app/src/main/include/THFeature_i.h index a8ef5b8..d85be62 100644 --- a/app/src/main/include/THFeature_i.h +++ b/app/src/main/include/THFeature_i.h @@ -30,7 +30,7 @@ /* The EF_SetDir function will set face feature environment directory,it must be called before EF_Init Parameters: - modelDir[input],存放 libTHFeature_db20a.so文件的目录，如果modelDir为NULL，则使用默认路径“/mnt/sdcard/SysConfig/model/” + modelDir[input],存放 libTHFeature_db*.so文件的目录，如果modelDir为NULL，则使用默认路径“/mnt/sdcard/SysConfig/model/” tmpDir[input],临时读写目录，供算法初始化使用，算法必须具有临时目录下的读写权限,如果tmpDir为NULL，则使用默认路径“"/mnt/sdcard/SysConfig/tmp/"” Return Values: No return value. @@ -164,7 +164,7 @@ This function can be called one time at program Un-Initialization. */ -THFEATURE_API short EF_Init_Ex(int nChannelNum, int omp_thread_num=2); +THFEATURE_API short EF_Init_Ex(int nChannelNum, int omp_thread_num=1); /* The EF_Init_Ex function will initialize the Face Feature(THFeature) algorithm module with openmp thread num @@ -183,4 +183,16 @@ This function can be called one time at program initialization. */ +THFEATURE_API short EF_Init_Allin(short nChannelNum,int cpu_mode=0,int omp_thread_num=1,int using_gpu=0); +/* +描述：初始化人脸特征模块，建议在应用程序初始化时调用一次 +参数： + nChannelNum[intput],算法通道数，一个线程使用一个通道 + cpu_mode[input],CPU使用模式：0-大小核，1-仅小核，2-仅大核 + omp_thread_num[input],并行计算时的线程数，建议小于实际启用的CPU核心数 + using_gpu[input],启用GPU计算：0-不启用GPU计算，1-启用GPU计算。CPU版本库中该参数忽略，只有在GPU版本库才有效 +返回值： + 大于0为成功初始化的通道数，小于等于0为加载模型失败 +*/ + #endif diff --git a/app/src/main/jniLibs/armeabi-v7a/libTHFaceImage.so b/app/src/main/jniLibs/armeabi-v7a/libTHFaceImage.so index fb8af96..f6b6c4d 100644 --- a/app/src/main/jniLibs/armeabi-v7a/libTHFaceImage.so +++ b/app/src/main/jniLibs/armeabi-v7a/libTHFaceImage.so Binary files differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libTHFeature.so b/app/src/main/jniLibs/armeabi-v7a/libTHFeature.so index f115282..9ff9f33 100644 --- a/app/src/main/jniLibs/armeabi-v7a/libTHFeature.so +++ b/app/src/main/jniLibs/armeabi-v7a/libTHFeature.so Binary files differ -- Gitblit v1.8.0