From f330b88229fb72bbc7c1d9d82247c4a2ec927887 Mon Sep 17 00:00:00 2001 From: "Mr.V" Date: Tue, 30 Jan 2024 10:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B0=E5=BA=A6=E5=9B=BE=20=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E8=B4=B4=E5=9B=BE=E6=8E=A8=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common_engine/TrainAnaEngine/TrainParationMgr.cpp | 6 +++++- nvidia_ascend_tools/nvidia_tools/yolov5/src/preprocess.cu | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/nvidia_ascend_engine/common_engine/TrainAnaEngine/TrainParationMgr.cpp b/nvidia_ascend_engine/common_engine/TrainAnaEngine/TrainParationMgr.cpp index a3f3590..47bd7e8 100644 --- a/nvidia_ascend_engine/common_engine/TrainAnaEngine/TrainParationMgr.cpp +++ b/nvidia_ascend_engine/common_engine/TrainAnaEngine/TrainParationMgr.cpp @@ -173,6 +173,8 @@ APP_ERROR TrainParationMgr::Process() // 根据开始帧时间戳和结束帧时间错 计算当节车厢的行车速度 // LogInfo << "TrainAnaEngine checkPartion bPartion == true lstPartInfo[nPrePartionIndex].ftime：" << abs(lstPartInfo[nPrePartionIndex].i64EndTimeStamp - lstPartInfo[nPrePartionIndex].i64StartTimeStamp); // 根据时间戳计算时间差 + + LogInfo << "-测试-----测试-----测试------测试-"; float nTimePassed = (abs(lstPartInfo[nPartionIndex].i64EndTimeStamp - lstPartInfo[nPartionIndex].i64StartTimeStamp)) * 1.0; //防止停车导致速度过小 @@ -193,7 +195,7 @@ APP_ERROR TrainParationMgr::Process() //LogInfo << "TrainAnaEngine checkPartion bPartion == true lstPartInfo[nPrePartionIndex].endframe" << lstPartInfo[nPrePartionIndex].endframe; lstPartInfo[nPartionIndex].bmodelconfirmed = true; } - + LogInfo << "-测试3-----测试3-----测试3------测试3-"; /// write json info to file @@ -212,6 +214,8 @@ APP_ERROR TrainParationMgr::Process() //检测到车厢划分信息 { + + LogInfo << "-测试2-----测试2-----测试2------测试2-"; // if (nPartionIndex == 0) { // lstPartInfo[nPartionIndex].endframe = lstPartInfo[nPartionIndex].endframe - nrightoffset * (lstPartInfo[nPartionIndex].fLTX - METHOD_BASE_WIDTH) / 10; diff --git a/nvidia_ascend_tools/nvidia_tools/yolov5/src/preprocess.cu b/nvidia_ascend_tools/nvidia_tools/yolov5/src/preprocess.cu index 62561b0..a6289e1 100644 --- a/nvidia_ascend_tools/nvidia_tools/yolov5/src/preprocess.cu +++ b/nvidia_ascend_tools/nvidia_tools/yolov5/src/preprocess.cu @@ -464,12 +464,12 @@ void yolov5_preprocess_kernel_img( s2d.value[0] = scale; s2d.value[1] = 0; - s2d.value[2] = 0; //左上顶点贴图 - // s2d.value[2] = -scale * src_width * 0.5 + dst_width * 0.5; //中心贴图 +// s2d.value[2] = 0; //左上顶点贴图 + s2d.value[2] = -scale * src_width * 0.5 + dst_width * 0.5; //中心贴图 s2d.value[3] = 0; s2d.value[4] = scale; - s2d.value[5] = 0; //左上顶点贴图 - // s2d.value[5] = -scale * src_height * 0.5 + dst_height * 0.5; //中心贴图 +// s2d.value[5] = 0; //左上顶点贴图 + s2d.value[5] = -scale * src_height * 0.5 + dst_height * 0.5; //中心贴图 cv::Mat m2x3_s2d(2, 3, CV_32F, s2d.value); cv::Mat m2x3_d2s(2, 3, CV_32F, d2s.value);