1.srs的分辨率在config.json配置 2.单播推流控制，国标摄像机差一个关闭测试 3. 底库字段添加

chenshijun

2019-04-11 6540a2a9d69432c4cc475e3b32eae11e9e0ace73

 QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp

@@ -33,8 +33,19 @@
        //nsq   set callback func
        DBG("NsqMsgConsumer Init");
        string pName(argv[0]);
        nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", pName,
                                                           to_string(appPref.getIntData("RpcVTIMPort")));
        if(argv[0][0] == '.' && argv[0][1] == '/')
        {
            string pName(argv[0]+2, argv[0]+strlen(argv[0]));
            DBG("pName(argv[0]) :" << pName);
            nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", pName,
                                                               to_string(appPref.getIntData("RpcVTIMPort")));
        }else{
            string pName(argv[0]);
            DBG("pName(argv[0]) :" << pName);
            nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", pName,
                                                               to_string(appPref.getIntData("RpcVTIMPort")));
        }

        nsqMsgConsumer->setMessageCallback(std::bind(&OnMsgFunc, std::placeholders::_1, this));
        nsqMsgConsumer->init();
        DBG("NsqMsgConsumer Init END!!");
@@ -92,7 +103,7 @@
        for (auto itor_json = value.begin(); itor_json != itor_json_end; ++itor_json) {
            //#todo 使用策略模式?发送端多个指令累积后发送?
            if (itor_json->isString() && reader.parse(itor_json->asString(), cfg_val)) {
                if (itor_json.name() == "cam_edit") {
                if (itor_json.name() == "cam_edit" || itor_json.name() == "editSdkRule") {
                    string cam_idx = cfg_val["str_cam_dev_id"].asString();
                    if (pthis->controllers.find(cam_idx) != pthis->controllers.end()) {
                        if (pthis->m_GB28181_Enable) {