派生自 development/c++

chenshijun
2019-03-19 d9da6cb3e69c630f8c2cccfc4703b29c3498269e
增加erl节点的端口配置
2个文件已修改
7 ■■■■■ 已修改文件
QiaoJiaSystem/FaceSearchServer/main.cpp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/FaceSearchServer/main.cpp
@@ -27,7 +27,8 @@
        assert("t_value.size()");
    }
    appPref.setIntData("RpcFSPort", atoi(argv[1]));
    appPref.setIntData("thread.max", atoi(argv[2]));//线程池大小
    appPref.setIntData("ErlNodePort", atoi(argv[2]));
    appPref.setIntData("thread.max", atoi(argv[3]));//线程池大小
    appPref.setStringData("ipAdd", appConfig.getStringProperty("ES_IP"));
    appPref.setIntData("ipPort", appConfig.getIntProperty("ES_PORT"));
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
@@ -237,8 +237,8 @@
        av_init_packet(&p_this->pkt);
        p_this->frame = av_frame_alloc();
        unsigned int usleepTime = (1000 / p_this->m_fps) - 12;
        usleepTime *= 1000;
//        unsigned int usleepTime = (1000 / p_this->m_fps) - 12;
//        usleepTime *= 1000;
        DBG("===open ok, camid: " << p_this->m_camIdx);
        while (p_this->m_running) {
#ifdef TestCode