From 05134733554610dbcce547890b882fa55ad39aee Mon Sep 17 00:00:00 2001 From: Ethan Fahnestock Date: Tue, 10 Dec 2024 11:59:37 -0500 Subject: [PATCH] incorperating video package changes --- experimental/overhead_matching/BUILD | 4 ++-- .../kimera_spectacular_data_provider_test.cc | 6 +++--- experimental/overhead_matching/spectacular_log_test.cc | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/experimental/overhead_matching/BUILD b/experimental/overhead_matching/BUILD index c6c919df..1114d2ac 100644 --- a/experimental/overhead_matching/BUILD +++ b/experimental/overhead_matching/BUILD @@ -29,7 +29,7 @@ cc_test( ":spectacular_log", "@com_google_googletest//:gtest_main", "@fmt", - "//common:video", + "//common/video:image_compare", ] ) @@ -69,7 +69,7 @@ cc_test( deps = [ ":kimera_spectacular_data_provider", "@com_google_googletest//:gtest_main", - "//common:video", + "//common/video:image_compare", ] ) cc_test( diff --git a/experimental/overhead_matching/kimera_spectacular_data_provider_test.cc b/experimental/overhead_matching/kimera_spectacular_data_provider_test.cc index 5c865fac..79c169ae 100644 --- a/experimental/overhead_matching/kimera_spectacular_data_provider_test.cc +++ b/experimental/overhead_matching/kimera_spectacular_data_provider_test.cc @@ -4,7 +4,7 @@ #include #include -#include "common/video.hh" +#include "common/video/image_compare.hh" #include "experimental/overhead_matching/spectacular_log.hh" #include "fmt/format.h" #include "gtest/gtest.h" @@ -64,7 +64,7 @@ bool compare_bgr_frame(const std::unique_ptr& kimera_frame, const cv } else { grey_image = spec_bgr; } - if (!common::images_equal(kimera_frame->img_, grey_image)) { + if (!common::video::images_equal(kimera_frame->img_, grey_image)) { return false; } // check timestamps @@ -81,7 +81,7 @@ bool compare_depth_frame(const std::unique_ptr& kimera_depth, const cv::Mat& spec_depth, const time::RobotTimestamp& spec_time, const int& sequence_index) { // check image - if (!common::images_equal(kimera_depth->depth_img_, spec_depth)) { + if (!common::video::images_equal(kimera_depth->depth_img_, spec_depth)) { return false; } // check timestamps diff --git a/experimental/overhead_matching/spectacular_log_test.cc b/experimental/overhead_matching/spectacular_log_test.cc index 61ea107f..7c30768c 100644 --- a/experimental/overhead_matching/spectacular_log_test.cc +++ b/experimental/overhead_matching/spectacular_log_test.cc @@ -5,7 +5,7 @@ #include #include "common/matplotlib.hh" -#include "common/video.hh" +#include "common/video/image_compare.hh" #include "fmt/format.h" #include "gtest/gtest.h" #include "opencv2/opencv.hpp" @@ -83,8 +83,8 @@ TEST(SpectacularLogTest, happy_case) { fmt::format("frames2/{:08d}.png", frame_id)); const cv::Mat depth_frame = cv::imread(depth_path, cv::IMREAD_GRAYSCALE); - EXPECT_TRUE(common::images_equal(expected_frame, frame.bgr_frame)); - EXPECT_TRUE(common::images_equal(depth_frame, frame.depth_frame)); + EXPECT_TRUE(common::video::images_equal(expected_frame, frame.bgr_frame)); + EXPECT_TRUE(common::video::images_equal(depth_frame, frame.depth_frame)); for (int i = 0; i < FRAME_SKIP - 1; i++) { video.grab();