From bcb82cc81cffcef1ef915b4149c07b3b07cce2f8 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 四月 2017 17:37:42 +0800
Subject: [PATCH] optimize
---
FaceServer/sample_face_search.cpp | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/FaceServer/sample_face_search.cpp b/FaceServer/sample_face_search.cpp
index 69f2c54..25da1ac 100644
--- a/FaceServer/sample_face_search.cpp
+++ b/FaceServer/sample_face_search.cpp
@@ -33,17 +33,17 @@
cv_feature_t *p_feature = nullptr;
cv_face_t *p_face = nullptr;
int face_count = 0;
- cv_result_t st_result = CV_OK;
- st_result = cv_face_detect(handles.handle_detect, bgr_image.data, CV_PIX_FMT_BGR888,
+ cv_result_t result = CV_OK;
+ result = cv_face_detect(handles.handle_detect, bgr_image.data, CV_PIX_FMT_BGR888,
bgr_image.cols, bgr_image.rows, bgr_image.step,
CV_FACE_UP, &p_face, &face_count);
if (face_count >= 1) {
- st_result = cv_verify_get_feature(handles.handle_verify,
+ result = cv_verify_get_feature(handles.handle_verify,
(unsigned char *)bgr_image.data, CV_PIX_FMT_BGR888,
bgr_image.cols, bgr_image.rows, bgr_image.step,
p_face, &p_feature, nullptr);
- if (st_result != CV_OK) {
- LOGP(DEBUG, "cv_verify_get_feature failed, error code %d", st_result);
+ if (result != CV_OK) {
+ LOGP(DEBUG, "cv_verify_get_feature failed, error code %d", result);
}
} else {
LOGP(DEBUG, "can't find face in %s", image_path);
@@ -94,7 +94,7 @@
stimgfmt = CV_PIX_FMT_GRAY8;
matType = CV_8UC1;
}
- else if (image.mb_type == MB_Frame::MBFT_ARGB8888)
+ else if (image.mb_type == MB_Frame::MBFT_ABGR8888)
{
//int ret = libyuv::ARGBToBGRA(
// image.buff, image.width * 4,
@@ -108,7 +108,7 @@
//stimgfmt = CV_PIX_FMT_BGRA8888;
//matType = CV_8UC4;
- int ret = libyuv::ARGBToI400(
+ int ret = libyuv::ABGRToI400(
image.buff, image.width * 4,
imgbuf, image.width,
image.width, image.height
@@ -119,6 +119,17 @@
imgbufSize = image.height * image.width;
stimgfmt = CV_PIX_FMT_GRAY8;
matType = CV_8UC1;
+
+ //{
+ // static int f = 0;
+ // ++f;
+ //
+ // char fname[50];
+ // sprintf(fname, "st-%d-w%d-h%d.y8", f, image.width, image.height);
+ // FILE *pFile = fopen(fname, "wb");
+ // fwrite(imgbuf, 1, imgbufSize, pFile);
+ // fclose(pFile);
+ //}
}
else
{
@@ -151,14 +162,14 @@
cv_feature_t *p_feature = nullptr;
cv_face_t *p_face = nullptr;
int face_count = 0;
- cv_result_t st_result = CV_OK;
- st_result = cv_face_detect(handles.handle_detect, matImg.data, stimgfmt, matImg.cols, matImg.rows, matImg.step, CV_FACE_UP, &p_face, &face_count);
+ cv_result_t result = CV_OK;
+ result = cv_face_detect(handles.handle_detect, matImg.data, stimgfmt, matImg.cols, matImg.rows, matImg.step, CV_FACE_UP, &p_face, &face_count);
if (face_count >= 1)
{
- st_result = cv_verify_get_feature(handles.handle_verify, (unsigned char *)matImg.data, stimgfmt, matImg.cols, matImg.rows, matImg.step, p_face, &p_feature, nullptr);
- if (st_result != CV_OK)
+ result = cv_verify_get_feature(handles.handle_verify, (unsigned char *)matImg.data, stimgfmt, matImg.cols, matImg.rows, matImg.step, p_face, &p_feature, nullptr);
+ if (result != CV_OK)
{
- LOGP(DEBUG, "cv_verify_get_feature failed, error code %d", st_result);
+ LOGP(DEBUG, "cv_verify_get_feature failed, error code %d", result);
}
}
else
--
Gitblit v1.8.0