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

Scott Klum
2 parents 9b2cfd5b d9c315f2
Showing 4 changed files with 11 additions and 61 deletions
openbr/openbr_plugin.cpp
openbr/plugins/ct8.cpp
openbr/plugins/output.cpp
scripts/enrollFaces.sh
@@ -15,6 +15,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <QCoreApplication>
+#include <QCryptographicHash>
 #include <QFutureSynchronizer>
 #include <QMetaProperty>
 #include <QPointF>
@@ -443,7 +444,9 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
                         newTemplates.insert(i+1, allPartitionTemplate);
                     }
                 } else {
-                    newTemplates[i].file.set("Partition", rand() % crossValidate);
+                    const QByteArray md5 = QCryptographicHash::hash(newTemplates[i].file.subject().toLatin1(), QCryptographicHash::Md5);
+                    // Select the right 8 hex characters so that it can be represented as a 64 bit integer without overflow
+                    newTemplates[i].file.set("Partition", md5.toHex().right(8).toULongLong(0, 16) % crossValidate);
                 }
             }
         }
@@ -422,8 +422,14 @@ struct CT8Compare : public Distance,
         if (!srcA.m().data || !srcB.m().data) return score;
         try {
+            static QMutex mutex;
+            QMutexLocker locker(&mutex);
+
+            // Internally Cognitec keeps a total count of the allocated templates,
+            // it seems that this reference count update is not thread safe
             FRsdk::FIR firA = firBuilder->build( (FRsdk::Byte *) srcA.m().data, srcA.m().cols);
             FRsdk::FIR firB = firBuilder->build( (FRsdk::Byte *) srcB.m().data, srcB.m().cols);
+
             score = (float)facialMatchingEngine->compare(firA, firB);
         } catch (std::exception &e) {
             qFatal("CT8Compare Exception: %s", e.what());
@@ -203,7 +203,7 @@ class mtxOutput : public Output
         if (!f.open(QFile::ReadWrite))
             qFatal("Unable to open %s for modifying.", qPrintable(file));
         for (int i=0; i<blockScores.rows; i++) {
-            f.seek(headerSize + sizeof(float)*((rowBlock*Globals->blockSize+i)*targetFiles.size()+(columnBlock*Globals->blockSize)));
+            f.seek(headerSize + sizeof(float)*(quint64(rowBlock*Globals->blockSize+i)*targetFiles.size()+(columnBlock*Globals->blockSize)));
             f.write((const char*)blockScores.row(i).data, sizeof(float)*blockScores.cols);
         }
         f.close();
-#!/bin/bash
-
-if [ ! -f enrollFaces.sh ]; then
-  echo "Run this script from the scripts folder!"
-  exit
-fi
-
-if ! hash br 2>/dev/null; then
-  echo "Can't find 'br'. Did you forget to build and install OpenBR? Here's some help: http://openbiometrics.org/doxygen/latest/installation.html"
-  exit
-fi
-
-DATA_ROOT=/Volumes/Seagate
-GALLERY_ROOT=/Volumes/Seagate
-
-for ALGORITHM in PP5
-do
-
-  for SIGSET in CUFS_photo CUFS_sketch
-  do
-    br -algorithm ${ALGORITHM} -path ${DATA_ROOT}/CUFS -enroll ../data/CUFS/sigset/${SIGSET}.xml ${GALLERY_ROOT}/galleries/${ALGORITHM}_${SIGSET}.gal
-  done
-
-  for SIGSET in CUFSF_photo CUFSF_sketch
-  do
-    br -algorithm ${ALGORITHM} -path ${DATA_ROOT}/CUFSF -enroll ../data/CUFSF/sigset/${SIGSET}.xml ${GALLERY_ROOT}/galleries/${ALGORITHM}_${SIGSET}.gal
-  done
-
-  for SIGSET in fa fb fc dup1 dup2
-  do
-    br -algorithm ${ALGORITHM} -path "${DATA_ROOT}/FERET/dvd2/gray_feret_cd1/data/images/;${DATA_ROOT}/FERET/dvd2/gray_feret_cd2/data/images/" -enroll ../data/FERET/sigset/${SIGSET}.xml ${GALLERY_ROOT}/galleries/${ALGORITHM}_${SIGSET}.gal
-  done
-
-  for SIGSET in FRGC-1 FRGC-2 FRGC-4_target FRGC-4_query
-  do
-    br -algorithm ${ALGORITHM} -path ${DATA_ROOT}/FRGC2 -enroll ../data/FRGC/sigset/${SIGSET}.xml ${GALLERY_ROOT}/galleries/${ALGORITHM}_${SIGSET}.gal
-  done
-
-  for SIGSET in HFB_NIR HFB_VIS
-  do
-    br -algorithm ${ALGORITHM} -path ${DATA_ROOT}/HFB -enroll ../data/HFB/sigset/${SIGSET}.xml ${GALLERY_ROOT}/galleries/${ALGORITHM}_${SIGSET}.gal
-  done
-
-  for SIGSET in LFW
-  do
-    br -algorithm ${ALGORITHM} -path ${DATA_ROOT}/LFW -enroll ../data/LFW/sigset/${SIGSET}.xml ${GALLERY_ROOT}/galleries/${ALGORITHM}_${SIGSET}.gal
-  done
-
-  for SIGSET in MEDS_frontal_all
-  do
-    br -algorithm ${ALGORITHM} -path ${DATA_ROOT}/MEDS -enroll ../data/MEDS/sigset/${SIGSET}.xml ${GALLERY_ROOT}/galleries/${ALGORITHM}_${SIGSET}.gal
-  done
-
-  for SIGSET in PCSO_2x10k
-  do
-    br -algorithm ${ALGORITHM} -path ${DATA_ROOT}/PCSO -enroll ../data/PCSO/sigset/${SIGSET}.xml ${GALLERY_ROOT}/galleries/${ALGORITHM}_${SIGSET}.gal
-  done
-
-done
 \ No newline at end of file