index 4e538b74cab714964810ef98bc8afabb6c292585..3e7238d1659d8da4303fda5f1f001a46df2a9b21 100644 (file)
#include "executor.h"
#include "execution_object.h"
#include "configuration.h"
-#include "object_classes.h"
+#include "../common/object_classes.h"
#include "../common/utils.h"
#include "../common/video_utils.h"
#define DEFAULT_CONFIG "jseg21_tiscapes"
#define DEFAULT_INPUT "../test/testvecs/input/000100_1024x512_bgr.y"
#define DEFAULT_INPUT_FRAMES (9)
+#define DEFAULT_OBJECT_CLASSES_LIST_FILE "jseg21_objects.json"
-object_class_table_t *object_class_table;
+std::unique_ptr<ObjectClasses> object_classes;
uint32_t orig_width;
uint32_t orig_height;
// Process arguments
cmdline_opts_t opts;
opts.config = DEFAULT_CONFIG;
+ opts.object_classes_list_file = DEFAULT_OBJECT_CLASSES_LIST_FILE;
if (num_eves != 0) { opts.num_eves = 1; opts.num_dsps = 0; }
else { opts.num_eves = 0; opts.num_dsps = 1; }
if (! ProcessArgs(argc, argv, opts))
else
cout << "Input: " << opts.input_file << endl;
- // Get object class table
- if ((object_class_table = GetObjectClassTable(opts.config)) == nullptr)
+ // Get object classes list
+ object_classes = std::unique_ptr<ObjectClasses>(
+ new ObjectClasses(opts.object_classes_list_file));
+ if (object_classes->GetNumClasses() == 0)
{
cout << "No object classes defined for this config." << endl;
return EXIT_FAILURE;
{
for (int i = 0; i < channel_size; i++)
{
- object_class_t *object_class = GetObjectClass(object_class_table,
- classes[i]);
- mb[i] = object_class->color.blue;
- mg[i] = object_class->color.green;
- mr[i] = object_class->color.red;
+ const ObjectClass& object_class = object_classes->At(classes[i]);
+ mb[i] = object_class.color.blue;
+ mg[i] = object_class.color.green;
+ mr[i] = object_class.color.red;
}
}
" -i camera<number> Use camera as input\n"
" video input port: /dev/video<number>\n"
" -i <name>.{mp4,mov,avi} Use video file as input\n"
+ " -l <objects_list> Path to the object classes list file\n"
" -f <number> Number of frames to process\n"
" -w <number> Output image/video width\n"
" -v Verbose output during execution\n"