Merge pull request #2531 from Wovchena/demos-reshape-after-shape-verification-make-sure-personRects.begin-returns-non-end-iterator

demos: reshape after shape verification, make sure personRects.begin(); returns non end iterator

Author: Wovchena

demos/common/cpp/models/src/deblurring_model.cpp

@@ -29,7 +29,6 @@ DeblurringModel::DeblurringModel(const std::string& modelFileName, const cv::Siz
 void DeblurringModel::prepareInputsOutputs(CNNNetwork& cnnNetwork) {
     // --------------------------- Configure input & output -------------------------------------------------
     // --------------------------- Prepare input blobs ------------------------------------------------------
-    changeInputSize(cnnNetwork);
 
     ICNNNetwork::InputShapes inputShapes = cnnNetwork.getInputShapes();
     if (inputShapes.size() != 1)
@@ -52,6 +51,8 @@ void DeblurringModel::prepareInputsOutputs(CNNNetwork& cnnNetwork) {
     const SizeVector& outSizeVector = data.getTensorDesc().getDims();
     if (outSizeVector.size() != 4 || outSizeVector[0] != 1 || outSizeVector[1] != 3)
         throw std::runtime_error("3-channel 4-dimensional model's output is expected");
+
+    changeInputSize(cnnNetwork);
 }
 
 void DeblurringModel::changeInputSize(CNNNetwork& cnnNetwork) {

demos/social_distance_demo/cpp/main.cpp

@@ -518,43 +518,45 @@ bool DetectionsProcessor::isReady() {
 }
 
 void DetectionsProcessor::process() {
-    Context& context = static_cast<ReborningVideoFrame*>(sharedVideoFrame.get())->context;
-
-    if (!FLAGS_m_reid.empty()) {
-        auto personRectsIt = personRects.begin();
-
-        for (auto reidRequestsIt = reservedReIdRequests.begin(); reidRequestsIt != reservedReIdRequests.end(); personRectsIt++, reidRequestsIt++) {
-            const cv::Rect personRect = *personRectsIt;
-            InferRequest& reidRequest = *reidRequestsIt;
-            context.detectionsProcessorsContext.reid.setImage(reidRequest, sharedVideoFrame->frame, personRect);
-
-            reidRequest.SetCompletionCallback(
-                std::bind([](std::shared_ptr<ClassifiersAggregator> classifiersAggregator,
-                             InferRequest &reidRequest, cv::Rect rect, Context &context) {
-                                 reidRequest.SetCompletionCallback([] {}); // destroy the stored bind object
-                                 std::vector<float> result = context.detectionsProcessorsContext.reid.getResults(reidRequest);
-
-                                 classifiersAggregator->push(cv::Rect(rect));
-                                 classifiersAggregator->push(TrackableObject{rect,
-                                        std::move(result), {rect.x + rect.width / 2, rect.y + rect.height } });
-                                 context.reidInfers.inferRequests.lockedPushBack(reidRequest);
-                          },
-                          classifiersAggregator, std::ref(reidRequest), personRect, std::ref(context)));
+    if (!personRects.empty()) {
+        Context& context = static_cast<ReborningVideoFrame*>(sharedVideoFrame.get())->context;
 
-            reidRequest.StartAsync();
-        }
-        personRects.erase(personRects.begin(), personRectsIt);
-    } else {
-        for (const cv::Rect& personRect : personRects) {
-            classifiersAggregator->push(cv::Rect(personRect));
+        if (!FLAGS_m_reid.empty()) {
+            auto personRectsIt = personRects.begin();
+
+            for (auto reidRequestsIt = reservedReIdRequests.begin(); reidRequestsIt != reservedReIdRequests.end(); personRectsIt++, reidRequestsIt++) {
+                const cv::Rect personRect = *personRectsIt;
+                InferRequest& reidRequest = *reidRequestsIt;
+                context.detectionsProcessorsContext.reid.setImage(reidRequest, sharedVideoFrame->frame, personRect);
+
+                reidRequest.SetCompletionCallback(
+                    std::bind([](std::shared_ptr<ClassifiersAggregator> classifiersAggregator,
+                                InferRequest &reidRequest, cv::Rect rect, Context &context) {
+                                    reidRequest.SetCompletionCallback([] {}); // destroy the stored bind object
+                                    std::vector<float> result = context.detectionsProcessorsContext.reid.getResults(reidRequest);
+
+                                    classifiersAggregator->push(cv::Rect(rect));
+                                    classifiersAggregator->push(TrackableObject{rect,
+                                            std::move(result), {rect.x + rect.width / 2, rect.y + rect.height } });
+                                    context.reidInfers.inferRequests.lockedPushBack(reidRequest);
+                            },
+                            classifiersAggregator, std::ref(reidRequest), personRect, std::ref(context)));
+
+                reidRequest.StartAsync();
+            }
+            personRects.erase(personRects.begin(), personRectsIt);
+        } else {
+            for (const cv::Rect& personRect : personRects) {
+                classifiersAggregator->push(cv::Rect(personRect));
+            }
+            personRects.clear();
         }
-        personRects.clear();
-    }
 
-    // Run DetectionsProcessor for remaining persons
-    if (!personRects.empty()) {
-        tryPush(context.detectionsProcessorsContext.reidTasksWorker,
-                std::make_shared<DetectionsProcessor>(sharedVideoFrame, std::move(classifiersAggregator), std::move(personRects)));
+        // Run DetectionsProcessor for remaining persons
+        if (!personRects.empty()) {
+            tryPush(context.detectionsProcessorsContext.reidTasksWorker,
+                    std::make_shared<DetectionsProcessor>(sharedVideoFrame, std::move(classifiersAggregator), std::move(personRects)));
+        }
     }
 }