Peter M. Groen / openbr

Commit e41e406f5b18a3ac0201a70949216ae6fcf22880

Authored by Josh Klontz
1 parent 4650acf7

Refactored br_universal_template format

Inline Side-by-side
Showing 3 changed files with 30 additions and 45 deletions
openbr/plugins/gallery/binary.cpp
  View file @e41e406
... ... @@ -213,23 +213,22 @@ class utGallery : public BinaryGallery
213 213 Template t;
214 214 br_universal_template ut;
215 215 if (gallery.read((char*)&ut, sizeof(br_universal_template)) == sizeof(br_universal_template)) {
216   - QByteArray data(ut.urlSize + ut.fvSize, Qt::Uninitialized);
  216 + QByteArray data(ut.mdSize + ut.fvSize, Qt::Uninitialized);
217 217 char *dst = data.data();
218   - qint64 bytesNeeded = ut.urlSize + ut.fvSize;
  218 + qint64 bytesNeeded = ut.mdSize + ut.fvSize;
219 219 while (bytesNeeded > 0) {
220 220 qint64 bytesRead = gallery.read(dst, bytesNeeded);
221 221 if (bytesRead <= 0) {
222 222 qDebug() << gallery.errorString();
223   - qFatal("Unexepected EOF while reading universal template data, needed: %d more of: %d bytes.", int(bytesNeeded), int(ut.urlSize + ut.fvSize));
  223 + qFatal("Unexepected EOF while reading universal template data, needed: %d more of: %d bytes.", int(bytesNeeded), int(ut.mdSize + ut.fvSize));
224 224 }
225 225 bytesNeeded -= bytesRead;
226 226 dst += bytesRead;
227 227 }
228 228  
229   - t.file.set("ImageID", QVariant(QByteArray((const char*)ut.imageID, 16).toHex()));
230 229 t.file.set("AlgorithmID", ut.algorithmID);
231 230 t.file.set("URL", QString(data.data()));
232   - char *dataStart = data.data() + ut.urlSize;
  231 + char *dataStart = data.data() + ut.mdSize;
233 232 uint32_t dataSize = ut.fvSize;
234 233 if ((ut.algorithmID <= -1) && (ut.algorithmID >= -3)) {
235 234 t.file.set("FrontalFace", QRectF(ut.x, ut.y, ut.width, ut.height));
... ... @@ -269,7 +268,6 @@ class utGallery : public BinaryGallery
269 268 dataStart += sizeof(uint16_t);
270 269  
271 270 // Set metadata
272   - t.file.set("Label", ut.label);
273 271 t.file.set("X", ut.x);
274 272 t.file.set("Y", ut.y);
275 273 t.file.set("Width", ut.width);
... ... @@ -277,14 +275,12 @@ class utGallery : public BinaryGallery
277 275  
278 276 t.append(cv::Mat(matrixRows, matrixCols, CV_MAKETYPE(dataType, matrixDepth), dataStart).clone() /* We don't want a shallow copy! */);
279 277 return t;
280   - }
281   - else {
  278 + } else {
282 279 t.file.set("X", ut.x);
283 280 t.file.set("Y", ut.y);
284 281 t.file.set("Width", ut.width);
285 282 t.file.set("Height", ut.height);
286 283 }
287   - t.file.set("Label", ut.label);
288 284 t.append(cv::Mat(1, dataSize, CV_8UC1, dataStart).clone() /* We don't want a shallow copy! */);
289 285 } else {
290 286 if (!gallery.atEnd())
... ... @@ -296,15 +292,11 @@ class utGallery : public BinaryGallery
296 292  
297 293 void writeTemplate(const Template &t)
298 294 {
299   - const QByteArray imageID = QByteArray::fromHex(t.file.get<QByteArray>("ImageID", QByteArray(32, '0')));
300   - if (imageID.size() != 16)
301   - qFatal("Expected 16-byte ImageID, got: %d bytes.", imageID.size());
302   -
303 295 const int32_t algorithmID = (t.isEmpty() || t.file.fte) ? 0 : t.file.get<int32_t>("AlgorithmID");
304 296  
305 297 // QUrl::fromUserInput provides some nice functionality in terms of completing URLs
306 298 // e.g. C:/test.jpg -> file://C:/test.jpg and google.com/image.jpg -> http://google.com/image.jpg
307   - const QByteArray url = QUrl::fromUserInput(t.file.get<QString>("URL", t.file.name)).toEncoded();
  299 + const QByteArray metadata = QUrl::fromUserInput(t.file.get<QString>("URL", t.file.name)).toEncoded();
308 300  
309 301 int32_t x = 0, y = 0;
310 302 uint32_t width = 0, height = 0;
... ... @@ -333,24 +325,21 @@ class utGallery : public BinaryGallery
333 325 width = t.file.get<uint32_t>("Width", 0);
334 326 height = t.file.get<uint32_t>("Height", 0);
335 327 }
336   - const uint32_t label = t.file.get<uint32_t>("Label", 0);
337 328  
338   - gallery.write(imageID);
339 329 gallery.write((const char*) &algorithmID, sizeof(int32_t));
340 330 gallery.write((const char*) &x , sizeof(int32_t));
341 331 gallery.write((const char*) &y , sizeof(int32_t));
342 332 gallery.write((const char*) &width , sizeof(uint32_t));
343 333 gallery.write((const char*) &height , sizeof(uint32_t));
344   - gallery.write((const char*) &label , sizeof(uint32_t));
345 334  
346   - const uint32_t urlSize = url.size() + 1;
347   - gallery.write((const char*) &urlSize, sizeof(uint32_t));
  335 + const uint32_t mdSize = metadata.size() + 1;
  336 + gallery.write((const char*) &mdSize, sizeof(uint32_t));
348 337  
349 338 const uint32_t signatureSize = (algorithmID == 0) ? 0 : t.m().rows * t.m().cols * t.m().elemSize();
350 339 const uint32_t fvSize = header.size() + signatureSize;
351 340 gallery.write((const char*) &fvSize, sizeof(uint32_t));
352 341  
353   - gallery.write((const char*) url.data(), urlSize);
  342 + gallery.write((const char*) metadata.data(), mdSize);
354 343 if (algorithmID != 0) {
355 344 gallery.write(header);
356 345 gallery.write((const char*) t.m().data, signatureSize);
... ...
openbr/universal_template.cpp
  View file @e41e406
... ... @@ -8,21 +8,19 @@
8 8  
9 9 #include "universal_template.h"
10 10  
11   -br_utemplate br_new_utemplate(const char *imageID, int32_t algorithmID, int32_t x, int32_t y, uint32_t width, uint32_t height, uint32_t label, const char *url, const char *fv, uint32_t fvSize)
  11 +br_utemplate br_new_utemplate(int32_t algorithmID, int32_t x, int32_t y, uint32_t width, uint32_t height, const char *metadata, const char *featureVector, uint32_t fvSize)
12 12 {
13   - const uint32_t urlSize = strlen(url) + 1;
14   - br_utemplate utemplate = (br_utemplate) malloc(sizeof(br_universal_template) + urlSize + fvSize);
15   - memcpy(utemplate->imageID, imageID, 16);
  13 + const uint32_t mdSize = strlen(metadata) + 1;
  14 + br_utemplate utemplate = (br_utemplate) malloc(sizeof(br_universal_template) + mdSize + fvSize);
16 15 utemplate->algorithmID = algorithmID;
17 16 utemplate->x = x;
18 17 utemplate->y = y;
19 18 utemplate->width = width;
20 19 utemplate->height = height;
21   - utemplate->label = label;
22   - utemplate->urlSize = urlSize;
  20 + utemplate->mdSize = mdSize;
23 21 utemplate->fvSize = fvSize;
24   - memcpy(reinterpret_cast<char*>(utemplate+1) + 0, url , urlSize);
25   - memcpy(reinterpret_cast<char*>(utemplate+1) + urlSize, fv, fvSize);
  22 + memcpy(reinterpret_cast<char*>(utemplate+1) + 0, metadata , mdSize);
  23 + memcpy(reinterpret_cast<char*>(utemplate+1) + mdSize, featureVector, fvSize);
26 24 return utemplate;
27 25 }
28 26  
... ... @@ -33,14 +31,14 @@ void br_free_utemplate(br_const_utemplate utemplate)
33 31  
34 32 void br_append_utemplate(FILE *file, br_const_utemplate utemplate)
35 33 {
36   - fwrite(utemplate, sizeof(br_universal_template) + utemplate->urlSize + utemplate->fvSize, 1, file);
  34 + fwrite(utemplate, sizeof(br_universal_template) + utemplate->mdSize + utemplate->fvSize, 1, file);
37 35 }
38 36  
39 37 void br_iterate_utemplates(br_const_utemplate begin, br_const_utemplate end, br_utemplate_callback callback, br_callback_context context)
40 38 {
41 39 while (begin != end) {
42 40 callback(begin, context);
43   - begin = reinterpret_cast<br_const_utemplate>(reinterpret_cast<const char*>(begin) + sizeof(br_universal_template) + begin->urlSize + begin->fvSize);
  41 + begin = reinterpret_cast<br_const_utemplate>(reinterpret_cast<const char*>(begin) + sizeof(br_universal_template) + begin->mdSize + begin->fvSize);
44 42 if (begin > end)
45 43 qFatal("Overshot end of buffer");
46 44 }
... ... @@ -88,8 +86,8 @@ int br_iterate_utemplates_file(FILE *file, br_utemplate_callback callback, br_ca
88 86 break;
89 87 }
90 88  
91   - t = (br_utemplate) realloc(t, sizeof(br_universal_template) + t->urlSize + t->fvSize);
92   - if (!read_buffer(file, (char*) &t->data, t->urlSize + t->fvSize)) {
  89 + t = (br_utemplate) realloc(t, sizeof(br_universal_template) + t->mdSize + t->fvSize);
  90 + if (!read_buffer(file, (char*) &t->data, t->mdSize + t->fvSize)) {
93 91 free(t);
94 92  
95 93 // Try to rewind header read
... ...
openbr/universal_template.h
  View file @e41e406
... ... @@ -35,18 +35,16 @@ extern &quot;C&quot; {
35 35 */
36 36 struct br_universal_template
37 37 {
38   - unsigned char imageID[16]; /*!< MD5 hash of the undecoded origin file. */
39   - int32_t algorithmID; /*!< interpretation of _data_ after _urlSize_. */
40   - int32_t x; /*!< region of interest horizontal offset (pixels). */
41   - int32_t y; /*!< region of interest vertical offset (pixels). */
42   - uint32_t width; /*!< region of interest horizontal size (pixels). */
43   - uint32_t height; /*!< region of interest vertical size (pixels). */
44   - uint32_t label; /*!< supervised training class or manually annotated ground truth. */
45   - uint32_t urlSize; /*!< length of null-terminated URL at the beginning of _data_,
46   - including the null-terminator character. */
47   - uint32_t fvSize; /*!< length of the feature vector after the URL in _data_. */
48   - unsigned char data[]; /*!< (_urlSize_ + _fvSize_)-byte buffer.
49   - The first _urlSize_ bytes represent the URL.
  38 + int32_t algorithmID; /*!< Interpretation of _data_ after _mdSize_. */
  39 + int32_t x; /*!< Region of interest horizontal offset (pixels). */
  40 + int32_t y; /*!< Region of interest vertical offset (pixels). */
  41 + uint32_t width; /*!< Region of interest horizontal size (pixels). */
  42 + uint32_t height; /*!< Region of interest vertical size (pixels). */
  43 + uint32_t mdSize; /*!< Length of a null-terminated metadata string at the beginning of _data_,
  44 + including the null-terminator character itself. */
  45 + uint32_t fvSize; /*!< Length of the feature vector after the metadata in _data_. */
  46 + unsigned char data[]; /*!< (_mdSize_ + _fvSize_)-byte buffer.
  47 + The first _mdSize_ bytes represent the metadata.
50 48 The remaining _fvSize_ bytes represent the feature vector. */
51 49 };
52 50  
... ... @@ -57,7 +55,7 @@ typedef const struct br_universal_template *br_const_utemplate;
57 55 * \brief br_universal_template constructor.
58 56 * \see br_free_utemplate
59 57 */
60   -BR_EXPORT br_utemplate br_new_utemplate(const char *imageID, int32_t algorithmID, int32_t x, int32_t y, uint32_t width, uint32_t height, uint32_t label, const char *url, const char *fv, uint32_t fvSize);
  58 +BR_EXPORT br_utemplate br_new_utemplate(int32_t algorithmID, int32_t x, int32_t y, uint32_t width, uint32_t height, uint32_t label, const char *metadata, const char *featureVector, uint32_t fvSize);
61 59  
62 60 /*!
63 61 * \brief br_universal_template destructor.
... ...