Merge branch 'master' of https://github.com/biometrics/openbr

Scott Klum
2 parents 2f4fffed 4c9bff3e
Showing 6 changed files with 94 additions and 34 deletions
CMakeLists.txt
openbr/core/eval.cpp
openbr/plugins/meta.cpp
openbr/plugins/pp5.cpp
openbr/plugins/slidingwindow.cpp
openbr/plugins/stream.cpp
@@ -19,9 +19,11 @@ set(PACKAGE_YEAR 2013)
 if(${CMAKE_VERSION} VERSION_EQUAL 2.8.11)
   cmake_policy(SET CMP0020 OLD)
+  cmake_policy(SET CMP0022 OLD)
 endif()
 if(${CMAKE_VERSION} VERSION_GREATER 2.8.11)
   cmake_policy(SET CMP0020 OLD)
+  cmake_policy(SET CMP0022 OLD)
 endif()
 if(${CMAKE_SIZEOF_VOID_P} MATCHES 8)
@@ -394,6 +394,7 @@ static QStringList computeDetectionResults(const QList&lt;ResolvedDetection&gt; &amp;detec
     for (int i=0; i<detections.size(); i++) {
         const ResolvedDetection &detection = detections[i];
         if (discrete) {
+            // A 50% overlap is considered a true positive
             if (detection.overlap >= 0.5) TP++;
             else                          FP++;
         } else {
@@ -507,11 +508,13 @@ float EvalDetection(const QString &amp;predictedGallery, const QString &amp;truthGallery
     QMap<QString, Detections> allDetections = getDetections(predicted, truth);
     QList<ResolvedDetection> resolvedDetections, falseNegativeDetections;
-    foreach (Detections detections, allDetections.values()) {
+    foreach (Detections detections, allDetections.values()) { // For every file
+        // Try to associate ground truth detections with predicted detections
         while (!detections.truth.isEmpty() && !detections.predicted.isEmpty()) {
-            const Detection truth = detections.truth.takeFirst();
+            const Detection truth = detections.truth.takeFirst(); // Take removes the detection
             int bestIndex = -1;
             float bestOverlap = -std::numeric_limits<float>::max();
+            // Find the nearest predicted detection to this ground truth detection
             for (int i=0; i<detections.predicted.size(); i++) {
                 const float overlap = truth.overlap(detections.predicted[i]);
                 if (overlap > bestOverlap) {
@@ -519,6 +522,9 @@ float EvalDetection(const QString &amp;predictedGallery, const QString &amp;truthGallery
                     bestIndex = i;
                 }
             }
+            // Removing the detection prevents us from considering it twice.
+            // We don't want to associate two ground truth detections with the
+            // same prediction, over vice versa.
             const Detection predicted = detections.predicted.takeAt(bestIndex);
             resolvedDetections.append(ResolvedDetection(predicted.confidence, bestOverlap));
         }
@@ -717,6 +717,42 @@ public:
 };
 BR_REGISTER(Transform, DistributeTemplateTransform)
+/*!
+ * \ingroup transforms
+ * \brief Filters a gallery based on the value of a metadata field.
+ * \author Brendan Klare \cite bklare
+ */
+class FilterOnMetadataTransform : public UntrainableMetaTransform
+{
+    Q_OBJECT
+    Q_PROPERTY(QString attributeName READ get_attributeName WRITE set_attributeName RESET reset_attributeName STORED false)
+    Q_PROPERTY(float threshold READ get_threshold WRITE set_threshold RESET reset_threshold STORED false)
+    Q_PROPERTY(bool isGreaterThan READ get_isGreaterThan WRITE set_isGreaterThan RESET reset_isGreaterThan STORED false)
+    BR_PROPERTY(QString, attributeName, "Confidence")
+    BR_PROPERTY(float, threshold, 0)
+    BR_PROPERTY(bool, isGreaterThan, true)
+
+    void project(const TemplateList &src, TemplateList &dst) const
+    {
+        QList<Template> filtered;
+        foreach (Template t, src) {
+            if (!t.file.contains(attributeName))
+                continue;
+            bool pass = t.file.get<float>(attributeName) > threshold;
+            if (isGreaterThan ? pass : !pass)
+                filtered.append(t);
+        }
+        dst = TemplateList(filtered);
+    }
+
+    void project(const Template &src, Template &dst) const
+    {
+        (void) src; (void) dst; qFatal("shouldn't be here");
+    }
+};
+
+BR_REGISTER(Transform, FilterOnMetadataTransform)
+
 } // namespace br
 #include "meta.moc"
@@ -45,7 +45,7 @@ class PP5Initializer : public Initializer
     void initialize() const
     {
         TRY(ppr_initialize_sdk(qPrintable(Globals->sdkPath + "/share/openbr/models/pp5/"), my_license_id, my_license_key))
-        Globals->abbreviations.insert("PP5","Open!PP5Enroll:PP5Compare");
+        Globals->abbreviations.insert("PP5","Open+Expand+PP5Enroll:PP5Compare");
         Globals->abbreviations.insert("PP5Register", "Open+PP5Enroll(true)+RenameFirst([eyeL,PP5_Landmark0_Right_Eye],Affine_0)+RenameFirst([eyeR,PP5_Landmark1_Left_Eye],Affine_1)");
         Globals->abbreviations.insert("PP5CropFace", "Open+PP5Enroll(true)+RenameFirst([eyeL,PP5_Landmark0_Right_Eye],Affine_0)+RenameFirst([eyeR,PP5_Landmark1_Left_Eye],Affine_1)+Affine(128,128,0.25,0.35)+Cvt(Gray)");
     }
@@ -164,6 +164,7 @@ static TemplateList cropTrainingSamples(const TemplateList &amp;data, const float as
                 continue;
             result += Template(tmpl.file, Mat(tmpl, posRect));
+            result.last().file.set("Label", QString("pos"));
             // Add random negative samples
             Mat m = tmpl.m();
@@ -477,13 +477,17 @@ public:
         if (frameNumber == final_frame) {
             // We just received the last frame, better pulse
             allReturned = true;
-            lastReturned.wakeAll();
             rval = true;
         }
         return rval;
     }
+    void wake()
+    {
+        lastReturned.wakeAll();
+    }
+
     bool waitLast()
     {
         QMutexLocker lock(&last_frame_update);
@@ -627,9 +631,9 @@ public:
     }
     virtual ~ProcessingStage() {}
-    virtual FrameData* run(FrameData * input, bool & should_continue)=0;
+    virtual FrameData* run(FrameData * input, bool & should_continue, bool & final)=0;
-    virtual bool tryAcquireNextStage(FrameData *& input)=0;
+    virtual bool tryAcquireNextStage(FrameData *& input, bool & final)=0;
     int stage_id;
@@ -648,23 +652,6 @@ protected:
 };
-void BasicLoop::run()
-{
-    int current_idx = start_idx;
-    FrameData * target_item = startItem;
-    bool should_continue = true;
-    forever
-    {
-        target_item = stages->at(current_idx)->run(target_item, should_continue);
-        if (!should_continue) {
-            break;
-        }
-        current_idx++;
-        current_idx = current_idx % stages->size();
-    }
-    this->reportFinished();
-}
-
 class MultiThreadStage : public ProcessingStage
 {
 public:
@@ -672,7 +659,7 @@ public:
     // Not much to worry about here, we will project the input
     // and try to continue to the next stage.
-    FrameData * run(FrameData * input, bool & should_continue)
+    FrameData * run(FrameData * input, bool & should_continue, bool & final)
     {
         if (input == NULL) {
             qFatal("null input to multi-thread stage");
@@ -680,16 +667,17 @@ public:
         input->data >> *transform;
-        should_continue = nextStage->tryAcquireNextStage(input);
+        should_continue = nextStage->tryAcquireNextStage(input, final);
         return input;
     }
     // Called from a different thread than run. Nothing to worry about
     // we offer no restrictions on when loops may enter this stage.
-    virtual bool tryAcquireNextStage(FrameData *& input)
+    virtual bool tryAcquireNextStage(FrameData *& input, bool & final)
     {
         (void) input;
+        final = false;
         return true;
     }
@@ -744,7 +732,7 @@ public:
     QReadWriteLock statusLock;
     Status currentStatus;
-    FrameData * run(FrameData * input, bool & should_continue)
+    FrameData * run(FrameData * input, bool & should_continue, bool & final)
     {
         if (input == NULL)
             qFatal("NULL input to stage %d", this->stage_id);
@@ -758,7 +746,10 @@ public:
         // Project the input we got
         transform->projectUpdate(input->data);
-        should_continue = nextStage->tryAcquireNextStage(input);
+        should_continue = nextStage->tryAcquireNextStage(input,final);
+
+        if (final)
+            return input;
         // Is there anything on our input buffer? If so we should start a thread with that.
         QWriteLocker lock(&statusLock);
@@ -792,8 +783,9 @@ public:
     // Calledfrom a different thread than run.
-    bool tryAcquireNextStage(FrameData *& input)
+    bool tryAcquireNextStage(FrameData *& input, bool & final)
     {
+        final = false;
         inputBuffer->addItem(input);
         QReadLocker lock(&statusLock);
@@ -865,13 +857,13 @@ public:
         SingleThreadStage::reset();
     }
-    FrameData * run(FrameData * input, bool & should_continue)
+    FrameData * run(FrameData * input, bool & should_continue, bool & final)
     {
         if (input == NULL)
             qFatal("NULL frame in input stage");
         // Can we enter the next stage?
-        should_continue = nextStage->tryAcquireNextStage(input);
+        should_continue = nextStage->tryAcquireNextStage(input, final);
         // Try to get a frame from the datasource, we keep working on
         // the frame we have, but we will queue another job for the next
@@ -893,14 +885,14 @@ public:
     }
     // The last stage, trying to access the first stage
-    bool tryAcquireNextStage(FrameData *& input)
+    bool tryAcquireNextStage(FrameData *& input, bool & final)
     {
         // Return the frame, was it the last one?
-        bool was_last = dataSource.returnFrame(input);
+        final = dataSource.returnFrame(input);
         input = NULL;
         // OK we won't continue.
-        if (was_last) {
+        if (final) {
             return false;
         }
@@ -943,6 +935,29 @@ public:
     }
 };
+void BasicLoop::run()
+{
+    int current_idx = start_idx;
+    FrameData * target_item = startItem;
+    bool should_continue = true;
+    bool the_end = false;
+    forever
+    {
+        target_item = stages->at(current_idx)->run(target_item, should_continue, the_end);
+        if (!should_continue) {
+            break;
+        }
+        current_idx++;
+        current_idx = current_idx % stages->size();
+    }
+    if (the_end) {
+        dynamic_cast<ReadStage *> (stages->at(0))->dataSource.wake();
+    }
+
+    this->reportFinished();
+
+}
+
 class DirectStreamTransform : public CompositeTransform
 {
     Q_OBJECT