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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	main.cpp
This commit is contained in:
xinyang
2019-08-09 01:26:08 +08:00
parent 65a55353d6 bb2a088d38
commit 5aec098ef9
7 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main.cpp
View File

@@ -66,8 +66,8 @@ int main(int argc, char *argv[]) {
video_gimbal = new CameraWrapper(ARMOR_CAMERA_EXPOSURE, ARMOR_CAMERA_GAIN, 2/*, "armor"*/);
video_chassis = new CameraWrapper(ENERGY_CAMERA_EXPOSURE, ENERGY_CAMERA_GAIN, 2/*, "energy"*/);
} else {
video_gimbal = new VideoWrapper(PROJECT_DIR"/gimbal_video/1.avi");
video_chassis = new VideoWrapper(PROJECT_DIR"/gimbal_video/1.avi");
video_gimbal = new VideoWrapper(PROJECT_DIR"/8-7-NO7.avi");
video_chassis = new VideoWrapper(PROJECT_DIR"/8-7-NO7.avi");
}
if (video_gimbal->init()) {
LOGM("video_gimbal source initialization successfully.");