Commit 1873e403 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

not too many changes

parent ed88f719
...@@ -8,4 +8,4 @@ From **Eclipse (2019-12)**: ...@@ -8,4 +8,4 @@ From **Eclipse (2019-12)**:
* File > Open Projects from File System... * File > Open Projects from File System...
* Directory... > navigate to project's root > Finish * Directory... > navigate to project's root > Finish
Tried a few times - indexer wouldn't work sometimes. Tried importing a few times - indexer does not work sometimes.
...@@ -49,6 +49,7 @@ int InferenceBase::Init(string videoStream) ...@@ -49,6 +49,7 @@ int InferenceBase::Init(string videoStream)
return -1; return -1;
} }
/*
if (ReadGraph() != 0) if (ReadGraph() != 0)
{ {
LOG(ERROR) << "Could not load inference graph"; LOG(ERROR) << "Could not load inference graph";
...@@ -68,6 +69,7 @@ int InferenceBase::Init(string videoStream) ...@@ -68,6 +69,7 @@ int InferenceBase::Init(string videoStream)
auto formatStruct = d_reader->format(); auto formatStruct = d_reader->format();
width = formatStruct.width; width = formatStruct.width;
height = formatStruct.height; height = formatStruct.height;
*/
isInitialized = true; isInitialized = true;
return 0; return 0;
...@@ -118,4 +120,4 @@ void InferenceBase::RunInferenceOnStream() ...@@ -118,4 +120,4 @@ void InferenceBase::RunInferenceOnStream()
LOG(INFO) << "Speed: " << to_string(fps).substr(0, 5); LOG(INFO) << "Speed: " << to_string(fps).substr(0, 5);
} }
} }
} }
\ No newline at end of file
...@@ -21,12 +21,10 @@ int main(int argc, char *argv[]) ...@@ -21,12 +21,10 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
cout << "Hello world!\n";
const String keys = const String keys =
"{d display |1 | view video while objects are detected}" "{d display |1 | view video while objects are detected}"
//"{t tensorrt|false | use tensorrt}" //"{t tensorrt|false | use tensorrt}"
"{i int8|false| use INT8 (requires callibration)}" //"{i int8|false| use INT8 (requires callibration)}"
"{v video | | video for detection}" "{v video | | video for detection}"
"{graph ||frozen graph location}" "{graph ||frozen graph location}"
"{labels ||trained labels filelocation}"; "{labels ||trained labels filelocation}";
...@@ -38,16 +36,21 @@ int main(int argc, char *argv[]) ...@@ -38,16 +36,21 @@ int main(int argc, char *argv[])
int showWindow = parser.get<int>("d"); int showWindow = parser.get<int>("d");
String video_file = parser.get<String>("v"); String video_file = parser.get<String>("v");
//bool is_tensor_rt = parser.get<bool>("t"); //bool is_tensor_rt = parser.get<bool>("t");
bool is_int8 = parser.get<bool>("i"); //bool is_int8 = parser.get<bool>("i");
String LABELS = parser.get<String>("labels"); String LABELS = parser.get<String>("labels");
String GRAPH = parser.get<String>("graph"); String GRAPH = parser.get<String>("graph");
unique_ptr<InferenceBase> infer((InferenceBase *) new InferenceTensorflow(LABELS, GRAPH)); unique_ptr<InferenceBase> infer((InferenceBase *) new InferenceTensorflow(LABELS, GRAPH));
infer->set_debug(showWindow); infer->set_debug(showWindow);
cout << "Init()\n";
infer->Init(video_file); infer->Init(video_file);
infer->RunInferenceOnStream();
// never reached?
cout << "EXIT 0\n";
//infer->RunInferenceOnStream();
return 0; return 0;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment