fixed you tube face sorting issue

Josh Klontz
1 parent d7b36b93
Showing 2 changed files with 30 additions and 6 deletions
sdk/core/core.cpp
sdk/plugins/youtube.cpp
@@ -259,7 +259,7 @@ private:
         if (Globals->abbreviations.contains(description))
             return init(Globals->abbreviations[description]);
-        QStringList words = description.split(':');
+        QStringList words = QtUtils::parse(description, ':');
         if (words.size() > 2) qFatal("Invalid algorithm format.");
         transform = QSharedPointer<Transform>(Transform::make(words[0], NULL));
 #include <openbr_plugin.h>
+#include "core/common.h"
+
 namespace br
 {
@@ -24,20 +26,22 @@ class YouTubeFacesDBTransform : public UntrainableMetaTransform
         distance = Distance::fromAlgorithm(algorithm);
     }
-    void project(const Template &src, Template &dst) const
+    void project(const TemplateList &src, TemplateList &dst) const
     {
-        dst = src;
-
-        // First input is the header in 'splits.txt'
-        if (src.file.getInt("Index") == 0) return;
+        Transform::project(src.mid(1) /* First template is the header in 'splits.txt' */, dst);
+    }
+    void project(const Template &src, Template &dst) const
+    {
         const QStringList words = src.file.name.split(", ");
         dst.file.name = words[0] + "_" + words[1] + "_" + words[4] + ".mtx";
         TemplateList queryTemplates = TemplateList::fromGallery(File(words[2]).resolved());
+        sort(queryTemplates);
         queryTemplates >> *transform;
         TemplateList targetTemplates = TemplateList::fromGallery(File(words[3]).resolved());
+        sort(targetTemplates);
         targetTemplates >> *transform;
         QScopedPointer<MatrixOutput> memoryOutput(MatrixOutput::make(targetTemplates.files(), queryTemplates.files()));
@@ -46,6 +50,26 @@ class YouTubeFacesDBTransform : public UntrainableMetaTransform
         dst.clear();
         dst.m() = memoryOutput.data()->data;
     }
+
+    static void sort(TemplateList &templates)
+    {
+        // The file names in the YouTube Faces Database make it very difficult
+        // for them to be ordered by frame number automatically,
+        // hence we do it manually here.
+        QList<int> frames;
+        foreach (const Template &t, templates) {
+            QStringList words = t.file.name.split('.');
+            frames.append(words[words.size()-2].toInt());
+        }
+
+        typedef QPair<int,int> SortedFrame; // <frame number, original index>
+        QList<SortedFrame> sortedFrames = Common::Sort(frames);
+        TemplateList sortedTemplates; sortedTemplates.reserve(templates.size());
+        foreach (const SortedFrame &sortedFrame, sortedFrames)
+            sortedTemplates.append(templates[sortedFrame.second]);
+
+        templates = sortedTemplates;
+    }
 };
 BR_REGISTER(Transform, YouTubeFacesDBTransform)