diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/libcamera/framebuffer.h (renamed from include/libcamera/buffer.h) | 8 | ||||
| -rw-r--r-- | include/libcamera/internal/framebuffer.h (renamed from include/libcamera/internal/buffer.h) | 10 | ||||
| -rw-r--r-- | include/libcamera/internal/ipa_data_serializer.h | 2 | ||||
| -rw-r--r-- | include/libcamera/internal/meson.build | 2 | ||||
| -rw-r--r-- | include/libcamera/internal/tracepoints/request.tp | 2 | ||||
| -rw-r--r-- | include/libcamera/internal/v4l2_videodevice.h | 2 | ||||
| -rw-r--r-- | include/libcamera/ipa/ipa_interface.h | 2 | ||||
| -rw-r--r-- | include/libcamera/meson.build | 2 | ||||
| -rw-r--r-- | include/libcamera/stream.h | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/include/libcamera/buffer.h b/include/libcamera/framebuffer.h index 323d1cba..baf22a46 100644 --- a/include/libcamera/buffer.h +++ b/include/libcamera/framebuffer.h @@ -2,10 +2,10 @@ /* * Copyright (C) 2019, Google Inc. * - * buffer.h - Buffer handling + * framebuffer.h - Frame buffer handling */ -#ifndef __LIBCAMERA_BUFFER_H__ -#define __LIBCAMERA_BUFFER_H__ +#ifndef __LIBCAMERA_FRAMEBUFFER_H__ +#define __LIBCAMERA_FRAMEBUFFER_H__ #include <stdint.h> #include <vector> @@ -71,4 +71,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_BUFFER_H__ */ +#endif /* __LIBCAMERA_FRAMEBUFFER_H__ */ diff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/framebuffer.h index beae0cb9..0c76fc62 100644 --- a/include/libcamera/internal/buffer.h +++ b/include/libcamera/internal/framebuffer.h @@ -2,10 +2,10 @@ /* * Copyright (C) 2020, Google Inc. * - * buffer.h - Internal buffer handling + * framebuffer.h - Internal frame buffer handling */ -#ifndef __LIBCAMERA_INTERNAL_BUFFER_H__ -#define __LIBCAMERA_INTERNAL_BUFFER_H__ +#ifndef __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__ +#define __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__ #include <sys/mman.h> #include <vector> @@ -13,7 +13,7 @@ #include <libcamera/base/class.h> #include <libcamera/base/span.h> -#include <libcamera/buffer.h> +#include <libcamera/framebuffer.h> namespace libcamera { @@ -49,4 +49,4 @@ public: } /* namespace libcamera */ -#endif /* __LIBCAMERA_INTERNAL_BUFFER_H__ */ +#endif /* __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__ */ diff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h index 76325b1d..519093bd 100644 --- a/include/libcamera/internal/ipa_data_serializer.h +++ b/include/libcamera/internal/ipa_data_serializer.h @@ -16,8 +16,8 @@ #include <libcamera/base/log.h> -#include <libcamera/buffer.h> #include <libcamera/control_ids.h> +#include <libcamera/framebuffer.h> #include <libcamera/geometry.h> #include <libcamera/ipa/ipa_interface.h> diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index 16a76ebd..6d4eb7ed 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -11,7 +11,6 @@ libcamera_tracepoint_header = custom_target( libcamera_internal_headers = files([ 'bayer_format.h', - 'buffer.h', 'byte_stream_buffer.h', 'camera_controls.h', 'camera_sensor.h', @@ -23,6 +22,7 @@ libcamera_internal_headers = files([ 'device_enumerator_sysfs.h', 'device_enumerator_udev.h', 'formats.h', + 'framebuffer.h', 'ipa_manager.h', 'ipa_module.h', 'ipa_proxy.h', diff --git a/include/libcamera/internal/tracepoints/request.tp b/include/libcamera/internal/tracepoints/request.tp index 9c841b97..37d8c46f 100644 --- a/include/libcamera/internal/tracepoints/request.tp +++ b/include/libcamera/internal/tracepoints/request.tp @@ -5,7 +5,7 @@ * request.tp - Tracepoints for the request object */ -#include <libcamera/buffer.h> +#include <libcamera/framebuffer.h> #include <libcamera/request.h> TRACEPOINT_EVENT_CLASS( diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h index a7c3d529..e767ec84 100644 --- a/include/libcamera/internal/v4l2_videodevice.h +++ b/include/libcamera/internal/v4l2_videodevice.h @@ -20,7 +20,7 @@ #include <libcamera/base/log.h> #include <libcamera/base/signal.h> -#include <libcamera/buffer.h> +#include <libcamera/framebuffer.h> #include <libcamera/geometry.h> #include <libcamera/pixel_format.h> diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h index 9a15c86b..1590584c 100644 --- a/include/libcamera/ipa/ipa_interface.h +++ b/include/libcamera/ipa/ipa_interface.h @@ -15,8 +15,8 @@ #include <libcamera/base/signal.h> -#include <libcamera/buffer.h> #include <libcamera/controls.h> +#include <libcamera/framebuffer.h> #include <libcamera/geometry.h> namespace libcamera { diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index e4d5c655..5b25ef84 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -1,12 +1,12 @@ # SPDX-License-Identifier: CC0-1.0 libcamera_public_headers = files([ - 'buffer.h', 'camera.h', 'camera_manager.h', 'compiler.h', 'controls.h', 'file_descriptor.h', + 'framebuffer.h', 'framebuffer_allocator.h', 'geometry.h', 'logging.h', diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h index bb47c390..0c55e716 100644 --- a/include/libcamera/stream.h +++ b/include/libcamera/stream.h @@ -12,7 +12,7 @@ #include <string> #include <vector> -#include <libcamera/buffer.h> +#include <libcamera/framebuffer.h> #include <libcamera/geometry.h> #include <libcamera/pixel_format.h> |