GB28181集成完成,集成推流模块

pansen

2019-03-07 d3b7bbe7102cd089680a828f5d8f6402c8cf6342

 QiaoJiaSystem/FaceSearchServer/FaceFeatureSearchServerI.cpp

@@ -141,7 +141,6 @@

    if (reader.parse(info_json, value)) {
        //#todo

        m_rwLock.rdlock();
        std::string feature_base64;
        feature_base64 = base64.Encode(feature.data(), feature.size());
@@ -166,6 +165,7 @@
                    t_item.tableName = it.first;
                    t_item.alarmRet = t_alarmRet;
                    t_TableCompareResult.push_back(t_item);
//                    DBG("t_results item : uuid is " << t_item.uuid << " confidence " << t_item.confidence << it.first);
                }
            } else {
                INFO("m_faceFCMAP ret is false " << it.first);
@@ -174,7 +174,7 @@
        m_rwLock.unlock();
        DBG("auto &it : m_faceFCMAP end");

//        DBG("t_TableCompareResult size" << t_TableCompareResult.size());
        DBG("t_TableCompareResult size" << t_TableCompareResult.size());
        //sort_all_results
        for (auto itor = t_TableCompareResult.begin(); itor != t_TableCompareResult.end(); ++itor) {
            float new_confidence = itor->confidence;
@@ -203,8 +203,8 @@
            t_faceCR.imgUrl = itor->face_img_url;
            t_faceCR.idcard = itor->idCard;
            t_faceCR.alarmRet = itor->alarmRet;
//            DBG("compare results tablename is " << t_faceCR.tableName << " id is " << t_faceCR.uuid << " sc is"
//                                                << t_faceCR.confidence);
            DBG("compare results tablename is " << t_faceCR.tableName << " id is " << t_faceCR.uuid << " pic n "
                                                << t_faceCR.idcard << " sc is" << t_faceCR.confidence);
            results.insert(itTR, t_faceCR);
        }
        bool retface = true;