chenshijun
2018-12-20 a955c3bf9ee78f9a839726edb030fecf74399d2d
Merge branch 'Develop'

10个文件已修改
32 ■■■■■ 已修改文件
QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/StructureApp/AppPipeController.cpp 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/FaceDetectServer 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/FaceExtractServer 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/StructureApp 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/VideoAnalysFromHC 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/config.json 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/StructureApp/AppPipeController.cpp
@@ -249,18 +249,6 @@
            ImageShowElement::showImage(to_string(this->m_index), *imageDrawElement.getImage());
        }
    });
    newRecordVideoElement.registerConnector([&] {
        if (faceRpcElement.getTriggerState() ||//TODO
            yoloRpcElement.getTrigger() ||
            leftJudgment.getTriggerState() ||
            rightJudgment.getTriggerState() ||
            perimeterElement.getTriggerState() ||
            crowdElement.getTriggerState()
            ) {
        }
    });
    registerElement(videoCaptureElement);
    if (m_json["yolo.enable"].asString() == "1") {
@@ -272,7 +260,7 @@
    }
    registerElement(imageDrawElement);
    registerElement(newRecordVideoElement);
    videoCaptureElement.setOutPutInterval(5);
    videoCaptureElement.setOutPutInterval(3);
    faceExtractElement.setProperty("index", to_string(m_index));
    //#todo setProperty
//    faceExtractElement.setProperty("index", to_string(m_index));
QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
@@ -3,7 +3,7 @@
//#todo index int -> string
NewRecordVideoElement::NewRecordVideoElement(std::string camid) :
    videoEncoderElement(cv::Size(1920, 1080), 5, 0), camID(camid) {
    videoEncoderElement(cv::Size(1920, 1080), 8, 0), camID(camid) {
    // basicPath();
    m_cutPath = appPref.getStringData("user.loop.absolute.path");
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
}