From d9f371f32c1a2c1f52244c72982783f01c1a9bd6 Mon Sep 17 00:00:00 2001
From: mohit <mohitkhubele95@gmail.com>
Date: Fri, 25 Jun 2021 11:36:32 +0530
Subject: [PATCH] fix_bbox

---
 handler.cpp            | 32 +++++++++++++++-----------------
 src/Yolo3Detection.cpp |  1 -
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/handler.cpp b/handler.cpp
index 1b446a0..8188dbb 100644
--- a/handler.cpp
+++ b/handler.cpp
@@ -113,12 +113,12 @@ cv::Mat image_to_mat(image img)
     int h=0;
     int w=0;
     int channels;
-    const char *config_filename = "../config/config.yaml";
-    const char * net1="../config/yolo4x_fp16.rt";
-    const char * net2="../config/yolo4x_fp16.rt";
-    const char * net3="../config/yolo4x_fp16.rt";
-    const char * net4="../config/yolo4x_fp16.rt";
-    const char * net5="../config/yolo4x_fp16.rt";    
+    const char *config_filename = "config/config.yaml";
+    const char * net1="config/yolo4x_fp16.rt";
+    const char * net2="config/yolo4x_fp16.rt";
+    const char * net3="config/yolo4x2_fp16.rt";
+    const char * net4="config/yolo4x2_fp16.rt";
+    const char * net5="config/yolo4x_fp16.rt";    
     int classes1 , classes2 , classes3 , classes4 , classes5,len;
     char * img_data;
 
@@ -200,25 +200,17 @@ string name_from_path(string path)
     idata = stbi_load_from_memory(sockData, len, &w, &h, &channels, 0);
     im = load_image_file(idata, channels, 0, 0, w, h);
     batch_dnn_input.clear();
-    batch_frames.clear();
+    //batch_frames.clear();
     gray=image_to_mat(im);
 //    free(im);
     cv::Mat in[] = {gray, gray,gray};
     cv::merge(in, 3, frame);
-    
-    batch_frames.push_back(frame);
-    int height = frame.rows;
-    int width = frame.cols;
-    
     batch_dnn_input.push_back(frame.clone());
-    
-   
     json::value response;
     vector<json::value> jsonArray;
    
-     detected_bbox1.clear();
+    detected_bbox1.clear();
     detNN1->update(batch_dnn_input,1);
-    std::cout<<batch_dnn_input.rows<<" "<<batch_dnn_input.cols<<"\n";
     detected_bbox1 = detNN1->detected;
     
     for(auto d1:detected_bbox1){	
@@ -233,8 +225,10 @@ string name_from_path(string path)
         jsonArray.push_back(detection);
 }
      detected_bbox2.clear();
+    batch_dnn_input.clear();
+    batch_dnn_input.push_back(frame.clone());
     detNN2->update(batch_dnn_input,1);
-    std::cout<<batch_dnn_input.rows<<" "<<batch_dnn_input.cols<<"\n";
+   // std::cout<<batch_dnn_input[0].size()<<" testing3\n";
     detected_bbox2 = detNN2->detected;
 
     for(auto d2:detected_bbox2){	
@@ -249,6 +243,8 @@ string name_from_path(string path)
         jsonArray.push_back(detection);
 }
      detected_bbox3.clear();
+    batch_dnn_input.clear();
+    batch_dnn_input.push_back(frame.clone());
     detNN3->update(batch_dnn_input,1);
     detected_bbox3 = detNN3->detected;
     for(auto d3:detected_bbox3){	
@@ -263,6 +259,8 @@ string name_from_path(string path)
         jsonArray.push_back(detection);
 }
      detected_bbox4.clear();
+    batch_dnn_input.clear();
+    batch_dnn_input.push_back(frame.clone());
     detNN4->update(batch_dnn_input,1);
     detected_bbox4 = detNN4->detected;
 
diff --git a/src/Yolo3Detection.cpp b/src/Yolo3Detection.cpp
index efccbd1..0c638e6 100644
--- a/src/Yolo3Detection.cpp
+++ b/src/Yolo3Detection.cpp
@@ -118,7 +118,6 @@ void Yolo3Detection::postprocess(const int bi, const bool mAP){
         float x1   = (b.x+b.w/2.);
         float y0   = (b.y-b.h/2.);
         float y1   = (b.y+b.h/2.);
-        std::cout<<b.x<<"\n";
 
         // convert to image coords
         x0 = x_ratio*x0;