From 870a8591d72b3419fc3f4db02e857f8df874ae9b Mon Sep 17 00:00:00 2001
From: Scheaven <xuepengqiang>
Date: 星期四, 12 八月 2021 19:12:17 +0800
Subject: [PATCH] m
---
config.json | 7 +++----
/dev/null | 0
src/core/ari_manager.cpp | 4 +++-
demo.cpp | 2 +-
src/h_interface.cpp | 4 ++--
CMakeLists.txt | 2 +-
src/utils/draw_util.cpp | 4 ++--
7 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2dbe013..78a43c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@
set(CUDA_Path /usr/local/cuda)
# find_package(OpenCV REQUIRED PATHS "/opt/toolkits/opencv")
set(OPENCV_DIR /opt/toolkits/opencv)
-set(TensorRT_DIR /opt/toolkits/TensorRT7)
+set(TensorRT_DIR /opt/toolkits/TensorRT-7.2.3.4)
set(LOG_DIR /opt/toolkits/log4cplus)
include_directories(${OPENCV_DIR}/include/opencv4)
diff --git a/config.json b/config.json
index 3b3be65..14b8a19 100644
--- a/config.json
+++ b/config.json
@@ -1,10 +1,9 @@
{
"so_file_path": "/opt/vasystem/libs/Detect/libdemo.so",
- "runtime": "/opt/vasystem/libs/Detect:/usr/local/cuda-11.1/lib64:", // 椤圭洰鎵�鐢ㄥ埌鐨勭幆澧�
+ "runtime": "/opt/vasystem/libs/Detect:/usr/local/cuda-11.1/lib64:",
"param": {
- // "model_path": "/opt/vasystem/bin/models/baseDetector/baseDetetor.bin" // para閲岃竟鑷繁绠楁硶鍙兘鐢ㄥ埌鐨勫弬鏁�
- "model_path": "/opt/vasystem/bin/models/baseDetector/baseDetetor_small.bin", // para閲岃竟鑷繁绠楁硶鍙兘鐢ㄥ埌鐨勫弬鏁�
- "type":2,
+ "model_path": "/opt/vasystem/bin/models/baseDetector/baseDetetor.bin",
+ "type":1,
"max_cam_num": 8,
"wander_time": 5,
"mv_velocity": 10.0,
diff --git a/demo.cpp b/demo.cpp
index 6897241..d64c627 100644
--- a/demo.cpp
+++ b/demo.cpp
@@ -32,7 +32,7 @@
TImage *img = new TImage();
TImage *img2 = new TImage();
int i = 0;
- cap = VideoCapture("/data/disk2/01_Scheaven/data/cam_53.avi");
+ cap = VideoCapture("../1.mp4");
while(1){ /* code */
cap >> frame;
diff --git a/logs/trt_debug.log b/logs/trt_debug.log
deleted file mode 100644
index e69de29..0000000
--- a/logs/trt_debug.log
+++ /dev/null
diff --git a/logs/trt_error.log b/logs/trt_error.log
deleted file mode 100644
index e69de29..0000000
--- a/logs/trt_error.log
+++ /dev/null
diff --git a/logs/trt_warn.log b/logs/trt_warn.log
deleted file mode 100644
index e69de29..0000000
--- a/logs/trt_warn.log
+++ /dev/null
diff --git a/src/core/ari_manager.cpp b/src/core/ari_manager.cpp
index 0ec2289..efd93d3 100644
--- a/src/core/ari_manager.cpp
+++ b/src/core/ari_manager.cpp
@@ -141,6 +141,7 @@
// cv::imshow("img",image0);
// cv::waitKey(0);
this->detector->detect(batch_img, batch_res);
+ Timer::getInstance()->out("eveTime detect");
t_result->targets = (Target*)malloc(sizeof(Target)*batch_res[0].size());
int w_count = 0;
@@ -202,8 +203,9 @@
}
}
std::cout << "eve batch_res size:: "<< batch_res[0].size() << " w_count: " << w_count <<std::endl;
- t_result->count = w_count;
// draw_SDK_result(cam_id, frame, t_result);
+ t_result.count = w_count;
+ Timer::getInstance()->out("eveTime draw_SDK_result");
}
diff --git a/src/h_interface.cpp b/src/h_interface.cpp
index 98e2595..9c52bcb 100644
--- a/src/h_interface.cpp
+++ b/src/h_interface.cpp
@@ -18,8 +18,8 @@
API void* create(const char *conf, int *max_chan)
{
- // CLog::Initialize("/opt/vasystem/bin/models/baseDetector/log.properties");
- CLog::Initialize("../config/log4cplus.properties");
+ CLog::Initialize("/opt/vasystem/bin/models/baseDetector/log.properties");
+ // CLog::Initialize("../config/log4cplus.properties");
ReadJsonFromFile(conf);
AriManager *handle = new AriManager();
*max_chan = m_staticStruct::max_cam_num;
diff --git a/src/utils/draw_util.cpp b/src/utils/draw_util.cpp
index 4da8fcf..bf49946 100644
--- a/src/utils/draw_util.cpp
+++ b/src/utils/draw_util.cpp
@@ -80,8 +80,8 @@
cv::waitKey(1);
}
-cv::VideoWriter writer("./01_baseDetector.avi", cv::VideoWriter::fourcc('M','J','P','G'),24, cv::Size(800,500), true);
-// cv::VideoWriter writer("/opt/vasystem/valog/01_Scheanve/01_baseDetector.avi", cv::VideoWriter::fourcc('M','J','P','G'),24, cv::Size(800,500), true);
+//cv::VideoWriter writer("./01_baseDetector.avi", cv::VideoWriter::fourcc('M','J','P','G'),24, cv::Size(800,500), true);
+cv::VideoWriter writer("/opt/vasystem/valog/01_Scheanve/01_baseDetector.avi", cv::VideoWriter::fourcc('M','J','P','G'),24, cv::Size(800,500), true);
void draw_SDK_result(const int cam_id, cv::Mat mat_img, TResult* t_result)
{
--
Gitblit v1.8.0