Merge remote-tracking branch 'origin/Develop' into Develop

chenshijun

2018-12-20 7396acaaf172f25c7bf110e930a74cc133c5d342

Merge remote-tracking branch 'origin/Develop' into Develop

 QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp

@@ -32,6 +32,8 @@
        delete[] param;
    }
    THFP_Create(threadMax);
    m_ampleSize =
        appPref.getIntData("FaceDetectionSampleSize") > 0 ? appPref.getIntData("FaceDetectionSampleSize") : 640;
}

FaceDetectServerI::~FaceDetectServerI() {
@@ -48,7 +50,7 @@
        auto data = shareMemory.constData();
        THFI_FacePos facesPos[30];
        int channel = detectResourcesManager.getAvilableChannel(shareMemoryName);
        int faceNum = THFI_DetectFace(channel, (BYTE *) data, 24, width, height, facesPos, 30);
        int faceNum = THFI_DetectFace(channel, (BYTE *) data, 24, width, height, facesPos, 30, m_ampleSize);
        if (faceNum > 0) {
            for (int i = 0; i < faceNum; i++) {
                FaceDetect::FacePos face;

 QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h

@@ -20,6 +20,9 @@
    // FaceDetectServer interface
public:
    virtual FaceDetect::ThftResult faceProperty(Ice::Int, Ice::Int, const FaceDetect::FacePos &, const std::string &, const Ice::Current &) override;

private:
    int m_ampleSize;
};



 QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice

@@ -43,7 +43,7 @@
        FaceAngle    fAngle;
        int            nQuality;
        Data           pFacialData;
        long        pfaceId;
        long        pfaceId;
    }
    
    sequence<FacePos> Faces;

 QiaoJiaSystem/build/FaceDetectServer

Binary files differ

 QiaoJiaSystem/build/FaceExtractServer

Binary files differ

 QiaoJiaSystem/build/StructureApp

Binary files differ

 QiaoJiaSystem/build/VideoAnalysFromHC

Binary files differ

 QiaoJiaSystem/build/config.json

@@ -1,4 +1,5 @@
{
  "FaceDetectionSampleSize": 720,
  "mainServerIp": "192.168.1.203",
  "mainServerPort": "3697",
  "logPath": "/home/dell/work/log/",
@@ -17,7 +18,7 @@
  "localPasswd": "123456",
  "netIfName": "eno1",
  "srsAddr": "rtmp://192.168.1.122:1934/live/",
  "webPort": 11111 ,
   "redis_ip": "127.0.0.1",
   "redis_buf_len" : 750
  "webPort": 11111,
  "redis_ip": "127.0.0.1",
  "redis_buf_len": 750
}