diff options
Diffstat (limited to 'src/libcamera')
-rw-r--r-- | src/libcamera/framebuffer.cpp (renamed from src/libcamera/buffer.cpp) | 14 | ||||
-rw-r--r-- | src/libcamera/framebuffer_allocator.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/meson.build | 2 | ||||
-rw-r--r-- | src/libcamera/pipeline/ipu3/frames.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/pipeline/simple/converter.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/pipeline_handler.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/request.cpp | 2 |
9 files changed, 15 insertions, 15 deletions
diff --git a/src/libcamera/buffer.cpp b/src/libcamera/framebuffer.cpp index e4c345d5..4bde556c 100644 --- a/src/libcamera/buffer.cpp +++ b/src/libcamera/framebuffer.cpp @@ -2,11 +2,11 @@ /* * Copyright (C) 2019, Google Inc. * - * buffer.cpp - Buffer handling + * framebuffer.cpp - Frame buffer handling */ -#include <libcamera/buffer.h> -#include "libcamera/internal/buffer.h" +#include <libcamera/framebuffer.h> +#include "libcamera/internal/framebuffer.h" #include <errno.h> #include <string.h> @@ -16,11 +16,11 @@ #include <libcamera/base/log.h> /** - * \file libcamera/buffer.h - * \brief Buffer handling + * \file libcamera/framebuffer.h + * \brief Frame buffer handling * - * \file libcamera/internal/buffer.h - * \brief Internal buffer handling support + * \file libcamera/internal/framebuffer.h + * \brief Internal frame buffer handling support */ namespace libcamera { diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp index 86a57923..695073fd 100644 --- a/src/libcamera/framebuffer_allocator.cpp +++ b/src/libcamera/framebuffer_allocator.cpp @@ -11,8 +11,8 @@ #include <libcamera/base/log.h> -#include <libcamera/buffer.h> #include <libcamera/camera.h> +#include <libcamera/framebuffer.h> #include <libcamera/stream.h> #include "libcamera/internal/pipeline_handler.h" diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 517e763d..4f085801 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -2,7 +2,6 @@ libcamera_sources = files([ 'bayer_format.cpp', - 'buffer.cpp', 'byte_stream_buffer.cpp', 'camera.cpp', 'camera_controls.cpp', @@ -17,6 +16,7 @@ libcamera_sources = files([ 'device_enumerator_sysfs.cpp', 'file_descriptor.cpp', 'formats.cpp', + 'framebuffer.cpp', 'framebuffer_allocator.cpp', 'geometry.cpp', 'ipa_controls.cpp', diff --git a/src/libcamera/pipeline/ipu3/frames.cpp b/src/libcamera/pipeline/ipu3/frames.cpp index d9a2249b..ce5ccbf1 100644 --- a/src/libcamera/pipeline/ipu3/frames.cpp +++ b/src/libcamera/pipeline/ipu3/frames.cpp @@ -7,7 +7,7 @@ #include "frames.h" -#include <libcamera/buffer.h> +#include <libcamera/framebuffer.h> #include <libcamera/request.h> #include "libcamera/internal/pipeline_handler.h" diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 082eb1ee..4f1a5985 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -30,10 +30,10 @@ #include <linux/videodev2.h> #include "libcamera/internal/bayer_format.h" -#include "libcamera/internal/buffer.h" #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/delayed_controls.h" #include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/framebuffer.h" #include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/pipeline_handler.h" diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 00df4f0b..42911a8f 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -17,10 +17,10 @@ #include <libcamera/base/log.h> #include <libcamera/base/utils.h> -#include <libcamera/buffer.h> #include <libcamera/camera.h> #include <libcamera/control_ids.h> #include <libcamera/formats.h> +#include <libcamera/framebuffer.h> #include <libcamera/ipa/core_ipa_interface.h> #include <libcamera/ipa/rkisp1_ipa_interface.h> #include <libcamera/ipa/rkisp1_ipa_proxy.h> diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 3baf78f9..b5e34c4c 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -14,7 +14,7 @@ #include <libcamera/base/signal.h> #include <libcamera/base/utils.h> -#include <libcamera/buffer.h> +#include <libcamera/framebuffer.h> #include <libcamera/geometry.h> #include <libcamera/stream.h> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 0ed172dc..c9928d44 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -12,9 +12,9 @@ #include <libcamera/base/log.h> #include <libcamera/base/utils.h> -#include <libcamera/buffer.h> #include <libcamera/camera.h> #include <libcamera/camera_manager.h> +#include <libcamera/framebuffer.h> #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/media_device.h" diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 518384eb..5faf3c71 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -12,9 +12,9 @@ #include <libcamera/base/log.h> -#include <libcamera/buffer.h> #include <libcamera/camera.h> #include <libcamera/control_ids.h> +#include <libcamera/framebuffer.h> #include <libcamera/stream.h> #include "libcamera/internal/camera_controls.h" |