comparison transform/FeatureExtractionModelTransformer.cpp @ 1762:110f853c3149 by-id

Deleted-model checks, & debug output

         
             int completion = int
                 ((((blockFrame - contextStart) / stepSize) * 99) /
                  (contextDuration / stepSize + 1));
 
+            bool haveAllModels = true;
             if (!ModelById::get(inputId)) {
+#ifdef DEBUG_FEATURE_EXTRACTION_TRANSFORMER_RUN
+                SVDEBUG << "FeatureExtractionModelTransformer::run: Input model " << inputId << " no longer exists" << endl;
+#endif
+                haveAllModels = false;
+            } else {
+                SVDEBUG << "Input model " << inputId << " still exists" << endl;
+            }
+            for (auto mid: m_outputs) {
+                if (!ModelById::get(mid)) {
+#ifdef DEBUG_FEATURE_EXTRACTION_TRANSFORMER_RUN
+                    SVDEBUG << "FeatureExtractionModelTransformer::run: Output model " << mid << " no longer exists" << endl;
+#endif
+                    haveAllModels = false;
+                } else {
+#ifdef DEBUG_FEATURE_EXTRACTION_TRANSFORMER_RUN
+                    SVDEBUG << "Output model " << mid << " still exists" << endl;
+#endif
+                }
+            }
+            if (!haveAllModels) {
                 abandon();
-                return;
-            }
+                break;
+            }
+            
+#ifdef DEBUG_FEATURE_EXTRACTION_TRANSFORMER_RUN
+            SVDEBUG << "FeatureExtractionModelTransformer::run: All models still exist" << endl;
+#endif
 
             // channelCount is either input->channelCount or 1
 
             if (frequencyDomain) {
                 for (int ch = 0; ch < channelCount; ++ch) {

 
             for (int j = 0; in_range_for(m_outputNos, j); ++j) {
                 for (int fi = 0; in_range_for(features[m_outputNos[j]], fi); ++fi) {
                     auto feature = features[m_outputNos[j]][fi];
                     addFeature(j, blockFrame, feature);
+                    if (m_abandoned) {
+                        break;
+                    }
                 }
             }
         }
     } catch (const std::exception &e) {
         SVCERR << "FeatureExtractionModelTransformer::run: Exception caught: "

         if (!feature.hasTimestamp && m_fixedRateFeatureNos[n] >= 0) {
             model->setColumn(m_fixedRateFeatureNos[n], values);
         } else {
             model->setColumn(int(frame / model->getResolution()), values);
         }
-    }
-
-    SVDEBUG << "FeatureExtractionModelTransformer::addFeature: Unknown output model type!" << endl;
+    } else {
+        
+        SVDEBUG << "FeatureExtractionModelTransformer::addFeature: Unknown output model type - possibly a deleted model" << endl;
+        abandon();
+    }
 }
 
 void
 FeatureExtractionModelTransformer::setCompletion(int n, int completion)
 {