| QiaoJiaSystem/DataManagerServer/CMakeLists.txt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| QiaoJiaSystem/VideoToImage/CMakeLists.txt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -80,6 +80,7 @@ ../../../BasicPlatForm/basic/db/sqlite/ ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000 ../../../BasicPlatForm/libs/mysqlpp/lib ../../../BasicPlatForm/libs/mysql/lib ) add_executable(DataWebServer @@ -155,6 +156,7 @@ hcnetsdk pthread mysqlpp mysqlclient ) #add_executable(Apptest QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h
@@ -364,7 +364,22 @@ } responseJsonValue["message"] = "查询成功！"; responseJsonValue["success"] = "true"; responseJsonValue["data"] = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME + " where 1 = 1", vssDevTblBuilder.buildVssDevTblMap()); auto devDataList = VssDevTblDao::instance()->findJsonArray(string("select * from ") + VSSDevTbl_TABLE_NAME + " where 1 = 1", vssDevTblBuilder.buildVssDevTblMap()); for (int i = 0; i < devDataList.size(); i++) { auto& devData = devDataList[i]; auto DevPubID = devData[VssDevTbl_DevPubID]; std::map<std::string, std::string> whereKeyValues; whereKeyValues[CamDev_cam_dev_id] = DevPubID.asString(); auto camDevDataList = CamDevSqliteDao::instance()->findCamDevList(whereKeyValues)["data"]; devData["RemarkName"] = ""; if (camDevDataList.size() > 0) { auto camDevData = camDevDataList[0]; devData["RemarkName"] = camDevData[CamDev_name].asString(); } } responseJsonValue["data"] = devDataList; } return responseJsonValue.toStyledString(); QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
@@ -198,12 +198,15 @@ #ifdef TestCode ClockTimer Test("while time"); #endif av_packet_unref(&p_this->pkt); p_this->pkt.data = NULL; p_this->pkt.size = 0; int err5 = av_read_frame(p_this->ic, &p_this->pkt); //# todo save package p_this->frame_number++; int err6 = avcodec_send_packet(p_this->ctx, &p_this->pkt); // av_packet_unref(&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); QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -118,7 +118,6 @@ } else { auto lst = m_lDBTool->searchCamDevTableByType(0); // auto lst = m_lDBTool->searchCamDevTableAll(); appPref.setIntData("n_cut_max_duration", lst_dev.n_cut_max_duration); appPref.setIntData("n_cut_min_duration", lst_dev.n_cut_min_duration); QiaoJiaSystem/VideoToImage/CMakeLists.txt
@@ -68,7 +68,7 @@ /usr/include/x86_64-linux-gnu/qt5/QtCore/ /usr/include/x86_64-linux-gnu/qt5/QtSql/ ../../BasicPlatForm/libs/hiredis-master/include ../../../BasicPlatForm/libs/hiredis-master/include ../../../BasicPlatForm/basic/timer_counter/ )
@@ -92,7 +92,8 @@ ../../../BasicPlatForm/libs/Ice-3.7.0/lib64 ../../../BasicPlatForm/libs/hiredis-master/lib ../../../BasicPlatForm/libs/mysqlpp/lib ../../../BasicPlatForm/libs/mysqlpp/lib ../../../BasicPlatForm/libs/mysql/lib ) add_executable(${PROJECT_NAME} QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -65,7 +65,7 @@ } } else { auto lst = m_lDBTool->searchCamDevTableAll(); auto lst = m_lDBTool->searchCamDevTableByType(0); Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo(); //设置视频的最长和最短时间间隔
