diff --git a/wpical/src/main/native/cpp/fieldcalibration.cpp b/wpical/src/main/native/cpp/fieldcalibration.cpp index 9e5a7ff84a5..d478aae033b 100644 --- a/wpical/src/main/native/cpp/fieldcalibration.cpp +++ b/wpical/src/main/native/cpp/fieldcalibration.cpp @@ -309,7 +309,8 @@ bool fieldcalibration::process_video_file( int frame_num = 0; while (video_input.read(frame)) { - std::cout << "Processing " << path << " - Frame " << frame_num << std::endl; + std::cout << "Processing " << path << " - Frame " << frame_num++ + << std::endl; // Convert color frame to grayscale frame cv::cvtColor(frame, frame_gray, cv::COLOR_BGR2GRAY); diff --git a/wpical/src/main/native/resources/altfieldvideo/long.mjpg b/wpical/src/main/native/resources/altfieldvideo/long.avi similarity index 96% rename from wpical/src/main/native/resources/altfieldvideo/long.mjpg rename to wpical/src/main/native/resources/altfieldvideo/long.avi index ab795027d53..5df4dd35ce6 100644 Binary files a/wpical/src/main/native/resources/altfieldvideo/long.mjpg and b/wpical/src/main/native/resources/altfieldvideo/long.avi differ diff --git a/wpical/src/main/native/resources/altfieldvideo/short.mjpg b/wpical/src/main/native/resources/altfieldvideo/short.avi similarity index 97% rename from wpical/src/main/native/resources/altfieldvideo/short.mjpg rename to wpical/src/main/native/resources/altfieldvideo/short.avi index ecd2d814d64..8a5d28e2f3f 100644 Binary files a/wpical/src/main/native/resources/altfieldvideo/short.mjpg and b/wpical/src/main/native/resources/altfieldvideo/short.avi differ diff --git a/wpical/src/main/native/resources/testcalibration.mjpg b/wpical/src/main/native/resources/testcalibration.avi similarity index 99% rename from wpical/src/main/native/resources/testcalibration.mjpg rename to wpical/src/main/native/resources/testcalibration.avi index 27b2bd128f2..40fe6d8b75a 100644 Binary files a/wpical/src/main/native/resources/testcalibration.mjpg and b/wpical/src/main/native/resources/testcalibration.avi differ diff --git a/wpical/src/test/native/cpp/test_calibrate.cpp b/wpical/src/test/native/cpp/test_calibrate.cpp index 1b7753fc8fa..cedd0d1c8f7 100644 --- a/wpical/src/test/native/cpp/test_calibrate.cpp +++ b/wpical/src/test/native/cpp/test_calibrate.cpp @@ -12,7 +12,7 @@ const std::string projectRootPath = PROJECT_ROOT_PATH; #ifdef __linux__ -const std::string fileSuffix = ".mjpg"; +const std::string fileSuffix = ".avi"; const std::string videoLocation = "/altfieldvideo"; #else const std::string fileSuffix = ".mp4";