fix(FaceBoxesV2): fixed FaceBoxesV2 video detect error (#243)

DefTruth · Mar 25, 2022 · 7592184 · 7592184
1 parent 22b5ed1
commit 7592184
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 19 deletions.
diff --git a/lite/mnn/cv/mnn_faceboxesv2.cpp b/lite/mnn/cv/mnn_faceboxesv2.cpp
@@ -57,8 +57,6 @@ void MNNFaceBoxesV2::detect(const cv::Mat &mat, std::vector<types::Boxf> &detect
 void MNNFaceBoxesV2::generate_anchors(const int target_height, const int target_width,
                                       std::vector<FaceBoxesAnchorV2> &anchors)
 {
-  if (anchors_is_already_generated) return;
-
   std::vector<std::vector<int>> feature_maps;
   for (auto step: steps)
   {
@@ -131,8 +129,6 @@ void MNNFaceBoxesV2::generate_anchors(const int target_height, const int target_
       }
     }
   }
-
-  anchors_is_already_generated = true;
 }
 
 void MNNFaceBoxesV2::generate_bboxes(std::vector<types::Boxf> &bbox_collection,

diff --git a/lite/mnn/cv/mnn_faceboxesv2.h b/lite/mnn/cv/mnn_faceboxesv2.h
@@ -35,7 +35,6 @@ namespace mnncv
         {256},
         {512}
     };
-    bool anchors_is_already_generated = false;
 
     enum NMS
     {

diff --git a/lite/ncnn/cv/ncnn_faceboxesv2.cpp b/lite/ncnn/cv/ncnn_faceboxesv2.cpp
@@ -51,8 +51,6 @@ void NCNNFaceBoxesV2::detect(const cv::Mat &mat, std::vector<types::Boxf> &detec
 void NCNNFaceBoxesV2::generate_anchors(const int target_height, const int target_width,
                                        std::vector<FaceBoxesAnchorV2> &anchors)
 {
-  if (anchors_is_already_generated) return;
-
   std::vector<std::vector<int>> feature_maps;
   for (auto step: steps)
   {
@@ -125,8 +123,6 @@ void NCNNFaceBoxesV2::generate_anchors(const int target_height, const int target
       }
     }
   }
-
-  anchors_is_already_generated = true;
 }
 
 void NCNNFaceBoxesV2::generate_bboxes(std::vector<types::Boxf> &bbox_collection,

diff --git a/lite/ncnn/cv/ncnn_faceboxesv2.h b/lite/ncnn/cv/ncnn_faceboxesv2.h
@@ -43,7 +43,6 @@ namespace ncnncv
         {256},
         {512}
     };
-    bool anchors_is_already_generated = false;
 
     enum NMS
     {

diff --git a/lite/ort/cv/faceboxesv2.cpp b/lite/ort/cv/faceboxesv2.cpp
@@ -46,8 +46,6 @@ void FaceBoxesV2::generate_anchors(const int target_height,
                                    const int target_width,
                                    std::vector<FaceBoxesAnchorV2> &anchors)
 {
-  if (anchors_is_already_generated) return;
-
   std::vector<std::vector<int>> feature_maps;
   for (auto step: steps)
   {
@@ -121,7 +119,6 @@ void FaceBoxesV2::generate_anchors(const int target_height,
     }
   }
 
-  anchors_is_already_generated = true;
 }
 
 

diff --git a/lite/ort/cv/faceboxesv2.h b/lite/ort/cv/faceboxesv2.h
@@ -38,7 +38,6 @@ namespace ortcv
         {256},
         {512}
     };
-    bool anchors_is_already_generated = false;
 
     enum NMS
     {

diff --git a/lite/tnn/cv/tnn_faceboxesv2.cpp b/lite/tnn/cv/tnn_faceboxesv2.cpp
@@ -74,8 +74,6 @@ void TNNFaceBoxesV2::detect(const cv::Mat &mat, std::vector<types::Boxf> &detect
 void TNNFaceBoxesV2::generate_anchors(const int target_height, const int target_width,
                                       std::vector<FaceBoxesAnchorV2> &anchors)
 {
-  if (anchors_is_already_generated) return;
-
   std::vector<std::vector<int>> feature_maps;
   for (auto step: steps)
   {
@@ -148,8 +146,6 @@ void TNNFaceBoxesV2::generate_anchors(const int target_height, const int target_
       }
     }
   }
-
-  anchors_is_already_generated = true;
 }
 
 void TNNFaceBoxesV2::generate_bboxes(std::vector<types::Boxf> &bbox_collection,

diff --git a/lite/tnn/cv/tnn_faceboxesv2.h b/lite/tnn/cv/tnn_faceboxesv2.h
@@ -42,7 +42,6 @@ namespace tnncv
         {256},
         {512}
     };
-    bool anchors_is_already_generated = false;
 
     enum NMS
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ namespace mnncv @@
             {256},
             {512}
         };
-        bool anchors_is_already_generated = false;
         enum NMS
         {
@@ Expand Down @@