fix: upgrade bug. completed by xuxiuxi

zhangzengfei

2020-03-31 0ce893695d32ab686f9e2309509e80c6feb0d380

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
#include "RgbDetect.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <time.h>
 
#include "FiStdDefEx.h"
#include <memory>
#include "THFeature_i.h"
//#include "THFaceLive_i.h"
#include "LogUtil.h"
 
shared_ptr<vector<unsigned char>> RgbDetect::rgb_image_buffer = nullptr;
shared_ptr<vector<THFI_FacePos>> RgbDetect::facePos = nullptr;
shared_ptr<vector<unsigned char>> RgbDetect::rgb_image_buffer4 = nullptr;
shared_ptr<vector<THFI_FacePos>> RgbDetect::facePos4 = nullptr;
const char* RgbDetect::rgbFileName = nullptr;
int RgbDetect::width = 0;
int RgbDetect::height = 0;
long int RgbDetect::fileSize = 0;
int RgbDetect::face_nums = 0;
int RgbDetect::face_nums4 = 0;
 
double msecond1()
{
    struct timeval tv;
    gettimeofday(&tv, 0);
    return (tv.tv_sec * 1.0e3 + tv.tv_usec * 1.0e-3);
}
 
bool RgbDetect::detect(int channel, int detectFaceCount) {
    bool success = false;
    try {
        if (rgb_image_buffer != nullptr && rgb_image_buffer.get() != nullptr &&  fileSize > 0) {
            face_nums = THFI_DetectFace(channel, rgb_image_buffer.get()->data(), 24, width, height, &(RgbDetect::facePos.get()->at(0)), 20,360);
            if (face_nums > 0) {
                success = true;
            }
 
        }
    }catch (exception & e) {
        LogUtil::log(e.what());
    }
    return success;
}
 
bool RgbDetect::detect4(int channel, int detectFaceCount) {
    bool success = false;
    try {
        if (rgb_image_buffer4 != nullptr && rgb_image_buffer4.get() != nullptr &&  fileSize > 0) {
            face_nums4 = THFI_DetectFace(channel, rgb_image_buffer4.get()->data(), 24, width, height, &(RgbDetect::facePos4.get()->at(0)), 20,360);
            if (face_nums4 > 0) {
                success = true;
            }
 
        }
    }catch (exception & e) {
        LogUtil::log(e.what());
    }
    return success;
}
 
#include <android/log.h>
#define LOGD1(...) __android_log_print(ANDROID_LOG_DEBUG, "aaaaaaa", __VA_ARGS__)
bool RgbDetect::detect(int detectFaceCount) {
    bool success = false;
    try {
        if (rgb_image_buffer != nullptr && rgb_image_buffer.get() != nullptr &&  fileSize > 0) {
//            double begin = msecond1();
            face_nums = THFI_DetectFace(0, rgb_image_buffer.get()->data(), 24, width, height, &(RgbDetect::facePos.get()->at(0)), 20,360);
//            LOGD1( "detect1111111111111 %d\n", (int)(msecond1() - begin));
            if (face_nums > 0) {
                success = true;
            }
 
        }
    }catch (exception & e) {
        LogUtil::log(e.what());
    }
    return success;
}