From 63d598d4443f906b34bedaf49e870b7a2be1a5c8 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 06 四月 2017 12:14:30 +0800
Subject: [PATCH] bug fix for android device
---
VisitFace/RtspNativeCodec/app/libs/st_face/include/cv_face.h | 81 +++++++++++++++++++++-------------------
1 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/libs/st_face/include/cv_face.h b/VisitFace/RtspNativeCodec/app/libs/st_face/include/cv_face.h
index bb1832b..9ff41fb 100644
--- a/VisitFace/RtspNativeCodec/app/libs/st_face/include/cv_face.h
+++ b/VisitFace/RtspNativeCodec/app/libs/st_face/include/cv_face.h
@@ -35,6 +35,8 @@
#define CV_E_UNSURPPORTED (-1000)
/// 鎸囧畾浣嶇疆鏈壘鍒發icense.lic鏂囦欢
#define CV_E_MISSLICENSE (-1001)
+/// cv_face_init_license_config 鍑芥暟琚噸澶嶈皟鐢�
+#define CV_E_MULTI_CALLS (-1002)
/// @brief 浜鸿劯鏈濆悜
typedef enum {
@@ -50,7 +52,8 @@
void
cv_face_algorithm_info();
-/// @brief 鎵嬪姩鍔犺浇license鏂囦欢锛岄櫎Android骞冲彴澶栵紝閮藉彲浠ヤ笉涓诲姩璋冪敤姝ゅ嚱鏁帮紙浣嗛渶瑕佸皢license鏂囦欢鏀惧湪鍙墽琛岀▼搴忓悓涓�鐩綍锛屽悕绉板懡鍚嶄负license.lic锛�
+/// @brief 鎵嬪姩鍔犺浇license鏂囦欢锛岄櫎IOS,Android骞冲彴澶栵紝閮藉彲浠ヤ笉涓诲姩璋冪敤姝ゅ嚱鏁帮紙浣嗛渶瑕佸皢license鏂囦欢鏀惧湪鍙墽琛岀▼搴忓悓涓�鐩綍锛屽悕绉板懡鍚嶄负license.lic锛�,璇ュ嚱鏁板彧鑳借鎴愬姛璋冪敤涓�娆�
+/// param[in] szLicense 鎺堟潈鏂囦欢涓殑瀛楃涓诧紝license鏂囦欢鐨勫叏閮ㄥ唴瀹�
CV_SDK_API
cv_result_t
cv_face_init_license_config(const char* szLicense);
@@ -64,9 +67,9 @@
/// @{
/// @brief 鍒涘缓浜鸿劯妫�娴嬪彞鏌�
-/// @param handle鍑芥暟鎴愬姛鏃惰璁剧疆涓烘湁鏁堢殑detector handle
-/// @param model_path 妯″瀷鏂囦欢鐨勭粷瀵硅矾寰勬垨鐩稿璺緞锛岃嫢涓嶆寚瀹氭ā鍨嬪彲涓篘ULL
-/// @param config 閰嶇疆閫夐」锛岄粯璁ら厤缃负CV_DETECT_ENABLE_ALIGN_21(21鍏抽敭鐐规娴�)銆傛敮鎸�106鍏抽敭鐐规娴婥V_DETECT_ENABLE_ALIGN_106鍜岃嚜鍔ㄧ缉鏀綜V_FACE_RESIZE_IMG_XXXX銆�
+/// @param[out] handle鍑芥暟鎴愬姛鏃惰璁剧疆涓烘湁鏁堢殑detector handle
+/// @param[in] model_path 妯″瀷鏂囦欢鐨勭粷瀵硅矾寰勬垨鐩稿璺緞锛岃嫢涓嶆寚瀹氭ā鍨嬪彲涓篘ULL
+/// @param[in] config 閰嶇疆閫夐」锛岄粯璁ら厤缃负CV_DETECT_ENABLE_ALIGN_21(21鍏抽敭鐐规娴�)銆傛敮鎸�106鍏抽敭鐐规娴婥V_DETECT_ENABLE_ALIGN_106鍜岃嚜鍔ㄧ缉鏀綜V_FACE_RESIZE_IMG_XXXX銆�
/// @return 杩斿洖CV_OK 澶辫触杩斿洖閿欒鐮�
CV_SDK_API
cv_result_t
@@ -77,8 +80,8 @@
);
/// @brief 鑾峰彇褰撳墠浜鸿劯妫�娴嬬殑榛樿闃�鍊�
-/// @param handle 浜鸿劯妫�娴嬪彞鏌�
-/// @param threshold 浜鸿劯妫�娴嬬殑榛樿闃�鍊�
+/// @param[in] handle 浜鸿劯妫�娴嬪彞鏌�
+/// @param[out] threshold 浜鸿劯妫�娴嬬殑榛樿闃�鍊�
CV_SDK_API
cv_result_t cv_face_detect_get_threshold(
cv_handle_t detector_handle,
@@ -86,8 +89,8 @@
);
/// @brief 璁剧疆褰撳墠浜鸿劯妫�娴嬬殑闃�鍊硷紝闇�瑕佸湪璋冪敤cv_face_detect涔嬪墠璋冪敤姝ゅ嚱鏁帮紝闃堝�奸渶澶т簬0锛岃缃悗璋冪敤cv_face_detect_get_threshold涓烘柊璁剧疆鍚庣殑鍊�)
-/// @param handle 浜鸿劯妫�娴嬪彞鏌�
-/// @param threshold 浜鸿劯妫�娴嬫柊闃�鍊�
+/// @param[in] handle 浜鸿劯妫�娴嬪彞鏌�
+/// @param[in] threshold 浜鸿劯妫�娴嬫柊闃�鍊�
CV_SDK_API
cv_result_t cv_face_detect_set_threshold(
cv_handle_t detector_handle,
@@ -95,22 +98,22 @@
);
/// @brief 閿�姣佸凡鍒濆鍖栫殑浜鸿劯妫�娴嬪彞鏌�
-/// @param detector_handle 宸插垵濮嬪寲鐨勪汉鑴告娴嬪彞鏌�
+/// @param[in] detector_handle 宸插垵濮嬪寲鐨勪汉鑴告娴嬪彞鏌�
CV_SDK_API
void cv_face_destroy_detector(
cv_handle_t detector_handle
);
/// @brief 浜鸿劯妫�娴�
-/// @param detector_handle 宸插垵濮嬪寲鐨勪汉鑴告娴嬪彞鏌�
-/// @param image 鐢ㄤ簬妫�娴嬬殑鍥惧儚鏁版嵁
-/// @param piexl_format 鐢ㄤ簬妫�娴嬬殑鍥惧儚鏁版嵁鐨勫儚绱犳牸寮�
-/// @param image_width 鐢ㄤ簬妫�娴嬬殑鍥惧儚鐨勫搴�(浠ュ儚绱犱负鍗曚綅)
-/// @param image_height 鐢ㄤ簬妫�娴嬬殑鍥惧儚鐨勯珮搴�(浠ュ儚绱犱负鍗曚綅)
-/// @param image_stride 鐢ㄤ簬妫�娴嬬殑鍥惧儚涓瘡涓�琛岀殑璺ㄥ害(浠ュ儚绱犱负鍗曚綅) 鍥惧儚璺ㄥ害=鍥惧儚瀹藉害*鍥惧儚缁村害
-/// @param orientation 鍥剧墖涓汉鑴哥殑鏂瑰悜
-/// @param p_faces_array 妫�娴嬪埌鐨勪汉鑴镐俊鎭暟缁勶紝api璐熻矗鍒嗛厤鍐呭瓨锛岄渶瑕佽皟鐢╟v_face_release_detector_result鍑芥暟閲婃斁
-/// @param p_faces_count 妫�娴嬪埌鐨勪汉鑴告暟閲忥紝api璐熻矗鍒嗛厤鍐呭瓨锛岄渶瑕佽皟鐢╟v_face_release_detector_result鍑芥暟閲婃斁
+/// @param[in] detector_handle 宸插垵濮嬪寲鐨勪汉鑴告娴嬪彞鏌�
+/// @param[in] image 鐢ㄤ簬妫�娴嬬殑鍥惧儚鏁版嵁
+/// @param[in] piexl_format 鐢ㄤ簬妫�娴嬬殑鍥惧儚鏁版嵁鐨勫儚绱犳牸寮�
+/// @param[in] image_width 鐢ㄤ簬妫�娴嬬殑鍥惧儚鐨勫搴�(浠ュ儚绱犱负鍗曚綅)
+/// @param[in] image_height 鐢ㄤ簬妫�娴嬬殑鍥惧儚鐨勯珮搴�(浠ュ儚绱犱负鍗曚綅)
+/// @param[in] image_stride 鐢ㄤ簬妫�娴嬬殑鍥惧儚涓瘡涓�琛岀殑璺ㄥ害(浠ュ儚绱犱负鍗曚綅) 鍥惧儚璺ㄥ害=鍥惧儚瀹藉害*鍥惧儚缁村害
+/// @param[in] orientation 鍥剧墖涓汉鑴哥殑鏂瑰悜
+/// @param[out] p_faces_array 妫�娴嬪埌鐨勪汉鑴镐俊鎭暟缁勶紝api璐熻矗鍒嗛厤鍐呭瓨锛岄渶瑕佽皟鐢╟v_face_release_detector_result鍑芥暟閲婃斁
+/// @param[out] p_faces_count 妫�娴嬪埌鐨勪汉鑴告暟閲�
/// @return 鎴愬姛杩斿洖CV_OK锛屽惁鍒欒繑鍥為敊璇被鍨�
CV_SDK_API
cv_result_t
@@ -127,8 +130,8 @@
);
/// @brief 閲婃斁浜鸿劯妫�娴嬭繑鍥炵粨鏋滄椂鍒嗛厤鐨勭┖闂�
-/// @param faces_array 妫�娴嬪埌鐨勪汉鑴镐俊鎭暟缁�
-/// @param faces_count 妫�娴嬪埌鐨勪汉鑴告暟閲�
+/// @param[in] faces_array 妫�娴嬪埌鐨勪汉鑴镐俊鎭暟缁�
+/// @param[in] faces_count 妫�娴嬪埌鐨勪汉鑴告暟閲�
CV_SDK_API
void
cv_face_release_detector_result(
@@ -150,9 +153,9 @@
#define CV_FACE_TRACKING_TWO_THREAD 0x00110000 ///< 寮�鍚弻绾跨▼浜鸿劯璺熻釜锛屽缓璁綆閰嶇疆鐜寮�鍚閫夐」銆�
/// @brief 鍒涘缓瀹炴椂浜鸿劯璺熻釜鍙ユ焺銆傚彲浠ヨ皟鐢╟v_face_track_set_detect_face_cnt_limit璁剧疆妫�娴嬬殑鏈�澶т汉鑴告暟鐩紝榛樿涓轰笉闄愬埗浜鸿劯妫�娴嬫暟閲忋��
-/// @param handle鍑芥暟鎴愬姛鏃惰璁剧疆涓烘湁鏁堢殑tracker handle
-/// @param model_path 妯″瀷鏂囦欢鐨勭粷瀵硅矾寰勬垨鐩稿璺緞锛岃嫢涓嶆寚瀹氭ā鍨嬪彲涓篘ULL
-/// @param config 榛樿閰嶇疆涓篊V_DETECT_ENABLE_ALIGN_21(21鍏抽敭鐐规娴�)銆傛敮鎸�106鍏抽敭鐐规娴婥V_DETECT_ENABLE_ALIGN_106銆佽嚜鍔ㄧ缉鏀綜V_FACE_RESIZE_IMG_XXXX鍜屽弻绾跨▼璺熻釜CV_FACE_TRACKING_TWO_THREAD銆�
+/// @param[out] handle鍑芥暟鎴愬姛鏃惰璁剧疆涓烘湁鏁堢殑tracker handle
+/// @param[in] model_path 妯″瀷鏂囦欢鐨勭粷瀵硅矾寰勬垨鐩稿璺緞锛岃嫢涓嶆寚瀹氭ā鍨嬪彲涓篘ULL
+/// @param[in] config 榛樿閰嶇疆涓篊V_DETECT_ENABLE_ALIGN_21(21鍏抽敭鐐规娴�)銆傛敮鎸�106鍏抽敭鐐规娴婥V_DETECT_ENABLE_ALIGN_106銆佽嚜鍔ㄧ缉鏀綜V_FACE_RESIZE_IMG_XXXX鍜屽弻绾跨▼璺熻釜CV_FACE_TRACKING_TWO_THREAD銆�
/// @return 杩斿洖CV_OK 澶辫触杩斿洖閿欒鐮�
CV_SDK_API
cv_result_t
@@ -163,7 +166,7 @@
);
/// @brief 閿�姣佸凡鍒濆鍖栫殑瀹炴椂浜鸿劯璺熻釜鍙ユ焺
-/// @param tracker_handle 宸插垵濮嬪寲鐨勫疄鏃朵汉鑴歌窡韪彞鏌�
+/// @param[in] tracker_handle 宸插垵濮嬪寲鐨勫疄鏃朵汉鑴歌窡韪彞鏌�
CV_SDK_API
void
cv_face_destroy_tracker(
@@ -171,15 +174,15 @@
);
/// @brief 瀵硅繛缁棰戝抚杩涜瀹炴椂蹇�熶汉鑴歌窡韪�
-/// @param tracker_handle 宸插垵濮嬪寲鐨勫疄鏃朵汉鑴歌窡韪彞鏌�
-/// @param image 鐢ㄤ簬妫�娴嬬殑鍥惧儚鏁版嵁
-/// @param piexl_format 鐢ㄤ簬妫�娴嬬殑鍥惧儚鏁版嵁鐨勫儚绱犳牸寮�
-/// @param image_width 鐢ㄤ簬妫�娴嬬殑鍥惧儚鐨勫搴�(浠ュ儚绱犱负鍗曚綅)
-/// @param image_height 鐢ㄤ簬妫�娴嬬殑鍥惧儚鐨勯珮搴�(浠ュ儚绱犱负鍗曚綅)
-/// @param image_stride 鐢ㄤ簬妫�娴嬬殑鍥惧儚涓瘡涓�琛岀殑璺ㄥ害(浠ュ儚绱犱负鍗曚綅)锛屽浘鍍忚法搴�=鍥惧儚瀹藉害*鍥惧儚缁村害
-/// @param orientation 瑙嗛涓汉鑴哥殑鏂瑰悜
-/// @param p_faces_array 妫�娴嬪埌鐨勪汉鑴镐俊鎭暟缁勶紝api璐熻矗鍒嗛厤鍐呭瓨锛岄渶瑕佽皟鐢╟v_facesdk_release_tracker_result鍑芥暟閲婃斁
-/// @param p_faces_count 妫�娴嬪埌鐨勪汉鑴告暟閲�
+/// @param[in] tracker_handle 宸插垵濮嬪寲鐨勫疄鏃朵汉鑴歌窡韪彞鏌�
+/// @param[in] image 鐢ㄤ簬妫�娴嬬殑鍥惧儚鏁版嵁
+/// @param[in] piexl_format 鐢ㄤ簬妫�娴嬬殑鍥惧儚鏁版嵁鐨勫儚绱犳牸寮�
+/// @param[in] image_width 鐢ㄤ簬妫�娴嬬殑鍥惧儚鐨勫搴�(浠ュ儚绱犱负鍗曚綅)
+/// @param[in] image_height 鐢ㄤ簬妫�娴嬬殑鍥惧儚鐨勯珮搴�(浠ュ儚绱犱负鍗曚綅)
+/// @param[in] image_stride 鐢ㄤ簬妫�娴嬬殑鍥惧儚涓瘡涓�琛岀殑璺ㄥ害(浠ュ儚绱犱负鍗曚綅)锛屽浘鍍忚法搴�=鍥惧儚瀹藉害*鍥惧儚缁村害
+/// @param[in] orientation 瑙嗛涓汉鑴哥殑鏂瑰悜
+/// @param[out] p_faces_array 妫�娴嬪埌鐨勪汉鑴镐俊鎭暟缁勶紝api璐熻矗鍒嗛厤鍐呭瓨锛岄渶瑕佽皟鐢╟v_facesdk_release_tracker_result鍑芥暟閲婃斁
+/// @param[out] p_faces_count 妫�娴嬪埌鐨勪汉鑴告暟閲�
/// @return 鎴愬姛杩斿洖CV_OK锛屽惁鍒欒繑鍥為敊璇被鍨�
CV_SDK_API
cv_result_t
@@ -196,7 +199,7 @@
);
/// @brief 閲嶇疆浜鸿劯璺熻釜妫�娴嬪櫒
-/// @param tracker_handle 宸插垵濮嬪寲鐨勫疄鏃朵汉鑴歌窡韪彞鏌�
+/// @param[in] tracker_handle 宸插垵濮嬪寲鐨勫疄鏃朵汉鑴歌窡韪彞鏌�
CV_SDK_API
void
cv_face_reset_tracker(
@@ -204,8 +207,8 @@
);
/// @brief 閲婃斁瀹炴椂浜鸿劯璺熻釜杩斿洖缁撴灉鏃跺垎閰嶇殑绌洪棿
-/// @param faces_array 妫�娴嬪埌鐨勪汉鑴镐俊鎭暟缁�
-/// @param faces_count 妫�娴嬪埌鐨勪汉鑴告暟閲�
+/// @param[in] faces_array 妫�娴嬪埌鐨勪汉鑴镐俊鎭暟缁�
+/// @param[in] faces_count 妫�娴嬪埌鐨勪汉鑴告暟閲�
CV_SDK_API
void
cv_face_release_tracker_result(
@@ -214,9 +217,9 @@
);
/// @brief 璁剧疆妫�娴嬪埌鐨勬渶澶т汉鑴告暟鐩甆锛屾寔缁璽rack宸叉娴嬪埌鐨凬涓汉鑴哥洿鍒颁汉鑴告暟灏忎簬N鍐嶇户缁仛detect,濡傛灉鏈皟鐢ㄥ垯涓嶅妫�娴嬩汉鑴告暟閲忓仛闄愬埗
-/// @param tracker_handle 宸插垵濮嬪寲鐨勫疄鏃朵汉鑴歌窡韪彞鏌�
-/// @param detect_face_cnt_limit 鏈�澶т汉鑴告暟鐩甆锛�-1琛ㄧず涓嶈涓婇檺
-/// @param val 濡傛灉涓洪潪绌烘寚閽堬紝鍒欒繑鍥為噰鐢ㄧ殑鏂扮殑鍊硷紝娉ㄦ剰锛岀敱浜庡唴閮ㄧ殑闄愬埗锛� 瀹為檯閲囩敤鐨勫�煎苟涓嶄竴瀹氱瓑浜巇etect_face_cnt_limit
+/// @param[in] tracker_handle 宸插垵濮嬪寲鐨勫疄鏃朵汉鑴歌窡韪彞鏌�
+/// @param[in] detect_face_cnt_limit 鏈�澶т汉鑴告暟鐩甆锛�-1琛ㄧず涓嶈涓婇檺
+/// @param[out] val 濡傛灉涓洪潪绌烘寚閽堬紝鍒欒繑鍥為噰鐢ㄧ殑鏂扮殑鍊硷紝娉ㄦ剰锛岀敱浜庡唴閮ㄧ殑闄愬埗锛� 瀹為檯閲囩敤鐨勫�煎苟涓嶄竴瀹氱瓑浜巇etect_face_cnt_limit
/// @return 鎴愬姛杩斿洖CV_OK锛屽惁鍒欒繑鍥為敊璇被鍨� (瀹為檯璁剧疆妫�娴嬪埌鐨勬渶澶х洰鏍囨暟鐩甆鍙兘灏忎簬detect_face_cnt_limit)
CV_SDK_API
cv_result_t
--
Gitblit v1.8.0