diff options
Diffstat (limited to 'test')
44 files changed, 117 insertions, 91 deletions
diff --git a/test/byte-stream-buffer.cpp b/test/byte-stream-buffer.cpp index bc1d462e..d606f146 100644 --- a/test/byte-stream-buffer.cpp +++ b/test/byte-stream-buffer.cpp @@ -8,7 +8,8 @@ #include <array> #include <iostream> -#include "byte_stream_buffer.h" +#include "libcamera/internal/byte_stream_buffer.h" + #include "test.h" using namespace std; diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp index 6069d668..8c7fd1d2 100644 --- a/test/camera-sensor.cpp +++ b/test/camera-sensor.cpp @@ -10,11 +10,11 @@ #include <linux/media-bus-format.h> -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "media_device.h" -#include "utils.h" -#include "v4l2_subdevice.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_subdevice.h" #include "test.h" diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp index 3f392cdc..ad680a83 100644 --- a/test/camera/buffer_import.cpp +++ b/test/camera/buffer_import.cpp @@ -12,9 +12,9 @@ #include <numeric> #include <vector> -#include "device_enumerator.h" -#include "media_device.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "buffer_source.h" #include "camera_test.h" diff --git a/test/controls/control_info_map.cpp b/test/controls/control_info_map.cpp index eeb702db..e4305f13 100644 --- a/test/controls/control_info_map.cpp +++ b/test/controls/control_info_map.cpp @@ -12,7 +12,7 @@ #include <libcamera/control_ids.h> #include <libcamera/controls.h> -#include "camera_controls.h" +#include "libcamera/internal/camera_controls.h" #include "camera_test.h" #include "test.h" diff --git a/test/controls/control_list.cpp b/test/controls/control_list.cpp index d51ec47d..5c8485b5 100644 --- a/test/controls/control_list.cpp +++ b/test/controls/control_list.cpp @@ -12,7 +12,7 @@ #include <libcamera/control_ids.h> #include <libcamera/controls.h> -#include "camera_controls.h" +#include "libcamera/internal/camera_controls.h" #include "camera_test.h" #include "test.h" diff --git a/test/event-dispatcher.cpp b/test/event-dispatcher.cpp index 9f9cf178..1b617786 100644 --- a/test/event-dispatcher.cpp +++ b/test/event-dispatcher.cpp @@ -13,8 +13,9 @@ #include <libcamera/event_dispatcher.h> #include <libcamera/timer.h> +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/event-thread.cpp b/test/event-thread.cpp index 01120733..c90e6ac0 100644 --- a/test/event-thread.cpp +++ b/test/event-thread.cpp @@ -13,8 +13,9 @@ #include <libcamera/event_notifier.h> #include <libcamera/timer.h> +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/event.cpp b/test/event.cpp index 816060cc..c865092c 100644 --- a/test/event.cpp +++ b/test/event.cpp @@ -13,8 +13,9 @@ #include <libcamera/event_notifier.h> #include <libcamera/timer.h> +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/file-descriptor.cpp b/test/file-descriptor.cpp index e467f3a7..7477a843 100644 --- a/test/file-descriptor.cpp +++ b/test/file-descriptor.cpp @@ -13,8 +13,9 @@ #include <libcamera/file_descriptor.h> +#include "libcamera/internal/utils.h" + #include "test.h" -#include "utils.h" using namespace libcamera; using namespace std; diff --git a/test/file.cpp b/test/file.cpp index 65583998..6262a6f0 100644 --- a/test/file.cpp +++ b/test/file.cpp @@ -13,7 +13,8 @@ #include <sys/types.h> #include <unistd.h> -#include "file.h" +#include "libcamera/internal/file.h" + #include "test.h" using namespace std; diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index 7fa88efe..c394377d 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -18,12 +18,13 @@ #include <ipa/ipa_vimc.h> -#include "device_enumerator.h" -#include "ipa_manager.h" -#include "ipa_module.h" -#include "pipeline_handler.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/ipa_manager.h" +#include "libcamera/internal/ipa_module.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/ipa/ipa_module_test.cpp b/test/ipa/ipa_module_test.cpp index e3aee190..bd5e0e4c 100644 --- a/test/ipa/ipa_module_test.cpp +++ b/test/ipa/ipa_module_test.cpp @@ -8,7 +8,7 @@ #include <iostream> #include <string.h> -#include "ipa_module.h" +#include "libcamera/internal/ipa_module.h" #include "test.h" diff --git a/test/ipa/ipa_wrappers_test.cpp b/test/ipa/ipa_wrappers_test.cpp index 4de13212..aa7a9dcc 100644 --- a/test/ipa/ipa_wrappers_test.cpp +++ b/test/ipa/ipa_wrappers_test.cpp @@ -15,11 +15,11 @@ #include <libcamera/controls.h> #include <libipa/ipa_interface_wrapper.h> -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "ipa_context_wrapper.h" -#include "media_device.h" -#include "v4l2_subdevice.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/ipa_context_wrapper.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_subdevice.h" #include "test.h" diff --git a/test/ipc/unixsocket.cpp b/test/ipc/unixsocket.cpp index f53042b8..4487d27b 100644 --- a/test/ipc/unixsocket.cpp +++ b/test/ipc/unixsocket.cpp @@ -18,10 +18,11 @@ #include <libcamera/event_dispatcher.h> #include <libcamera/timer.h> -#include "ipc_unixsocket.h" +#include "libcamera/internal/ipc_unixsocket.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" + #include "test.h" -#include "thread.h" -#include "utils.h" #define CMD_CLOSE 0 #define CMD_REVERSE 1 diff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp index d1dad2a0..ee87c8cd 100644 --- a/test/libtest/buffer_source.cpp +++ b/test/libtest/buffer_source.cpp @@ -10,7 +10,7 @@ #include <iostream> #include <memory> -#include "device_enumerator.h" +#include "libcamera/internal/device_enumerator.h" #include "test.h" diff --git a/test/libtest/buffer_source.h b/test/libtest/buffer_source.h index ae0879c9..95a82a82 100644 --- a/test/libtest/buffer_source.h +++ b/test/libtest/buffer_source.h @@ -9,8 +9,8 @@ #include <libcamera/libcamera.h> -#include "media_device.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_videodevice.h" using namespace libcamera; diff --git a/test/libtest/meson.build b/test/libtest/meson.build index 481f6d6b..542335ea 100644 --- a/test/libtest/meson.build +++ b/test/libtest/meson.build @@ -15,7 +15,6 @@ test_includes_public = [ test_includes_internal = [ test_includes_public, - libcamera_internal_includes, ] libtest = static_library('libtest', libtest_sources, diff --git a/test/log/log_api.cpp b/test/log/log_api.cpp index 33622f84..6f3248a7 100644 --- a/test/log/log_api.cpp +++ b/test/log/log_api.cpp @@ -18,7 +18,8 @@ #include <libcamera/logging.h> -#include "log.h" +#include "libcamera/internal/log.h" + #include "test.h" using namespace std; diff --git a/test/log/log_process.cpp b/test/log/log_process.cpp index 2df4aa43..8463d0ed 100644 --- a/test/log/log_process.cpp +++ b/test/log/log_process.cpp @@ -18,11 +18,12 @@ #include <libcamera/logging.h> #include <libcamera/timer.h> -#include "log.h" -#include "process.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/process.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" + #include "test.h" -#include "thread.h" -#include "utils.h" using namespace std; using namespace libcamera; diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp index 5018906c..1f5e3f3e 100644 --- a/test/media_device/media_device_print_test.cpp +++ b/test/media_device/media_device_print_test.cpp @@ -10,7 +10,7 @@ #include <sys/stat.h> #include <unistd.h> -#include "media_device.h" +#include "libcamera/internal/media_device.h" #include "test.h" diff --git a/test/media_device/media_device_test.h b/test/media_device/media_device_test.h index cdbd1484..0c8bf9f2 100644 --- a/test/media_device/media_device_test.h +++ b/test/media_device/media_device_test.h @@ -9,8 +9,8 @@ #include <memory> -#include "device_enumerator.h" -#include "media_device.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" #include "test.h" diff --git a/test/message.cpp b/test/message.cpp index 478bc79d..9553ba8c 100644 --- a/test/message.cpp +++ b/test/message.cpp @@ -9,8 +9,9 @@ #include <iostream> #include <thread> -#include "message.h" -#include "thread.h" +#include "libcamera/internal/message.h" +#include "libcamera/internal/thread.h" + #include "test.h" using namespace std; diff --git a/test/object-invoke.cpp b/test/object-invoke.cpp index fa162c83..1ae11bb1 100644 --- a/test/object-invoke.cpp +++ b/test/object-invoke.cpp @@ -11,8 +11,9 @@ #include <libcamera/event_dispatcher.h> #include <libcamera/object.h> +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/object.cpp b/test/object.cpp index 16118971..264659b4 100644 --- a/test/object.cpp +++ b/test/object.cpp @@ -9,8 +9,8 @@ #include <libcamera/object.h> -#include "message.h" -#include "thread.h" +#include "libcamera/internal/message.h" +#include "libcamera/internal/thread.h" #include "test.h" diff --git a/test/pipeline/ipu3/ipu3_pipeline_test.cpp b/test/pipeline/ipu3/ipu3_pipeline_test.cpp index a5c6be09..34998f8f 100644 --- a/test/pipeline/ipu3/ipu3_pipeline_test.cpp +++ b/test/pipeline/ipu3/ipu3_pipeline_test.cpp @@ -13,9 +13,10 @@ #include <libcamera/camera.h> #include <libcamera/camera_manager.h> -#include "device_enumerator.h" -#include "media_device.h" -#include "media_object.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/media_object.h" + #include "test.h" using namespace std; diff --git a/test/pipeline/rkisp1/rkisp1_pipeline_test.cpp b/test/pipeline/rkisp1/rkisp1_pipeline_test.cpp index d46c928f..b6678ce7 100644 --- a/test/pipeline/rkisp1/rkisp1_pipeline_test.cpp +++ b/test/pipeline/rkisp1/rkisp1_pipeline_test.cpp @@ -16,9 +16,10 @@ #include <libcamera/camera.h> #include <libcamera/camera_manager.h> -#include "device_enumerator.h" -#include "media_device.h" -#include "media_object.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/media_object.h" + #include "test.h" using namespace std; diff --git a/test/process/process_test.cpp b/test/process/process_test.cpp index 7e7b3c2c..ce0cc7c9 100644 --- a/test/process/process_test.cpp +++ b/test/process/process_test.cpp @@ -12,10 +12,11 @@ #include <libcamera/event_dispatcher.h> #include <libcamera/timer.h> -#include "process.h" +#include "libcamera/internal/process.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" + #include "test.h" -#include "thread.h" -#include "utils.h" using namespace std; using namespace libcamera; diff --git a/test/serialization/control_serialization.cpp b/test/serialization/control_serialization.cpp index 11136524..e23383d1 100644 --- a/test/serialization/control_serialization.cpp +++ b/test/serialization/control_serialization.cpp @@ -11,8 +11,9 @@ #include <libcamera/control_ids.h> #include <libcamera/controls.h> -#include "byte_stream_buffer.h" -#include "control_serializer.h" +#include "libcamera/internal/byte_stream_buffer.h" +#include "libcamera/internal/control_serializer.h" + #include "serialization_test.h" #include "test.h" diff --git a/test/signal-threads.cpp b/test/signal-threads.cpp index f77733eb..3c5f3792 100644 --- a/test/signal-threads.cpp +++ b/test/signal-threads.cpp @@ -9,10 +9,11 @@ #include <iostream> #include <thread> -#include "message.h" -#include "thread.h" +#include "libcamera/internal/message.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" + #include "test.h" -#include "utils.h" using namespace std; using namespace libcamera; diff --git a/test/threads.cpp b/test/threads.cpp index 0454761d..b4b8d913 100644 --- a/test/threads.cpp +++ b/test/threads.cpp @@ -9,7 +9,8 @@ #include <iostream> #include <thread> -#include "thread.h" +#include "libcamera/internal/thread.h" + #include "test.h" using namespace std; diff --git a/test/timer-thread.cpp b/test/timer-thread.cpp index 32853b4e..2f901787 100644 --- a/test/timer-thread.cpp +++ b/test/timer-thread.cpp @@ -11,8 +11,9 @@ #include <libcamera/event_dispatcher.h> #include <libcamera/timer.h> +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/timer.cpp b/test/timer.cpp index 2bdb006e..7d5b93c3 100644 --- a/test/timer.cpp +++ b/test/timer.cpp @@ -11,8 +11,9 @@ #include <libcamera/event_dispatcher.h> #include <libcamera/timer.h> +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/utils.cpp b/test/utils.cpp index 55ce9365..66b91f12 100644 --- a/test/utils.cpp +++ b/test/utils.cpp @@ -12,8 +12,9 @@ #include <libcamera/geometry.h> +#include "libcamera/internal/utils.h" + #include "test.h" -#include "utils.h" using namespace std; using namespace libcamera; diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp index 067dc5ed..25503c33 100644 --- a/test/v4l2_subdevice/list_formats.cpp +++ b/test/v4l2_subdevice/list_formats.cpp @@ -11,7 +11,8 @@ #include <libcamera/geometry.h> -#include "v4l2_subdevice.h" +#include "libcamera/internal/v4l2_subdevice.h" + #include "v4l2_subdevice_test.h" using namespace std; diff --git a/test/v4l2_subdevice/test_formats.cpp b/test/v4l2_subdevice/test_formats.cpp index 5cf5d566..9635c994 100644 --- a/test/v4l2_subdevice/test_formats.cpp +++ b/test/v4l2_subdevice/test_formats.cpp @@ -8,7 +8,8 @@ #include <iostream> #include <limits.h> -#include "v4l2_subdevice.h" +#include "libcamera/internal/v4l2_subdevice.h" + #include "v4l2_subdevice_test.h" using namespace std; diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.cpp b/test/v4l2_subdevice/v4l2_subdevice_test.cpp index 562a638c..d8fbfd9f 100644 --- a/test/v4l2_subdevice/v4l2_subdevice_test.cpp +++ b/test/v4l2_subdevice/v4l2_subdevice_test.cpp @@ -9,9 +9,10 @@ #include <string.h> #include <sys/stat.h> -#include "device_enumerator.h" -#include "media_device.h" -#include "v4l2_subdevice.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_subdevice.h" + #include "v4l2_subdevice_test.h" using namespace std; diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h index 3bce6691..00c6399d 100644 --- a/test/v4l2_subdevice/v4l2_subdevice_test.h +++ b/test/v4l2_subdevice/v4l2_subdevice_test.h @@ -10,10 +10,11 @@ #include <libcamera/buffer.h> -#include "device_enumerator.h" -#include "media_device.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_subdevice.h" + #include "test.h" -#include "v4l2_subdevice.h" using namespace libcamera; diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp index 14d3055a..ba2cc40d 100644 --- a/test/v4l2_videodevice/buffer_sharing.cpp +++ b/test/v4l2_videodevice/buffer_sharing.cpp @@ -16,7 +16,8 @@ #include <libcamera/event_dispatcher.h> #include <libcamera/timer.h> -#include "thread.h" +#include "libcamera/internal/thread.h" + #include "v4l2_videodevice_test.h" class BufferSharingTest : public V4L2VideoDeviceTest diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp index b38aabc6..13cbcc80 100644 --- a/test/v4l2_videodevice/capture_async.cpp +++ b/test/v4l2_videodevice/capture_async.cpp @@ -11,7 +11,8 @@ #include <libcamera/event_dispatcher.h> #include <libcamera/timer.h> -#include "thread.h" +#include "libcamera/internal/thread.h" + #include "v4l2_videodevice_test.h" class CaptureAsyncTest : public V4L2VideoDeviceTest diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp index 347af211..9f09d036 100644 --- a/test/v4l2_videodevice/controls.cpp +++ b/test/v4l2_videodevice/controls.cpp @@ -10,7 +10,7 @@ #include <iostream> #include <limits.h> -#include "v4l2_videodevice.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/formats.cpp b/test/v4l2_videodevice/formats.cpp index a7421421..043732dc 100644 --- a/test/v4l2_videodevice/formats.cpp +++ b/test/v4l2_videodevice/formats.cpp @@ -8,8 +8,8 @@ #include <iostream> #include <limits.h> -#include "utils.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp index d20e5dfc..44a39d4d 100644 --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp @@ -11,10 +11,10 @@ #include <libcamera/event_dispatcher.h> #include <libcamera/timer.h> -#include "device_enumerator.h" -#include "media_device.h" -#include "thread.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "test.h" diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp index 93b9e72d..f23aaf8f 100644 --- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp +++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp @@ -9,10 +9,10 @@ #include <linux/media-bus-format.h> -#include "v4l2_videodevice_test.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" -#include "device_enumerator.h" -#include "media_device.h" +#include "v4l2_videodevice_test.h" using namespace std; using namespace libcamera; diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.h b/test/v4l2_videodevice/v4l2_videodevice_test.h index 9acaceb8..21054561 100644 --- a/test/v4l2_videodevice/v4l2_videodevice_test.h +++ b/test/v4l2_videodevice/v4l2_videodevice_test.h @@ -11,13 +11,13 @@ #include <libcamera/buffer.h> -#include "test.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_subdevice.h" +#include "libcamera/internal/v4l2_videodevice.h" -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "media_device.h" -#include "v4l2_subdevice.h" -#include "v4l2_videodevice.h" +#include "test.h" using namespace libcamera; |