From eb98b4028b6d6997a458d2ae7ec1635c4d1e4a6c Mon Sep 17 00:00:00 2001 From: Scheaven <xuepengqiang> Date: 星期三, 28 七月 2021 10:32:11 +0800 Subject: [PATCH] test code --- src/core/ari_manager.cpp | 17 ++++++++--------- demo.cpp | 2 +- src/utils/draw_util.h | 3 +++ src/core/ari_manager.h | 1 + src/utils/draw_util.cpp | 3 ++- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/demo.cpp b/demo.cpp index 7056c72..4b0ceb1 100644 --- a/demo.cpp +++ b/demo.cpp @@ -48,7 +48,7 @@ for (int i=0; i<t_result->count; i++) { cout << "confidence:" << t_result->targets[i].confidence << endl; - draw_SDK_result(frame, t_result->targets[i]); + // draw_SDK_result(frame, t_result->targets[i]); } }else{ cout << "------------over--" << endl; diff --git a/src/core/ari_manager.cpp b/src/core/ari_manager.cpp index 5ab5b7e..857f820 100644 --- a/src/core/ari_manager.cpp +++ b/src/core/ari_manager.cpp @@ -8,7 +8,8 @@ AriManager::AriManager() { Config config; - // config.net_type = COMMON; + config.net_type = COMMON; + if(m_staticStruct::type==2) config.net_type = SMALL; else @@ -56,18 +57,15 @@ // cv::imshow("img",image0); // cv::waitKey(0); - Timer timer; - timer.reset(); this->detector->detect(batch_img, batch_res); - timer.out("detect"); t_result.targets = (Target*)malloc(sizeof(Target)*batch_res[0].size()); - // 灏嗙畻娉曠粨鏋滆浆鍖栦负鏍囧噯鐨勬牸寮忥紙浠ョ洰鏍囨娴嬩负渚嬶級 + // 灏嗙畻娉曠粨鏋滆浆鍖栦负鏍囧噯鐨勬牸寮忥紙浠ョ洰鏍囨娴嬩负渚嬶級"" int w_count = 0; for (const auto &result_box:batch_res[0]) { - // if(result_box.id == 0) - // { + if(result_box.id == 1) + { Target target; init_target(&target); @@ -93,10 +91,11 @@ t_result.targets[w_count] = target; w_count ++; - // } + } } + 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); //澶氱嚎绋嬫棤娉曡皟鐢ㄧ粯鍥� + draw_SDK_result(cam_id, frame, t_result); //澶氱嚎绋嬫棤娉曡皟鐢ㄧ粯鍥� } void AriManager::init_target(Target *t){ diff --git a/src/core/ari_manager.h b/src/core/ari_manager.h index e908f4f..9bec3f9 100644 --- a/src/core/ari_manager.h +++ b/src/core/ari_manager.h @@ -7,6 +7,7 @@ #include "std_target.h" #include "config.h" #include "detector.h" +#include "../utils/draw_util.h" using namespace std; using namespace cv; diff --git a/src/utils/draw_util.cpp b/src/utils/draw_util.cpp index 4268f9f..5e2c5a7 100644 --- a/src/utils/draw_util.cpp +++ b/src/utils/draw_util.cpp @@ -80,7 +80,8 @@ cv::waitKey(0); } -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) { diff --git a/src/utils/draw_util.h b/src/utils/draw_util.h index fa12331..8a916b1 100644 --- a/src/utils/draw_util.h +++ b/src/utils/draw_util.h @@ -12,5 +12,8 @@ void create_foldert(const char *path); void draw_SDK_result(cv::Mat mat_img, Target& target); +void draw_SDK_result(const int cam_id, cv::Mat mat_img, TResult& t_result); + + #endif //DRAW_UTIL_H -- Gitblit v1.8.0