Merge remote-tracking branch 'origin/anti-top' into anti-top

This commit is contained in:
xinyang
2019-07-19 13:05:33 +08:00
10 changed files with 82 additions and 76 deletions

View File

@@ -64,8 +64,8 @@ int main(int argc, char *argv[]) {
video_gimbal = new CameraWrapper(0/*, "armor"*/);
video_chassis = new CameraWrapper(1/*, "energy"*/);
} else {
video_gimbal = new VideoWrapper("/home/sun/项目/energy_video/gimble3.avi");
video_chassis = new VideoWrapper("/home/sun/项目/energy_video/gimble3.avi");
video_gimbal = new VideoWrapper("/home/sun/项目/energy_video/gimbal106.avi");
video_chassis = new VideoWrapper("/home/sun/项目/energy_video/gimbal106.avi");
}
if (video_gimbal->init()) {
LOGM("video_gimbal source initialization successfully.");
@@ -144,7 +144,7 @@ int main(int argc, char *argv[]) {
armorFinder.run(gimbal_src);
});
}
// cv::waitKey(1);
// cv::waitKey(0);
// });
} while (ok);
delete video_gimbal;