From 9eebd36d36b1c680f9673f3057c0639a99a7400b Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期六, 09 三月 2019 18:43:21 +0800
Subject: [PATCH] ？？？？
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 1 -
QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt | 3 ++-
QiaoJiaSystem/DataManagerServer/CMakeLists.txt | 2 ++
QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h | 17 ++++++++++++++++-
QiaoJiaSystem/VideoToImage/CMakeLists.txt | 2 +-
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp | 5 ++++-
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 2 +-
7 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index 641363f..ff08d21 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/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
diff --git a/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h b/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h
index 5051d0f..586f0a1 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/controller/VssDevTblController.h
+++ b/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();
diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
index 859ddd8..81d4fa7 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
+++ b/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);
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
index 008cb35..e850153 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
+++ b/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);
diff --git a/QiaoJiaSystem/VideoToImage/CMakeLists.txt b/QiaoJiaSystem/VideoToImage/CMakeLists.txt
index 1fe405c..6ca2f70 100644
--- a/QiaoJiaSystem/VideoToImage/CMakeLists.txt
+++ b/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/
)
diff --git a/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt b/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
index d484908..8ab10c9 100644
--- a/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt
@@ -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}
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index 1959a8a..dc1cf0a 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/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();
//璁剧疆瑙嗛鐨勬渶闀垮拰鏈�鐭椂闂撮棿闅�
--
Gitblit v1.8.0