Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-15 0ad1516d29d13796ae2355d83b04cbc9a23cbc7d

Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -2449,7 +2449,7 @@
            if (TableName.find("lt_") != 0) {
                TableName.insert(0, "lt_");
            }
            fieldValues.insert(std::make_pair("tableName", TableName));
            fieldValues["tableName"] = TableName;

            ret = m_SqliteFaceEncap.updateTable("sys_o_tables", fieldValues);
        }

 QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp

@@ -1,4 +1,5 @@
//
// 对比报警的基类
// Created by ps on 2/26/18.
//

@@ -13,6 +14,9 @@
#include <basic/util/thread/MultiThread.h>
#include <basic/util/BASE64/Base64.h>

/***
 * 需要对比的一条记录
 */
struct AlarmData {
    int num;
    std::string tableName;
@@ -20,6 +24,9 @@
    float threshold;
};

/***
 * 数据库中查询的一条记录
 */
struct FeatureData {
    long face_id;
    std::string uuid;
@@ -29,6 +36,11 @@
    std::string idcard;
};

/***
 * 字符串根据符号分割并返回数据
 * @param str_list
 * @return
 */
static std::vector<std::string> AlarmServerPropertyAnalyseByComma(std::string str_list) {
    std::vector<std::string> result;
    char *property_list = const_cast<char *>(str_list.c_str());
@@ -60,6 +72,9 @@
    CPU_Number = 1
};

/***
 * 报警服务基类
 */
class AlarmServer {

public:
@@ -77,11 +92,19 @@
        dataRemoveBuffer.clear();
    }

    /***
     * 初始化时使用线程加载数据库
     * @param str_config
     */
    void initDB(std::string str_config) {
        std::thread thd(loadDBCahce, this, str_config);
        thd.detach();
    }

    /***
     * 移除数据
     * @param key
     */
    void removeData(std::string key) {
        std::lock_guard<std::mutex> guard(dataRemoveBufferMtx);
        dataRemoveBuffer.insert(key);

 QiaoJiaSystem/FaceSearchServer/CMakeLists.txt

@@ -89,7 +89,6 @@
add_executable(${PROJECT_NAME}
    main.cpp
    rpc/FaceSearchServer.cpp
    FaceSearchServerResources.cpp
    FaceFeatureSearchServerI.cpp
    FaceFeatureSearchServerI.h
    CasiaFaceWrapper/CasiaFaceWrapperN.cpp

 QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h

@@ -54,11 +54,10 @@
static bool getRet(std::string startTime, std::string endTime) {
    auto crrentTime = AppUtil::getTimeSecString();

    if (crrentTime.compare(startTime) > 0 && crrentTime.compare(endTime) < 0) {
    if (crrentTime.compare(startTime) > 0 && (crrentTime.compare(endTime) < 0 || endTime == "0000-00-00 00:00:00")) {
        return true;
    }
    return false;

}

#endif //COMPARETEST_FACEDBCOMPARESERVER_H

 QiaoJiaSystem/FaceSearchServer/FaceSearchServerResources.cpp

File was deleted

 QiaoJiaSystem/FaceSearchServer/main.cpp

@@ -1,4 +1,5 @@
//
// 人脸对比主进程入口
// Created by pans on 4/27/18.
//
#include <iostream>
@@ -26,6 +27,8 @@

//    appPref.setStringData("ipAdd", "192.168.1.185");
//    appPref.setIntData("ipPort", 9200);

    //设置es上传ip和端口
    appPref.setStringData("ipAdd", appConfig.getStringProperty("ES_IP"));
    appPref.setIntData("ipPort", appConfig.getIntProperty("ES_PORT"));


 QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp

@@ -143,27 +143,48 @@
 */
void BASICGB28181::FFmpegDecoderJPG::BareFlowDecoderThd(FFmpegDecoderJPG *p_this) {
    DBG(p_this->m_camIdx << "  BareFlowDecoderThd ok ... gpuIdx is " << p_this->m_gpuIdx);
    while(!p_this->m_running) {

    p_this->m_running = true;
//    av_register_all();
//    avformat_network_init();
    p_this->ic = avformat_alloc_context();

    p_this->iobuffer = (unsigned char *) av_malloc(p_this->m_buf_size);
    p_this->avio = avio_alloc_context(p_this->iobuffer, p_this->m_buf_size, 0, p_this, p_this->read_data, NULL, NULL);
        if (!p_this->iobuffer) {
            ERR("av_malloc: err======" << p_this->m_camIdx);
            p_this->m_running = false;
            continue;
        }
        p_this->avio = avio_alloc_context(p_this->iobuffer, p_this->m_buf_size, 0, p_this, p_this->read_data, NULL,
                                          NULL);
        if (!p_this->avio) {
            ERR("avio_alloc_context: err======" << p_this->m_camIdx);
            p_this->m_running = false;
            continue;
        }
    p_this->ic->pb = p_this->avio;

    int err = av_probe_input_buffer(p_this->ic->pb, &p_this->ic->iformat, nullptr, nullptr, 0, p_this->m_buf_size);
    if(err){
        ERR("av_probe_input_buffer" << err);
            ERR("av_probe_input_buffer: err======" << err  << p_this->m_camIdx);
            p_this->m_running = false;
            continue;
    }
    err = avformat_open_input(&p_this->ic, "", NULL, NULL);
    if(err){
        ERR("avformat_open_input" << err);
            ERR("avformat_open_input: err======" << err  << p_this->m_camIdx);
            p_this->m_running = false;
            continue;
    }
//    int err2 = avformat_find_stream_info(ic, nullptr);
    err = avformat_find_stream_info(p_this->ic, NULL);
    if(err){
        ERR("avformat_find_stream_info" << err);
            ERR("avformat_find_stream_info: err======" << err  << p_this->m_camIdx);
//        avformat_close_input(&p_this->ic);
//        DBG("avformat_close_input(&p_this->ic);");
            p_this->m_running = false;
            continue;
    }
    int vi = -1;
    for (int i = 0; i < p_this->ic->nb_streams; ++i) {
@@ -175,7 +196,14 @@
    p_this->stream = p_this->ic->streams[vi];
    p_this->video_st = p_this->stream;
    p_this->ctx = avcodec_alloc_context3(nullptr);
    int err3 = avcodec_parameters_to_context(p_this->ctx, p_this->stream->codecpar);
        err = avcodec_parameters_to_context(p_this->ctx, p_this->stream->codecpar);
        if (err) {
            ERR("avcodec_parameters_to_context: err======" << err  << p_this->m_camIdx);
//        avformat_close_input(&p_this->ic);
//        DBG("avformat_close_input(&p_this->ic);");
            p_this->m_running = false;
            continue;
        }

    p_this->codec = avcodec_find_decoder(p_this->ctx->codec_id);
    //是否启用GPU
@@ -190,19 +218,28 @@
                    p_this->codec = p_this->codec_cuvid;
                } else {
//                    return false;
                    ERR("codec_cuvid is NULL");
                        ERR("codec_cuvid is NULL"  << p_this->m_camIdx);
                }
            }
        }
    }
    int err4 = avcodec_open2(p_this->ctx, p_this->codec, nullptr);
        err = avcodec_open2(p_this->ctx, p_this->codec, nullptr);
        if (err) {
            ERR("avcodec_open2: err======" << err  << p_this->m_camIdx);
//        avformat_close_input(&p_this->ic);
//        DBG("avformat_close_input(&p_this->ic);");
//        avcodec_free_context(&p_this->ctx);
//        DBG("avcodec_free_context(&p_this->ctx);");
            p_this->m_running = false;
            continue;
        }

    av_init_packet(&p_this->pkt);

    p_this->frame = av_frame_alloc();
    unsigned int usleepTime = (1000 / p_this->m_fps) - 12;
    usleepTime *= 1000;
    DBG(" before while <<usleepTime is " << usleepTime);
        DBG("===open ok, camid: " << p_this->m_camIdx );
    while (p_this->m_running) {
#ifdef TestCode
        ClockTimer Test("while time");
@@ -218,7 +255,7 @@
        int err6 = avcodec_send_packet(p_this->ctx, &p_this->pkt);
        int err7 = avcodec_receive_frame(p_this->ctx, p_this->frame);
        if ((err7 == AVERROR(EAGAIN)) || (err5 < 0) || (err6 < 0)) {
            ERR(" error << err7:" << err7 << "  err5: " << err5 << " err6: " << err6);
                ERR("  err======: err7" << err7 << "  err5: " << err5 << " err6: " << err6  << p_this->m_camIdx);
            usleep(40000);
            continue;
        }
@@ -279,12 +316,13 @@
//        usleep(12000);
        }
#else
        usleep(usleepTime);
//            usleep(usleepTime);
#endif

    }
    DBG(" after while ");
    av_frame_free(&p_this->frame);
    }
}

bool BASICGB28181::FFmpegDecoderJPG::startThd(const std::string &camIdx, const int &fps, const int &gpuIdx) {
@@ -296,6 +334,7 @@
            setenv("CUDA_VISIBLE_DEVICES", std::to_string(gpuIdx).c_str(), 0);
        }
        m_camIdx = camIdx;
        DBG("BareFlowDecoderThd camIdx : " << camIdx);
        std::thread t_BareFlowDecoder(BareFlowDecoderThd, this);
        t_BareFlowDecoder.detach();
    );
@@ -550,12 +589,8 @@
    if ((packet != nullptr) && (inVideoStream != nullptr)) {
        AVStream *inStream = (AVStream *) inVideoStream;
        AVPacket *pkg = static_cast<AVPacket *>(packet);
//        static unsigned  long int frame_index = 0
//            pkg->dts = ++frame_index;
//            pkg->pts = frame_index;

            //todo
//        if(pkg->pts==AV_NOPTS_VALUE){

            DBG("frame_index==%d\n" << frame_index);
            //Write PTS
            AVRational time_base1=inStream->time_base;
@@ -565,25 +600,8 @@
            pkg->pts=(double)(frame_index*calc_duration)/(double)(av_q2d(time_base1)*AV_TIME_BASE);
            pkg->dts=pkg->pts;
            pkg->duration=(double)calc_duration/(double)(av_q2d(time_base1)*AV_TIME_BASE);
//            frame_index++;
//        }
//        else{
//            DBG("pts" << pkg->pts << "firstKeyPts" << firstKeyPts);
//            DBG("dts" << pkg->dts << "firstKeyDts" << firstKeyDts);
//            pkg->pts -= firstKeyPts;
//            pkg->dts -= firstKeyDts;
//            pkg->pts = av_rescale_q_rnd(pkg->pts, inStream->time_base,
//                                        m_pOutVideo_stream->time_base,
//                                        (AVRounding) (AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX));
//            pkg->dts = av_rescale_q_rnd(pkg->dts, inStream->time_base,
//                                        m_pOutVideo_stream->time_base,
//                                        (AVRounding) (AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX));
//            pkg->duration = av_rescale_q(pkg->duration, inStream->time_base,
//                                         m_pOutVideo_stream->time_base);
//            pkg->pos = -1;
//        }

        DBG("pts:" << pkg->pts);
        DBG("dts:" << pkg->dts);
//        DBG("pts:" << pkg->pts);
//        DBG("dts:" << pkg->dts);
    }
}

 QiaoJiaSystem/GB28181DecoderModel/VideoCaptureElementWithRtp.cpp

@@ -101,7 +101,12 @@
                p_this->m_running = true;
                p_this->m_fFmpegDecoderJPG.startThd(p_this->m_chanPubID, p_this->m_fps, p_this->m_gpuIdx);
                while (p_this->m_running) {
//                    if(p_this->m_fFmpegDecoderJPG.getRunning()) {
                    usleep(300000);
//                    }else{
//                        p_this->m_running = false;
//                        break;
//                    }
                }
                DBG("videoCaptureElementThd stop ...");
                C_RealVideoStop(lrealhandle);