From a2673edc68a502f9a88ddf8e42f4aded9a8d94ef Mon Sep 17 00:00:00 2001 From: pansen <pansen626@sina.com> Date: 星期二, 02 四月 2019 18:48:31 +0800 Subject: [PATCH] 修改信息结构 --- QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp index 3e580ce..f1d76be 100644 --- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp +++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp @@ -22,6 +22,7 @@ #include <time.h> #include <dirent.h> #include "basic/pipe_element/ffmpeg/basic_struct_for_video_image.h" +#include <basic/timer_counter/Clocktimer.h> #include "vss/controller/VssDevTblController.h" #include "vss/controller/VssChannelTblController.h" @@ -73,6 +74,10 @@ void devHttpServer_c::init(void) { std::string strDevId = appConfig.getStringProperty("DEV_ID"); + + //nsq + nsqMsgProducer = new BasicMsg::Nsq::NsqMsgProducer("127.0.0.1", "4150"); + nsqMsgProducer->init(); // DSVAD010120181119 m_batch = strDevId.substr(5, 2); @@ -1167,8 +1172,8 @@ std::string publish_basepath = rtmpAddr + "cam" + str_uuid; DBG("publish_basepath:" << publish_basepath); appPref.setStringData("publish.basepath", publish_basepath); - appPref.setIntData("pulish.width", 640); - appPref.setIntData("pulish.height", 360); +// appPref.setIntData("pulish.width", 1920); +// appPref.setIntData("pulish.height", 1080); if (m_rtmp.find(ip) != m_rtmp.end()) { if (m_rtmp[ip].appPC == nullptr) { @@ -1220,8 +1225,8 @@ std::string publish_basepath = rtmpAddr + "cam" + str_uuid; DBG("publish_basepath:" << publish_basepath); appPref.setStringData("publish.basepath", publish_basepath); - appPref.setIntData("pulish.width", 640); - appPref.setIntData("pulish.height", 360); +// appPref.setIntData("pulish.width", 1920); +// appPref.setIntData("pulish.height", 1080); if (m_rtmp.find(ip) != m_rtmp.end()) { if (m_rtmp[ip].appPC == nullptr) { @@ -1529,9 +1534,15 @@ } if (ret) { - killVideoAnalysFromHCApp(); - sleep(1); - runAllApp(); + //todo VideoToImageMulth + { + std::string topic = "VideoToImageMulth"; + Json::Value json_cfg; + json_cfg["cut_dura_edit"] = content; + std::string msg = json_cfg.toStyledString(); + DBG("msg:" << msg); + nsqMsgProducer->Publish(topic, (void *) (&msg)); + } return "{\"ret_status\": \"ok_ack\"}"; } else { return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}"; @@ -2671,6 +2682,7 @@ std::string strSelectTemplate = R"#( -vf "select=eq(n\,%d)")#"; sprintf(selectExpBuff, strSelectTemplate.c_str(), frameIdDiff - 1); if (videoSt.Valid() && imgSt.Valid()) { + ClockTimer clockTimer1("ffmpeg getpic"); std::string cmd("ffmpeg -i '" + videoPath + "'" + std::string(selectExpBuff) + " -vframes 1" + " -y '" + str_imgName + "'"); INFO("Video To Image Cmd: " << cmd); @@ -2680,17 +2692,20 @@ return "{\"error\":\"鏈煡鍒拌棰戣矾寰刓"}"; } + ClockTimer clockTimer2("cv::imread(str_imgName)"); cv::Mat img = cv::imread(str_imgName); if (img.empty()) { ERR("{\"error\":\"Video File error\"}"); return "{\"error\":\"瑙嗛鏂囦欢閿欒\"}"; } + ClockTimer clockTimer3("CvUtil::cvMat2Buffer(img, buffer)"); std::vector<unsigned char> buffer; CvUtil::cvMat2Buffer(img, buffer); std::string img_url = "http://"; fdfsClient.rwLock.rdlock(); if (fdfsClient.fastFds != nullptr) { + ClockTimer clockTimer4("fdfsClient.fastFds->uploadFile"); std::string t_strImg = ""; if (!fdfsClient.fastFds->uploadFile(buffer, t_strImg, "jpg")) { img_url = "upload image fail"; -- Gitblit v1.8.0