Merge pull request #7 from Gold856/ElliotScher/main

Use AVI instead of raw MJPEG
wpilibsuite · Dec 14, 2024 · 2269996 · 2269996
2 parents 6832afd + 623292e
commit 2269996
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 2 deletions.
diff --git 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/.../native/resources/altfieldvideo/long.mjpg → ...n/native/resources/altfieldvideo/long.avi b/.../native/resources/altfieldvideo/long.mjpg → ...n/native/resources/altfieldvideo/long.avi
diff --git a/...native/resources/altfieldvideo/short.mjpg → .../native/resources/altfieldvideo/short.avi b/...native/resources/altfieldvideo/short.mjpg → .../native/resources/altfieldvideo/short.avi
diff --git a/...ain/native/resources/testcalibration.mjpg → ...main/native/resources/testcalibration.avi b/...ain/native/resources/testcalibration.mjpg → ...main/native/resources/testcalibration.avi
diff --git 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";