From 1e73a39953db71878bf87b92f7c469aa2d095247 Mon Sep 17 00:00:00 2001 From: Kwanghoon Son Date: Tue, 24 Oct 2023 10:49:31 +0900 Subject: [PATCH] Fix const and function name Change-Id: Ia0073451b1317447faedea0ea7bbe523123cbb1c Signed-off-by: Kwanghoon Son --- src/vision_source_v4l2.cpp | 9 +++++---- test/test_vision_source_v4l2.cpp | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/vision_source_v4l2.cpp b/src/vision_source_v4l2.cpp index ce9f396..606f4a0 100644 --- a/src/vision_source_v4l2.cpp +++ b/src/vision_source_v4l2.cpp @@ -77,7 +77,7 @@ #define vision_source_init vision_source_v4l2_init #define vision_source_exit vision_source_v4l2_exit #define vision_source_list_devices vision_source_v4l2_list_devices -#define vision_source_get_device_cap vision_source_v4l2_get_device_cap +#define vision_source_list_device_caps vision_source_v4l2_list_device_caps #define vision_source_open_device vision_source_v4l2_open_device #define vision_source_close_device vision_source_v4l2_close_device #define vision_source_set_stream_format vision_source_v4l2_set_stream_format @@ -694,7 +694,7 @@ int vision_source_exit(vision_source_h handle) return VISION_SOURCE_ERROR_NONE; } -int vision_source_list_devices(vision_source_h handle, vision_source_device_info_s **dev_list, int *dev_count) +int vision_source_list_devices(vision_source_h handle, const vision_source_device_info_s **dev_list, int *dev_count) { vision_source_v4l2_s *v4l2_handle = (vision_source_v4l2_s *) handle; @@ -704,7 +704,8 @@ int vision_source_list_devices(vision_source_h handle, vision_source_device_info return VISION_SOURCE_ERROR_NONE; } -int vision_source_get_device_cap(vision_source_h handle, int dev_index, media_format_h **fmt_list, int *fmt_count) +int vision_source_list_device_caps(vision_source_h handle, int dev_index, const media_format_h **fmt_list, + int *fmt_count) { vision_source_v4l2_s *v4l2_handle = (vision_source_v4l2_s *) handle; @@ -969,7 +970,7 @@ void attach_backend(vision_source_func_s *funcp) funcp->init = vision_source_v4l2_init; funcp->exit = vision_source_v4l2_exit; funcp->list_devices = vision_source_v4l2_list_devices; - funcp->get_device_cap = vision_source_v4l2_get_device_cap; + funcp->list_device_caps = vision_source_v4l2_list_device_caps; funcp->open_device = vision_source_v4l2_open_device; funcp->close_device = vision_source_v4l2_close_device; funcp->set_stream_format = vision_source_v4l2_set_stream_format; diff --git a/test/test_vision_source_v4l2.cpp b/test/test_vision_source_v4l2.cpp index 2e58f2a..3a2f6d6 100644 --- a/test/test_vision_source_v4l2.cpp +++ b/test/test_vision_source_v4l2.cpp @@ -19,7 +19,7 @@ protected: TEST_F(VisionV4L2, ListDevices) { - vision_source_device_info_s *dev_list; + const vision_source_device_info_s *dev_list; int dev_cnt; ASSERT_EQ(vision_source_list_devices(ms_handle, &dev_list, &dev_cnt), VISION_SOURCE_ERROR_NONE); EXPECT_GT(dev_cnt, 0); @@ -27,13 +27,13 @@ TEST_F(VisionV4L2, ListDevices) TEST_F(VisionV4L2, DevCap) { - vision_source_device_info_s *dev_list; - media_format_h *fmt_list; + const vision_source_device_info_s *dev_list; + const media_format_h *fmt_list; int fmt_count; int dev_cnt; ASSERT_EQ(vision_source_list_devices(ms_handle, &dev_list, &dev_cnt), VISION_SOURCE_ERROR_NONE); ASSERT_GT(dev_cnt, 0); - ASSERT_EQ(vision_source_get_device_cap(ms_handle, 0, &fmt_list, &fmt_count), VISION_SOURCE_ERROR_NONE); + ASSERT_EQ(vision_source_list_device_caps(ms_handle, 0, &fmt_list, &fmt_count), VISION_SOURCE_ERROR_NONE); ASSERT_GT(fmt_count, 0); } @@ -45,26 +45,26 @@ TEST_F(VisionV4L2, OpenDev0) TEST_F(VisionV4L2, NotOpenDev) { - vision_source_device_info_s *dev_list; - media_format_h *fmt_list; + const vision_source_device_info_s *dev_list; + const media_format_h *fmt_list; int fmt_count; int dev_cnt; ASSERT_EQ(vision_source_list_devices(ms_handle, &dev_list, &dev_cnt), VISION_SOURCE_ERROR_NONE); ASSERT_GT(dev_cnt, 0); - ASSERT_EQ(vision_source_get_device_cap(ms_handle, 0, &fmt_list, &fmt_count), VISION_SOURCE_ERROR_NONE); + ASSERT_EQ(vision_source_list_device_caps(ms_handle, 0, &fmt_list, &fmt_count), VISION_SOURCE_ERROR_NONE); ASSERT_GT(fmt_count, 2); EXPECT_EQ(vision_source_set_stream_format(ms_handle, fmt_list[2]), VISION_SOURCE_ERROR_INVALID_OPERATION); } TEST_F(VisionV4L2, SetStream) { - vision_source_device_info_s *dev_list; - media_format_h *fmt_list; + const vision_source_device_info_s *dev_list; + const media_format_h *fmt_list; int fmt_count; int dev_cnt; ASSERT_EQ(vision_source_list_devices(ms_handle, &dev_list, &dev_cnt), VISION_SOURCE_ERROR_NONE); ASSERT_GT(dev_cnt, 0); - ASSERT_EQ(vision_source_get_device_cap(ms_handle, 0, &fmt_list, &fmt_count), VISION_SOURCE_ERROR_NONE); + ASSERT_EQ(vision_source_list_device_caps(ms_handle, 0, &fmt_list, &fmt_count), VISION_SOURCE_ERROR_NONE); ASSERT_GT(fmt_count, 2); ASSERT_EQ(vision_source_open_device(ms_handle, 0), VISION_SOURCE_ERROR_NONE); EXPECT_EQ(vision_source_set_stream_format(ms_handle, fmt_list[2]), VISION_SOURCE_ERROR_NONE); @@ -77,14 +77,14 @@ protected: void SetUp() override { ASSERT_EQ(vision_source_init(&ms_handle), VISION_SOURCE_ERROR_NONE); - vision_source_device_info_s *dev_list; - media_format_h *fmt_list; + const vision_source_device_info_s *dev_list; + const media_format_h *fmt_list; int fmt_count; int dev_cnt; ASSERT_EQ(vision_source_list_devices(ms_handle, &dev_list, &dev_cnt), VISION_SOURCE_ERROR_NONE); ASSERT_GT(dev_cnt, 0); - ASSERT_EQ(vision_source_get_device_cap(ms_handle, 0, &fmt_list, &fmt_count), VISION_SOURCE_ERROR_NONE); + ASSERT_EQ(vision_source_list_device_caps(ms_handle, 0, &fmt_list, &fmt_count), VISION_SOURCE_ERROR_NONE); ASSERT_GT(fmt_count, 2); ASSERT_EQ(vision_source_open_device(ms_handle, 0), VISION_SOURCE_ERROR_NONE); -- 2.7.4