代码优化

Hu Chunming
1 parent 0b320fbd
Showing 4 changed files with 19 additions and 3 deletions
src/ai_engine_module/road_seg_statistics.cpp
src/ai_platform/header.h
src/util/JpegUtil.cpp
src/util/vpc_util.cpp
@@ -299,7 +299,8 @@ int RoadSegProcess::process_gpu(sy_img * batch_img, vector&lt;DeviceMemory*&gt; vec_se
             int lane_cls = cats[i];
             vector<int> cur_region;
             for (int j = 0; j < points.size(); ++j) {
-                int px = points[j].x*width_ratio;   int py = points[j].y*height_ratio;
+                int px = points[j].x*width_ratio;   
+                int py = points[j].y*height_ratio;
                 cur_region.push_back(px);  cur_region.push_back(py);
             }
             traffic_region[b].push_back(cur_region); // 存储区域
@@ -311,8 +312,10 @@ int RoadSegProcess::process_gpu(sy_img * batch_img, vector&lt;DeviceMemory*&gt; vec_se
             int seg_cls = region_classes[i];
             vector<int> cur_region;
             for (int j = 0; j < points.size(); ++j) {
-                int px = points[j].x*width_ratio;   int py = points[j].y*height_ratio;
-                cur_region.push_back(px);  cur_region.push_back(py);
+                int px = points[j].x*width_ratio;   
+                int py = points[j].y*height_ratio;
+                cur_region.push_back(px);  
+                cur_region.push_back(py);
             }
             traffic_region[b].push_back(cur_region); // 存储区域
             labels[b].push_back(seg_cls); // 存储类别
@@ -37,6 +37,7 @@ enum class algorithm_type_t {
     VEHICLE_SNAPSHOT = 301,
     VEHICLE_RETROGRADE = 310,
     VEHICLE_TRESPASS = 311,
+    VEHICLE_GATHER = 312,       // 车辆聚集
     NONMOTOR_VEHICLE_SNAPSHOT = 401,
     TAKEAWAY_MEMBER_CLASSIFICATION = 402,
@@ -18,11 +18,17 @@ int JpegUtil::jpeg_init(int32_t devId){
     // channel  准备
     dvppChannelDesc_ = acldvppCreateChannelDesc();
     ret = acldvppCreateChannel(dvppChannelDesc_);
+    if(ret != ACL_ERROR_NONE){
+        LOG_ERROR("acldvppCreateChannel failed!");
+        exit(-2);
+    }
     // 创建图片编码配置数据，设置编码质量
     // 编码质量范围[0, 100]，其中level 0编码质量与level 100差不多，而在[1, 100]内数值越小输出图片质量越差。
     jpegeConfig_ = acldvppCreateJpegeConfig();
     acldvppSetJpegeConfigLevel(jpegeConfig_, 100);
+
+    return 0;
 }
 void JpegUtil::jpeg_release(){
@@ -200,6 +200,12 @@ int VPCUtil::init(int32_t devId){
     // channel  准备
     dvppChannelDesc_ = acldvppCreateChannelDesc();
     ret = acldvppCreateChannel(dvppChannelDesc_);
+    if(ret != ACL_ERROR_NONE){
+        LOG_ERROR("acldvppCreateChannel failed!");
+        exit(-2);
+    }
+
+    return 0;
 }
 vector<vpc_img_info> VPCUtil::crop_batch(DeviceMemory *devMem, vector<video_object_info> objs){