VSAG/amadeus_26_fb
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整main函数不同模式的执行逻辑，以略微提升运行效率

Browse Source
This commit is contained in:
xinyang
2019-05-03 20:22:05 +08:00
parent d1b9e8b530
commit 37f6da5dd6
1 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main.cpp
View File

@@ -53,7 +53,7 @@ int main(int argc, char *argv[]){
WrapperHead *video_energy; WrapperHead *video_energy;
if (from_camera) { if (from_camera) {
video_armor = new CameraWrapper(0); video_armor = new CameraWrapper(0);
// video_energy = new CameraWrapper(1); video_energy = new CameraWrapper(1);
} else { } else {
video_armor = new VideoWrapper("/home/xinyang/Desktop/Video.mp4"); video_armor = new VideoWrapper("/home/xinyang/Desktop/Video.mp4");
video_energy = new VideoWrapper("/home/xinyang/Desktop/Video.mp4"); video_energy = new VideoWrapper("/home/xinyang/Desktop/Video.mp4");
@@ -74,17 +74,20 @@ int main(int argc, char *argv[]){
while (ok) { while (ok) {
CNT_TIME(WORD_LIGHT_CYAN, "Total", { CNT_TIME(WORD_LIGHT_CYAN, "Total", {
ok = video_armor->read(energy_src) && video_armor->read(armor_src);
if (show_origin) {
imshow("enery src", energy_src);
imshow("armor src", armor_src);
}
if (state == ENERGY_STATE) { if (state == ENERGY_STATE) {
ok = video_energy->read(energy_src);
if (show_origin) {
imshow("energy src", energy_src);
}
if (from_camera == 0) { if (from_camera == 0) {
energy.extract(energy_src); energy.extract(energy_src);
} }
energy.run(energy_src); energy.run(energy_src);
} else { } else {
ok = video_armor->read(armor_src);
if (show_origin) {
imshow("armor src", armor_src);
}
CNT_TIME(WORD_LIGHT_BLUE, "Armor Time", { CNT_TIME(WORD_LIGHT_BLUE, "Armor Time", {
armorFinder.run(armor_src); armorFinder.run(armor_src);
}); });