[{"id":17967,"web_url":"https://patchwork.libcamera.org/comment/17967/","msgid":"","date":"2021-07-05T05:12:34","subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename\n\tbuffer.h to framebuffer.h","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 7/5/21 4:58 AM, Laurent Pinchart wrote:\n> libcamera names header files based on the classes they define. The\n> buffer.h file is an exception. Rename it to framebuffer.h.\n>\n> Signed-off-by: Laurent Pinchart \n> ---\n> include/libcamera/{buffer.h => framebuffer.h} | 8 ++++----\n> .../libcamera/internal/{buffer.h => framebuffer.h} | 10 +++++-----\n> include/libcamera/internal/ipa_data_serializer.h | 2 +-\n> include/libcamera/internal/meson.build | 2 +-\n> include/libcamera/internal/tracepoints/request.tp | 2 +-\n> include/libcamera/internal/v4l2_videodevice.h | 2 +-\n> include/libcamera/ipa/ipa_interface.h | 2 +-\n> include/libcamera/meson.build | 2 +-\n> include/libcamera/stream.h | 2 +-\n> src/android/camera_device.h | 4 ++--\n> src/android/camera_stream.h | 4 ++--\n> src/android/camera_worker.h | 2 +-\n> src/android/jpeg/encoder.h | 2 +-\n> src/android/jpeg/encoder_libjpeg.h | 2 +-\n> src/android/jpeg/post_processor_jpeg.h | 2 +-\n> src/android/jpeg/thumbnailer.h | 2 +-\n> src/android/mm/generic_camera_buffer.cpp | 2 +-\n> src/android/post_processor.h | 4 ++--\n> src/cam/buffer_writer.h | 2 +-\n> src/cam/capture.h | 2 +-\n> src/ipa/ipu3/ipu3.cpp | 4 ++--\n> src/ipa/raspberrypi/raspberrypi.cpp | 4 ++--\n> src/ipa/rkisp1/rkisp1.cpp | 2 +-\n> src/libcamera/{buffer.cpp => framebuffer.cpp} | 14 +++++++-------\n> src/libcamera/framebuffer_allocator.cpp | 2 +-\n> src/libcamera/meson.build | 2 +-\n> src/libcamera/pipeline/ipu3/frames.cpp | 2 +-\n> src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n> src/libcamera/pipeline/simple/converter.cpp | 2 +-\n> src/libcamera/pipeline_handler.cpp | 2 +-\n> src/libcamera/request.cpp | 2 +-\n> src/qcam/dng_writer.h | 2 +-\n> src/qcam/main_window.h | 2 +-\n> src/qcam/viewfinder.h | 2 +-\n> src/qcam/viewfinder_gl.h | 2 +-\n> src/qcam/viewfinder_qt.h | 2 +-\n> src/v4l2/v4l2_camera.h | 2 +-\n> test/mapped-buffer.cpp | 2 +-\n> test/v4l2_subdevice/v4l2_subdevice_test.h | 2 +-\n> test/v4l2_videodevice/buffer_sharing.cpp | 2 +-\n> test/v4l2_videodevice/capture_async.cpp | 2 +-\n> test/v4l2_videodevice/v4l2_m2mdevice.cpp | 2 +-\n> test/v4l2_videodevice/v4l2_videodevice_test.h | 2 +-\n> 44 files changed, 62 insertions(+), 62 deletions(-)\n> rename include/libcamera/{buffer.h => framebuffer.h} (89%)\n> rename include/libcamera/internal/{buffer.h => framebuffer.h} (78%)\n\nAre you sure you want to name it framebuffer.h for the internal header \nalso? I get the impression that the patch attempts to eliminates the \nexception, filename vs class-name mismatch, but the internal header with \nthis change, will still be an exception. Why shouldn't we be leaning \ntowards\n\n  rename include/libcamera/internal/{buffer.h => mappedbuffer.h} (78%) ?\n\nOther than that, patch looks good to me,\n\nReviewed-by: Umang Jain \n\n> rename src/libcamera/{buffer.cpp => framebuffer.cpp} (97%)\n>\n> diff --git a/include/libcamera/buffer.h b/include/libcamera/framebuffer.h\n> similarity index 89%\n> rename from include/libcamera/buffer.h\n> rename to include/libcamera/framebuffer.h\n> index 323d1cba41a9..baf22a466907 100644\n> --- a/include/libcamera/buffer.h\n> +++ b/include/libcamera/framebuffer.h\n> @@ -2,10 +2,10 @@\n> /*\n> * Copyright (C) 2019, Google Inc.\n> *\n> - * buffer.h - Buffer handling\n> + * framebuffer.h - Frame buffer handling\n> */\n> -#ifndef __LIBCAMERA_BUFFER_H__\n> -#define __LIBCAMERA_BUFFER_H__\n> +#ifndef __LIBCAMERA_FRAMEBUFFER_H__\n> +#define __LIBCAMERA_FRAMEBUFFER_H__\n> \n> #include \n> #include \n> @@ -71,4 +71,4 @@ private:\n> \n> } /* namespace libcamera */\n> \n> -#endif /* __LIBCAMERA_BUFFER_H__ */\n> +#endif /* __LIBCAMERA_FRAMEBUFFER_H__ */\n> diff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/framebuffer.h\n> similarity index 78%\n> rename from include/libcamera/internal/buffer.h\n> rename to include/libcamera/internal/framebuffer.h\n> index beae0cb98544..0c76fc62af1d 100644\n> --- a/include/libcamera/internal/buffer.h\n> +++ b/include/libcamera/internal/framebuffer.h\n> @@ -2,10 +2,10 @@\n> /*\n> * Copyright (C) 2020, Google Inc.\n> *\n> - * buffer.h - Internal buffer handling\n> + * framebuffer.h - Internal frame buffer handling\n> */\n> -#ifndef __LIBCAMERA_INTERNAL_BUFFER_H__\n> -#define __LIBCAMERA_INTERNAL_BUFFER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__\n> +#define __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__\n> \n> #include \n> #include \n> @@ -13,7 +13,7 @@\n> #include \n> #include \n> \n> -#include \n> +#include \n> \n> namespace libcamera {\n> \n> @@ -49,4 +49,4 @@ public:\n> \n> } /* namespace libcamera */\n> \n> -#endif /* __LIBCAMERA_INTERNAL_BUFFER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__ */\n> diff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h\n> index 76325b1d109f..519093bd314f 100644\n> --- a/include/libcamera/internal/ipa_data_serializer.h\n> +++ b/include/libcamera/internal/ipa_data_serializer.h\n> @@ -16,8 +16,8 @@\n> \n> #include \n> \n> -#include \n> #include \n> +#include \n> #include \n> #include \n> \n> diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\n> index 16a76ebdf9cc..6d4eb7ed3df6 100644\n> --- a/include/libcamera/internal/meson.build\n> +++ b/include/libcamera/internal/meson.build\n> @@ -11,7 +11,6 @@ libcamera_tracepoint_header = custom_target(\n> \n> libcamera_internal_headers = files([\n> 'bayer_format.h',\n> - 'buffer.h',\n> 'byte_stream_buffer.h',\n> 'camera_controls.h',\n> 'camera_sensor.h',\n> @@ -23,6 +22,7 @@ libcamera_internal_headers = files([\n> 'device_enumerator_sysfs.h',\n> 'device_enumerator_udev.h',\n> 'formats.h',\n> + 'framebuffer.h',\n> 'ipa_manager.h',\n> 'ipa_module.h',\n> 'ipa_proxy.h',\n> diff --git a/include/libcamera/internal/tracepoints/request.tp b/include/libcamera/internal/tracepoints/request.tp\n> index 9c841b97438a..37d8c46f4d96 100644\n> --- a/include/libcamera/internal/tracepoints/request.tp\n> +++ b/include/libcamera/internal/tracepoints/request.tp\n> @@ -5,7 +5,7 @@\n> * request.tp - Tracepoints for the request object\n> */\n> \n> -#include \n> +#include \n> #include \n> \n> TRACEPOINT_EVENT_CLASS(\n> diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\n> index a7c3d5290d92..e767ec84c4da 100644\n> --- a/include/libcamera/internal/v4l2_videodevice.h\n> +++ b/include/libcamera/internal/v4l2_videodevice.h\n> @@ -20,7 +20,7 @@\n> #include \n> #include \n> \n> -#include \n> +#include \n> #include \n> #include \n> \n> diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h\n> index 9a15c86b16e2..1590584c1fb4 100644\n> --- a/include/libcamera/ipa/ipa_interface.h\n> +++ b/include/libcamera/ipa/ipa_interface.h\n> @@ -15,8 +15,8 @@\n> \n> #include \n> \n> -#include \n> #include \n> +#include \n> #include \n> \n> namespace libcamera {\n> diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\n> index e4d5c655c1e9..5b25ef847ed4 100644\n> --- a/include/libcamera/meson.build\n> +++ b/include/libcamera/meson.build\n> @@ -1,12 +1,12 @@\n> # SPDX-License-Identifier: CC0-1.0\n> \n> libcamera_public_headers = files([\n> - 'buffer.h',\n> 'camera.h',\n> 'camera_manager.h',\n> 'compiler.h',\n> 'controls.h',\n> 'file_descriptor.h',\n> + 'framebuffer.h',\n> 'framebuffer_allocator.h',\n> 'geometry.h',\n> 'logging.h',\n> diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h\n> index bb47c390f8a1..0c55e7164592 100644\n> --- a/include/libcamera/stream.h\n> +++ b/include/libcamera/stream.h\n> @@ -12,7 +12,7 @@\n> #include \n> #include \n> \n> -#include \n> +#include \n> #include \n> #include \n> \n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 3361918d4484..32ba15566621 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -18,12 +18,12 @@\n> #include \n> #include \n> \n> -#include \n> #include \n> +#include \n> #include \n> #include \n> \n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> #include \"camera_capabilities.h\"\n> #include \"camera_metadata.h\"\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index 8ecc6e345414..629d9e00e08d 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -13,13 +13,13 @@\n> \n> #include \n> \n> -#include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> \n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> class CameraDevice;\n> class CameraMetadata;\n> diff --git a/src/android/camera_worker.h b/src/android/camera_worker.h\n> index 6e1aee4a3247..67ae50bd9288 100644\n> --- a/src/android/camera_worker.h\n> +++ b/src/android/camera_worker.h\n> @@ -12,8 +12,8 @@\n> #include \n> #include \n> \n> -#include \n> #include \n> +#include \n> #include \n> #include \n> \n> diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\n> index 28e7f92a3ecb..a28522f41714 100644\n> --- a/src/android/jpeg/encoder.h\n> +++ b/src/android/jpeg/encoder.h\n> @@ -9,7 +9,7 @@\n> \n> #include \n> \n> -#include \n> +#include \n> #include \n> \n> class Encoder\n> diff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\n> index 838da7728382..14bf89223982 100644\n> --- a/src/android/jpeg/encoder_libjpeg.h\n> +++ b/src/android/jpeg/encoder_libjpeg.h\n> @@ -9,8 +9,8 @@\n> \n> #include \"encoder.h\"\n> \n> -#include \"libcamera/internal/buffer.h\"\n> #include \"libcamera/internal/formats.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> #include \n> \n> diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> index 5d2d4ab224b1..5c399be9eb6a 100644\n> --- a/src/android/jpeg/post_processor_jpeg.h\n> +++ b/src/android/jpeg/post_processor_jpeg.h\n> @@ -13,7 +13,7 @@\n> \n> #include \n> \n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> class CameraDevice;\n> \n> diff --git a/src/android/jpeg/thumbnailer.h b/src/android/jpeg/thumbnailer.h\n> index 4e9226c34104..68cbf74329a9 100644\n> --- a/src/android/jpeg/thumbnailer.h\n> +++ b/src/android/jpeg/thumbnailer.h\n> @@ -9,8 +9,8 @@\n> \n> #include \n> \n> -#include \"libcamera/internal/buffer.h\"\n> #include \"libcamera/internal/formats.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> class Thumbnailer\n> {\n> diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp\n> index 326fdc066499..166be36efd5b 100644\n> --- a/src/android/mm/generic_camera_buffer.cpp\n> +++ b/src/android/mm/generic_camera_buffer.cpp\n> @@ -11,7 +11,7 @@\n> \n> #include \n> \n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> using namespace libcamera;\n> \n> diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> index 547fda379ed8..689f85d9d3b8 100644\n> --- a/src/android/post_processor.h\n> +++ b/src/android/post_processor.h\n> @@ -7,10 +7,10 @@\n> #ifndef __ANDROID_POST_PROCESSOR_H__\n> #define __ANDROID_POST_PROCESSOR_H__\n> \n> -#include \n> +#include \n> #include \n> \n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> #include \"camera_buffer.h\"\n> \n> diff --git a/src/cam/buffer_writer.h b/src/cam/buffer_writer.h\n> index 47e26103e13e..604ce8702ec7 100644\n> --- a/src/cam/buffer_writer.h\n> +++ b/src/cam/buffer_writer.h\n> @@ -10,7 +10,7 @@\n> #include \n> #include \n> \n> -#include \n> +#include \n> \n> class BufferWriter\n> {\n> diff --git a/src/cam/capture.h b/src/cam/capture.h\n> index 59d138766b1e..de478c98e9c1 100644\n> --- a/src/cam/capture.h\n> +++ b/src/cam/capture.h\n> @@ -11,8 +11,8 @@\n> #include \n> #include \n> \n> -#include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index f43f862085bb..71698d36e50f 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -13,14 +13,14 @@\n> \n> #include \n> \n> -#include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> #include \n> \n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> #include \"ipu3_agc.h\"\n> #include \"ipu3_awb.h\"\n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 4d09a84f6532..4ae81f352596 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -18,17 +18,17 @@\n> #include \n> #include \n> \n> -#include \n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> #include \n> #include \n> \n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> #include \"agc_algorithm.hpp\"\n> #include \"agc_status.h\"\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index cdfb4d139e41..b881d42ea131 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -17,8 +17,8 @@\n> \n> #include \n> \n> -#include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> diff --git a/src/libcamera/buffer.cpp b/src/libcamera/framebuffer.cpp\n> similarity index 97%\n> rename from src/libcamera/buffer.cpp\n> rename to src/libcamera/framebuffer.cpp\n> index e4c345d518da..4bde556c4013 100644\n> --- a/src/libcamera/buffer.cpp\n> +++ b/src/libcamera/framebuffer.cpp\n> @@ -2,11 +2,11 @@\n> /*\n> * Copyright (C) 2019, Google Inc.\n> *\n> - * buffer.cpp - Buffer handling\n> + * framebuffer.cpp - Frame buffer handling\n> */\n> \n> -#include \n> -#include \"libcamera/internal/buffer.h\"\n> +#include \n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> #include \n> #include \n> @@ -16,11 +16,11 @@\n> #include \n> \n> /**\n> - * \\file libcamera/buffer.h\n> - * \\brief Buffer handling\n> + * \\file libcamera/framebuffer.h\n> + * \\brief Frame buffer handling\n> *\n> - * \\file libcamera/internal/buffer.h\n> - * \\brief Internal buffer handling support\n> + * \\file libcamera/internal/framebuffer.h\n> + * \\brief Internal frame buffer handling support\n> */\n> \n> namespace libcamera {\n> diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp\n> index 86a57923286c..695073fd1c1c 100644\n> --- a/src/libcamera/framebuffer_allocator.cpp\n> +++ b/src/libcamera/framebuffer_allocator.cpp\n> @@ -11,8 +11,8 @@\n> \n> #include \n> \n> -#include \n> #include \n> +#include \n> #include \n> \n> #include \"libcamera/internal/pipeline_handler.h\"\n> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> index 517e763d40f0..4f08580157f9 100644\n> --- a/src/libcamera/meson.build\n> +++ b/src/libcamera/meson.build\n> @@ -2,7 +2,6 @@\n> \n> libcamera_sources = files([\n> 'bayer_format.cpp',\n> - 'buffer.cpp',\n> 'byte_stream_buffer.cpp',\n> 'camera.cpp',\n> 'camera_controls.cpp',\n> @@ -17,6 +16,7 @@ libcamera_sources = files([\n> 'device_enumerator_sysfs.cpp',\n> 'file_descriptor.cpp',\n> 'formats.cpp',\n> + 'framebuffer.cpp',\n> 'framebuffer_allocator.cpp',\n> 'geometry.cpp',\n> 'ipa_controls.cpp',\n> diff --git a/src/libcamera/pipeline/ipu3/frames.cpp b/src/libcamera/pipeline/ipu3/frames.cpp\n> index d9a2249b81ff..ce5ccbf18e41 100644\n> --- a/src/libcamera/pipeline/ipu3/frames.cpp\n> +++ b/src/libcamera/pipeline/ipu3/frames.cpp\n> @@ -7,7 +7,7 @@\n> \n> #include \"frames.h\"\n> \n> -#include \n> +#include \n> #include \n> \n> #include \"libcamera/internal/pipeline_handler.h\"\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 082eb1ee1c23..4f1a5985d62f 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -30,10 +30,10 @@\n> #include \n> \n> #include \"libcamera/internal/bayer_format.h\"\n> -#include \"libcamera/internal/buffer.h\"\n> #include \"libcamera/internal/camera_sensor.h\"\n> #include \"libcamera/internal/delayed_controls.h\"\n> #include \"libcamera/internal/device_enumerator.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> #include \"libcamera/internal/ipa_manager.h\"\n> #include \"libcamera/internal/media_device.h\"\n> #include \"libcamera/internal/pipeline_handler.h\"\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 00df4f0b3e6b..42911a8fdfdb 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -17,10 +17,10 @@\n> #include \n> #include \n> \n> -#include \n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\n> index 3baf78f9364c..b5e34c4cd0c5 100644\n> --- a/src/libcamera/pipeline/simple/converter.cpp\n> +++ b/src/libcamera/pipeline/simple/converter.cpp\n> @@ -14,7 +14,7 @@\n> #include \n> #include \n> \n> -#include \n> +#include \n> #include \n> #include \n> \n> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\n> index 0ed172dcd750..c9928d444b04 100644\n> --- a/src/libcamera/pipeline_handler.cpp\n> +++ b/src/libcamera/pipeline_handler.cpp\n> @@ -12,9 +12,9 @@\n> #include \n> #include \n> \n> -#include \n> #include \n> #include \n> +#include \n> \n> #include \"libcamera/internal/device_enumerator.h\"\n> #include \"libcamera/internal/media_device.h\"\n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index 518384eb8cf6..5faf3c71ff02 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -12,9 +12,9 @@\n> \n> #include \n> \n> -#include \n> #include \n> #include \n> +#include \n> #include \n> \n> #include \"libcamera/internal/camera_controls.h\"\n> diff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h\n> index bf44c879aff7..20905f37ab94 100644\n> --- a/src/qcam/dng_writer.h\n> +++ b/src/qcam/dng_writer.h\n> @@ -10,9 +10,9 @@\n> #ifdef HAVE_TIFF\n> #define HAVE_DNG\n> \n> -#include \n> #include \n> #include \n> +#include \n> #include \n> \n> using namespace libcamera;\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index 271314614391..85d56ce49abe 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -18,10 +18,10 @@\n> #include \n> #include \n> \n> -#include \n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\n> index e33dc4525224..46747c227d0c 100644\n> --- a/src/qcam/viewfinder.h\n> +++ b/src/qcam/viewfinder.h\n> @@ -11,8 +11,8 @@\n> #include \n> #include \n> \n> -#include \n> #include \n> +#include \n> \n> struct MappedBuffer {\n> \tvoid *memory;\n> diff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\n> index bce94c87f2fb..4a0f8ca58f29 100644\n> --- a/src/qcam/viewfinder_gl.h\n> +++ b/src/qcam/viewfinder_gl.h\n> @@ -21,8 +21,8 @@\n> #include \n> #include \n> \n> -#include \n> #include \n> +#include \n> \n> #include \"viewfinder.h\"\n> \n> diff --git a/src/qcam/viewfinder_qt.h b/src/qcam/viewfinder_qt.h\n> index d755428887c0..501c72a70dec 100644\n> --- a/src/qcam/viewfinder_qt.h\n> +++ b/src/qcam/viewfinder_qt.h\n> @@ -14,8 +14,8 @@\n> #include \n> #include \n> \n> -#include \n> #include \n> +#include \n> #include \n> \n> #include \"format_converter.h\"\n> diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\n> index dbe0573bd3a4..a095f4e27524 100644\n> --- a/src/v4l2/v4l2_camera.h\n> +++ b/src/v4l2/v4l2_camera.h\n> @@ -14,9 +14,9 @@\n> \n> #include \n> \n> -#include \n> #include \n> #include \n> +#include \n> #include \n> \n> using namespace libcamera;\n> diff --git a/test/mapped-buffer.cpp b/test/mapped-buffer.cpp\n> index 5de8201e45f6..c9479194cb68 100644\n> --- a/test/mapped-buffer.cpp\n> +++ b/test/mapped-buffer.cpp\n> @@ -9,7 +9,7 @@\n> \n> #include \n> \n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> \n> #include \"camera_test.h\"\n> #include \"test.h\"\n> diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h\n> index 00c6399d3b8a..e981abf79225 100644\n> --- a/test/v4l2_subdevice/v4l2_subdevice_test.h\n> +++ b/test/v4l2_subdevice/v4l2_subdevice_test.h\n> @@ -8,7 +8,7 @@\n> #ifndef __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__\n> #define __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__\n> \n> -#include \n> +#include \n> \n> #include \"libcamera/internal/device_enumerator.h\"\n> #include \"libcamera/internal/media_device.h\"\n> diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp\n> index 91b3e4a0dad6..6af96a983cd0 100644\n> --- a/test/v4l2_videodevice/buffer_sharing.cpp\n> +++ b/test/v4l2_videodevice/buffer_sharing.cpp\n> @@ -12,7 +12,7 @@\n> \n> #include \n> \n> -#include \n> +#include \n> \n> #include \n> #include \n> diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp\n> index f12c8bef97f6..805cb610296f 100644\n> --- a/test/v4l2_videodevice/capture_async.cpp\n> +++ b/test/v4l2_videodevice/capture_async.cpp\n> @@ -7,7 +7,7 @@\n> \n> #include \n> \n> -#include \n> +#include \n> \n> #include \n> #include \n> diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> index fe4b3cc6487f..ebf3e245f86b 100644\n> --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> @@ -7,7 +7,7 @@\n> \n> #include \n> \n> -#include \n> +#include \n> \n> #include \n> #include \n> diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.h b/test/v4l2_videodevice/v4l2_videodevice_test.h\n> index 21054561e068..d46540d4861e 100644\n> --- a/test/v4l2_videodevice/v4l2_videodevice_test.h\n> +++ b/test/v4l2_videodevice/v4l2_videodevice_test.h\n> @@ -9,7 +9,7 @@\n> \n> #include \n> \n> -#include \n> +#include \n> \n> #include \"libcamera/internal/camera_sensor.h\"\n> #include \"libcamera/internal/device_enumerator.h\"","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 323ECBD794\n\tfor ;\n\tMon, 5 Jul 2021 05:12:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 92EFF68505;\n\tMon, 5 Jul 2021 07:12:40 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BAF8A60285\n\tfor ;\n\tMon, 5 Jul 2021 07:12:38 +0200 (CEST)","from [192.168.0.107] (unknown [103.251.226.59])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A1F1CE7;\n\tMon, 5 Jul 2021 07:12:37 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"UCjr03dX\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625461958;\n\tbh=AygDVhTVU5SMKOW/SFasyICRFgAX7HOcUvnHsRH+W68=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=UCjr03dXZ8r/cVJK0yi4RL3GxRUPk0O7DuzGiQGKl35OO4dbMzPv0eG5jwvb0+mH9\n\tY0vss2xgtzyU2sK75Oz1cJWH6N4eSZ6o9Llf5OR66POP/zC9yhn3NcWuePBRcWZMZS\n\t5GuyLCAgdVJks3jE8Ukke6yj5jeFqDFAUpS7iMEQ=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210704232817.8205-1-laurent.pinchart@ideasonboard.com>\n\t<20210704232817.8205-3-laurent.pinchart@ideasonboard.com>","From":"Umang Jain ","Message-ID":"","Date":"Mon, 5 Jul 2021 10:42:34 +0530","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.10.2","MIME-Version":"1.0","In-Reply-To":"<20210704232817.8205-3-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8; format=flowed","Content-Transfer-Encoding":"8bit","Content-Language":"en-US","Subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename\n\tbuffer.h to framebuffer.h","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17970,"web_url":"https://patchwork.libcamera.org/comment/17970/","msgid":"","date":"2021-07-05T10:22:31","subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename\n\tbuffer.h to framebuffer.h","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Umang,\n\nOn Mon, Jul 05, 2021 at 10:42:34AM +0530, Umang Jain wrote:\n> On 7/5/21 4:58 AM, Laurent Pinchart wrote:\n> > libcamera names header files based on the classes they define. The\n> > buffer.h file is an exception. Rename it to framebuffer.h.\n> >\n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > include/libcamera/{buffer.h => framebuffer.h} | 8 ++++----\n> > .../libcamera/internal/{buffer.h => framebuffer.h} | 10 +++++-----\n> > include/libcamera/internal/ipa_data_serializer.h | 2 +-\n> > include/libcamera/internal/meson.build | 2 +-\n> > include/libcamera/internal/tracepoints/request.tp | 2 +-\n> > include/libcamera/internal/v4l2_videodevice.h | 2 +-\n> > include/libcamera/ipa/ipa_interface.h | 2 +-\n> > include/libcamera/meson.build | 2 +-\n> > include/libcamera/stream.h | 2 +-\n> > src/android/camera_device.h | 4 ++--\n> > src/android/camera_stream.h | 4 ++--\n> > src/android/camera_worker.h | 2 +-\n> > src/android/jpeg/encoder.h | 2 +-\n> > src/android/jpeg/encoder_libjpeg.h | 2 +-\n> > src/android/jpeg/post_processor_jpeg.h | 2 +-\n> > src/android/jpeg/thumbnailer.h | 2 +-\n> > src/android/mm/generic_camera_buffer.cpp | 2 +-\n> > src/android/post_processor.h | 4 ++--\n> > src/cam/buffer_writer.h | 2 +-\n> > src/cam/capture.h | 2 +-\n> > src/ipa/ipu3/ipu3.cpp | 4 ++--\n> > src/ipa/raspberrypi/raspberrypi.cpp | 4 ++--\n> > src/ipa/rkisp1/rkisp1.cpp | 2 +-\n> > src/libcamera/{buffer.cpp => framebuffer.cpp} | 14 +++++++-------\n> > src/libcamera/framebuffer_allocator.cpp | 2 +-\n> > src/libcamera/meson.build | 2 +-\n> > src/libcamera/pipeline/ipu3/frames.cpp | 2 +-\n> > src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n> > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n> > src/libcamera/pipeline/simple/converter.cpp | 2 +-\n> > src/libcamera/pipeline_handler.cpp | 2 +-\n> > src/libcamera/request.cpp | 2 +-\n> > src/qcam/dng_writer.h | 2 +-\n> > src/qcam/main_window.h | 2 +-\n> > src/qcam/viewfinder.h | 2 +-\n> > src/qcam/viewfinder_gl.h | 2 +-\n> > src/qcam/viewfinder_qt.h | 2 +-\n> > src/v4l2/v4l2_camera.h | 2 +-\n> > test/mapped-buffer.cpp | 2 +-\n> > test/v4l2_subdevice/v4l2_subdevice_test.h | 2 +-\n> > test/v4l2_videodevice/buffer_sharing.cpp | 2 +-\n> > test/v4l2_videodevice/capture_async.cpp | 2 +-\n> > test/v4l2_videodevice/v4l2_m2mdevice.cpp | 2 +-\n> > test/v4l2_videodevice/v4l2_videodevice_test.h | 2 +-\n> > 44 files changed, 62 insertions(+), 62 deletions(-)\n> > rename include/libcamera/{buffer.h => framebuffer.h} (89%)\n> > rename include/libcamera/internal/{buffer.h => framebuffer.h} (78%)\n> \n> Are you sure you want to name it framebuffer.h for the internal header \n> also? I get the impression that the patch attempts to eliminates the \n> exception, filename vs class-name mismatch, but the internal header with \n> this change, will still be an exception. Why shouldn't we be leaning \n> towards\n> \n>  rename include/libcamera/internal/{buffer.h => mappedbuffer.h} (78%) ?\n\nThat's a good point. Note however how patch 3/3 adds the\nFrameBuffer::Private class to internal/framebuffer.h. The MappedBuffer\nclass is hijacking framebuffer.h a little bit, maybe it should be split\ninto a separate header. It has been added to buffer.h out of simplicity,\nand we have other headers that have a main purpose and also carry\nauxiliary classes.\n\nIn any case, I think this should be addressed in a separate patch if we\ndecide to go that route.\n\n> Other than that, patch looks good to me,\n> \n> Reviewed-by: Umang Jain \n> \n> > rename src/libcamera/{buffer.cpp => framebuffer.cpp} (97%)\n> >\n> > diff --git a/include/libcamera/buffer.h b/include/libcamera/framebuffer.h\n> > similarity index 89%\n> > rename from include/libcamera/buffer.h\n> > rename to include/libcamera/framebuffer.h\n> > index 323d1cba41a9..baf22a466907 100644\n> > --- a/include/libcamera/buffer.h\n> > +++ b/include/libcamera/framebuffer.h\n> > @@ -2,10 +2,10 @@\n> > /*\n> > * Copyright (C) 2019, Google Inc.\n> > *\n> > - * buffer.h - Buffer handling\n> > + * framebuffer.h - Frame buffer handling\n> > */\n> > -#ifndef __LIBCAMERA_BUFFER_H__\n> > -#define __LIBCAMERA_BUFFER_H__\n> > +#ifndef __LIBCAMERA_FRAMEBUFFER_H__\n> > +#define __LIBCAMERA_FRAMEBUFFER_H__\n> > \n> > #include \n> > #include \n> > @@ -71,4 +71,4 @@ private:\n> > \n> > } /* namespace libcamera */\n> > \n> > -#endif /* __LIBCAMERA_BUFFER_H__ */\n> > +#endif /* __LIBCAMERA_FRAMEBUFFER_H__ */\n> > diff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/framebuffer.h\n> > similarity index 78%\n> > rename from include/libcamera/internal/buffer.h\n> > rename to include/libcamera/internal/framebuffer.h\n> > index beae0cb98544..0c76fc62af1d 100644\n> > --- a/include/libcamera/internal/buffer.h\n> > +++ b/include/libcamera/internal/framebuffer.h\n> > @@ -2,10 +2,10 @@\n> > /*\n> > * Copyright (C) 2020, Google Inc.\n> > *\n> > - * buffer.h - Internal buffer handling\n> > + * framebuffer.h - Internal frame buffer handling\n> > */\n> > -#ifndef __LIBCAMERA_INTERNAL_BUFFER_H__\n> > -#define __LIBCAMERA_INTERNAL_BUFFER_H__\n> > +#ifndef __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__\n> > +#define __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__\n> > \n> > #include \n> > #include \n> > @@ -13,7 +13,7 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > +#include \n> > \n> > namespace libcamera {\n> > \n> > @@ -49,4 +49,4 @@ public:\n> > \n> > } /* namespace libcamera */\n> > \n> > -#endif /* __LIBCAMERA_INTERNAL_BUFFER_H__ */\n> > +#endif /* __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__ */\n> > diff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h\n> > index 76325b1d109f..519093bd314f 100644\n> > --- a/include/libcamera/internal/ipa_data_serializer.h\n> > +++ b/include/libcamera/internal/ipa_data_serializer.h\n> > @@ -16,8 +16,8 @@\n> > \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > \n> > diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\n> > index 16a76ebdf9cc..6d4eb7ed3df6 100644\n> > --- a/include/libcamera/internal/meson.build\n> > +++ b/include/libcamera/internal/meson.build\n> > @@ -11,7 +11,6 @@ libcamera_tracepoint_header = custom_target(\n> > \n> > libcamera_internal_headers = files([\n> > 'bayer_format.h',\n> > - 'buffer.h',\n> > 'byte_stream_buffer.h',\n> > 'camera_controls.h',\n> > 'camera_sensor.h',\n> > @@ -23,6 +22,7 @@ libcamera_internal_headers = files([\n> > 'device_enumerator_sysfs.h',\n> > 'device_enumerator_udev.h',\n> > 'formats.h',\n> > + 'framebuffer.h',\n> > 'ipa_manager.h',\n> > 'ipa_module.h',\n> > 'ipa_proxy.h',\n> > diff --git a/include/libcamera/internal/tracepoints/request.tp b/include/libcamera/internal/tracepoints/request.tp\n> > index 9c841b97438a..37d8c46f4d96 100644\n> > --- a/include/libcamera/internal/tracepoints/request.tp\n> > +++ b/include/libcamera/internal/tracepoints/request.tp\n> > @@ -5,7 +5,7 @@\n> > * request.tp - Tracepoints for the request object\n> > */\n> > \n> > -#include \n> > +#include \n> > #include \n> > \n> > TRACEPOINT_EVENT_CLASS(\n> > diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\n> > index a7c3d5290d92..e767ec84c4da 100644\n> > --- a/include/libcamera/internal/v4l2_videodevice.h\n> > +++ b/include/libcamera/internal/v4l2_videodevice.h\n> > @@ -20,7 +20,7 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > +#include \n> > #include \n> > #include \n> > \n> > diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h\n> > index 9a15c86b16e2..1590584c1fb4 100644\n> > --- a/include/libcamera/ipa/ipa_interface.h\n> > +++ b/include/libcamera/ipa/ipa_interface.h\n> > @@ -15,8 +15,8 @@\n> > \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > #include \n> > \n> > namespace libcamera {\n> > diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\n> > index e4d5c655c1e9..5b25ef847ed4 100644\n> > --- a/include/libcamera/meson.build\n> > +++ b/include/libcamera/meson.build\n> > @@ -1,12 +1,12 @@\n> > # SPDX-License-Identifier: CC0-1.0\n> > \n> > libcamera_public_headers = files([\n> > - 'buffer.h',\n> > 'camera.h',\n> > 'camera_manager.h',\n> > 'compiler.h',\n> > 'controls.h',\n> > 'file_descriptor.h',\n> > + 'framebuffer.h',\n> > 'framebuffer_allocator.h',\n> > 'geometry.h',\n> > 'logging.h',\n> > diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h\n> > index bb47c390f8a1..0c55e7164592 100644\n> > --- a/include/libcamera/stream.h\n> > +++ b/include/libcamera/stream.h\n> > @@ -12,7 +12,7 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > +#include \n> > #include \n> > #include \n> > \n> > diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> > index 3361918d4484..32ba15566621 100644\n> > --- a/src/android/camera_device.h\n> > +++ b/src/android/camera_device.h\n> > @@ -18,12 +18,12 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > \n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > #include \"camera_capabilities.h\"\n> > #include \"camera_metadata.h\"\n> > diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> > index 8ecc6e345414..629d9e00e08d 100644\n> > --- a/src/android/camera_stream.h\n> > +++ b/src/android/camera_stream.h\n> > @@ -13,13 +13,13 @@\n> > \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > \n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > class CameraDevice;\n> > class CameraMetadata;\n> > diff --git a/src/android/camera_worker.h b/src/android/camera_worker.h\n> > index 6e1aee4a3247..67ae50bd9288 100644\n> > --- a/src/android/camera_worker.h\n> > +++ b/src/android/camera_worker.h\n> > @@ -12,8 +12,8 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > \n> > diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\n> > index 28e7f92a3ecb..a28522f41714 100644\n> > --- a/src/android/jpeg/encoder.h\n> > +++ b/src/android/jpeg/encoder.h\n> > @@ -9,7 +9,7 @@\n> > \n> > #include \n> > \n> > -#include \n> > +#include \n> > #include \n> > \n> > class Encoder\n> > diff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\n> > index 838da7728382..14bf89223982 100644\n> > --- a/src/android/jpeg/encoder_libjpeg.h\n> > +++ b/src/android/jpeg/encoder_libjpeg.h\n> > @@ -9,8 +9,8 @@\n> > \n> > #include \"encoder.h\"\n> > \n> > -#include \"libcamera/internal/buffer.h\"\n> > #include \"libcamera/internal/formats.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > #include \n> > \n> > diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> > index 5d2d4ab224b1..5c399be9eb6a 100644\n> > --- a/src/android/jpeg/post_processor_jpeg.h\n> > +++ b/src/android/jpeg/post_processor_jpeg.h\n> > @@ -13,7 +13,7 @@\n> > \n> > #include \n> > \n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > class CameraDevice;\n> > \n> > diff --git a/src/android/jpeg/thumbnailer.h b/src/android/jpeg/thumbnailer.h\n> > index 4e9226c34104..68cbf74329a9 100644\n> > --- a/src/android/jpeg/thumbnailer.h\n> > +++ b/src/android/jpeg/thumbnailer.h\n> > @@ -9,8 +9,8 @@\n> > \n> > #include \n> > \n> > -#include \"libcamera/internal/buffer.h\"\n> > #include \"libcamera/internal/formats.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > class Thumbnailer\n> > {\n> > diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp\n> > index 326fdc066499..166be36efd5b 100644\n> > --- a/src/android/mm/generic_camera_buffer.cpp\n> > +++ b/src/android/mm/generic_camera_buffer.cpp\n> > @@ -11,7 +11,7 @@\n> > \n> > #include \n> > \n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > using namespace libcamera;\n> > \n> > diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> > index 547fda379ed8..689f85d9d3b8 100644\n> > --- a/src/android/post_processor.h\n> > +++ b/src/android/post_processor.h\n> > @@ -7,10 +7,10 @@\n> > #ifndef __ANDROID_POST_PROCESSOR_H__\n> > #define __ANDROID_POST_PROCESSOR_H__\n> > \n> > -#include \n> > +#include \n> > #include \n> > \n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > #include \"camera_buffer.h\"\n> > \n> > diff --git a/src/cam/buffer_writer.h b/src/cam/buffer_writer.h\n> > index 47e26103e13e..604ce8702ec7 100644\n> > --- a/src/cam/buffer_writer.h\n> > +++ b/src/cam/buffer_writer.h\n> > @@ -10,7 +10,7 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > +#include \n> > \n> > class BufferWriter\n> > {\n> > diff --git a/src/cam/capture.h b/src/cam/capture.h\n> > index 59d138766b1e..de478c98e9c1 100644\n> > --- a/src/cam/capture.h\n> > +++ b/src/cam/capture.h\n> > @@ -11,8 +11,8 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> > index f43f862085bb..71698d36e50f 100644\n> > --- a/src/ipa/ipu3/ipu3.cpp\n> > +++ b/src/ipa/ipu3/ipu3.cpp\n> > @@ -13,14 +13,14 @@\n> > \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > #include \n> > \n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > #include \"ipu3_agc.h\"\n> > #include \"ipu3_awb.h\"\n> > diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> > index 4d09a84f6532..4ae81f352596 100644\n> > --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> > +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> > @@ -18,17 +18,17 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > #include \n> > #include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > #include \n> > #include \n> > \n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > #include \"agc_algorithm.hpp\"\n> > #include \"agc_status.h\"\n> > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> > index cdfb4d139e41..b881d42ea131 100644\n> > --- a/src/ipa/rkisp1/rkisp1.cpp\n> > +++ b/src/ipa/rkisp1/rkisp1.cpp\n> > @@ -17,8 +17,8 @@\n> > \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > diff --git a/src/libcamera/buffer.cpp b/src/libcamera/framebuffer.cpp\n> > similarity index 97%\n> > rename from src/libcamera/buffer.cpp\n> > rename to src/libcamera/framebuffer.cpp\n> > index e4c345d518da..4bde556c4013 100644\n> > --- a/src/libcamera/buffer.cpp\n> > +++ b/src/libcamera/framebuffer.cpp\n> > @@ -2,11 +2,11 @@\n> > /*\n> > * Copyright (C) 2019, Google Inc.\n> > *\n> > - * buffer.cpp - Buffer handling\n> > + * framebuffer.cpp - Frame buffer handling\n> > */\n> > \n> > -#include \n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > #include \n> > #include \n> > @@ -16,11 +16,11 @@\n> > #include \n> > \n> > /**\n> > - * \\file libcamera/buffer.h\n> > - * \\brief Buffer handling\n> > + * \\file libcamera/framebuffer.h\n> > + * \\brief Frame buffer handling\n> > *\n> > - * \\file libcamera/internal/buffer.h\n> > - * \\brief Internal buffer handling support\n> > + * \\file libcamera/internal/framebuffer.h\n> > + * \\brief Internal frame buffer handling support\n> > */\n> > \n> > namespace libcamera {\n> > diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp\n> > index 86a57923286c..695073fd1c1c 100644\n> > --- a/src/libcamera/framebuffer_allocator.cpp\n> > +++ b/src/libcamera/framebuffer_allocator.cpp\n> > @@ -11,8 +11,8 @@\n> > \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > #include \n> > \n> > #include \"libcamera/internal/pipeline_handler.h\"\n> > diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> > index 517e763d40f0..4f08580157f9 100644\n> > --- a/src/libcamera/meson.build\n> > +++ b/src/libcamera/meson.build\n> > @@ -2,7 +2,6 @@\n> > \n> > libcamera_sources = files([\n> > 'bayer_format.cpp',\n> > - 'buffer.cpp',\n> > 'byte_stream_buffer.cpp',\n> > 'camera.cpp',\n> > 'camera_controls.cpp',\n> > @@ -17,6 +16,7 @@ libcamera_sources = files([\n> > 'device_enumerator_sysfs.cpp',\n> > 'file_descriptor.cpp',\n> > 'formats.cpp',\n> > + 'framebuffer.cpp',\n> > 'framebuffer_allocator.cpp',\n> > 'geometry.cpp',\n> > 'ipa_controls.cpp',\n> > diff --git a/src/libcamera/pipeline/ipu3/frames.cpp b/src/libcamera/pipeline/ipu3/frames.cpp\n> > index d9a2249b81ff..ce5ccbf18e41 100644\n> > --- a/src/libcamera/pipeline/ipu3/frames.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/frames.cpp\n> > @@ -7,7 +7,7 @@\n> > \n> > #include \"frames.h\"\n> > \n> > -#include \n> > +#include \n> > #include \n> > \n> > #include \"libcamera/internal/pipeline_handler.h\"\n> > diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > index 082eb1ee1c23..4f1a5985d62f 100644\n> > --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > @@ -30,10 +30,10 @@\n> > #include \n> > \n> > #include \"libcamera/internal/bayer_format.h\"\n> > -#include \"libcamera/internal/buffer.h\"\n> > #include \"libcamera/internal/camera_sensor.h\"\n> > #include \"libcamera/internal/delayed_controls.h\"\n> > #include \"libcamera/internal/device_enumerator.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > #include \"libcamera/internal/ipa_manager.h\"\n> > #include \"libcamera/internal/media_device.h\"\n> > #include \"libcamera/internal/pipeline_handler.h\"\n> > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > index 00df4f0b3e6b..42911a8fdfdb 100644\n> > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > @@ -17,10 +17,10 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > #include \n> > #include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\n> > index 3baf78f9364c..b5e34c4cd0c5 100644\n> > --- a/src/libcamera/pipeline/simple/converter.cpp\n> > +++ b/src/libcamera/pipeline/simple/converter.cpp\n> > @@ -14,7 +14,7 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > +#include \n> > #include \n> > #include \n> > \n> > diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\n> > index 0ed172dcd750..c9928d444b04 100644\n> > --- a/src/libcamera/pipeline_handler.cpp\n> > +++ b/src/libcamera/pipeline_handler.cpp\n> > @@ -12,9 +12,9 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > #include \n> > #include \n> > +#include \n> > \n> > #include \"libcamera/internal/device_enumerator.h\"\n> > #include \"libcamera/internal/media_device.h\"\n> > diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> > index 518384eb8cf6..5faf3c71ff02 100644\n> > --- a/src/libcamera/request.cpp\n> > +++ b/src/libcamera/request.cpp\n> > @@ -12,9 +12,9 @@\n> > \n> > #include \n> > \n> > -#include \n> > #include \n> > #include \n> > +#include \n> > #include \n> > \n> > #include \"libcamera/internal/camera_controls.h\"\n> > diff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h\n> > index bf44c879aff7..20905f37ab94 100644\n> > --- a/src/qcam/dng_writer.h\n> > +++ b/src/qcam/dng_writer.h\n> > @@ -10,9 +10,9 @@\n> > #ifdef HAVE_TIFF\n> > #define HAVE_DNG\n> > \n> > -#include \n> > #include \n> > #include \n> > +#include \n> > #include \n> > \n> > using namespace libcamera;\n> > diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> > index 271314614391..85d56ce49abe 100644\n> > --- a/src/qcam/main_window.h\n> > +++ b/src/qcam/main_window.h\n> > @@ -18,10 +18,10 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > #include \n> > #include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\n> > index e33dc4525224..46747c227d0c 100644\n> > --- a/src/qcam/viewfinder.h\n> > +++ b/src/qcam/viewfinder.h\n> > @@ -11,8 +11,8 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > \n> > struct MappedBuffer {\n> > \tvoid *memory;\n> > diff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\n> > index bce94c87f2fb..4a0f8ca58f29 100644\n> > --- a/src/qcam/viewfinder_gl.h\n> > +++ b/src/qcam/viewfinder_gl.h\n> > @@ -21,8 +21,8 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > \n> > #include \"viewfinder.h\"\n> > \n> > diff --git a/src/qcam/viewfinder_qt.h b/src/qcam/viewfinder_qt.h\n> > index d755428887c0..501c72a70dec 100644\n> > --- a/src/qcam/viewfinder_qt.h\n> > +++ b/src/qcam/viewfinder_qt.h\n> > @@ -14,8 +14,8 @@\n> > #include \n> > #include \n> > \n> > -#include \n> > #include \n> > +#include \n> > #include \n> > \n> > #include \"format_converter.h\"\n> > diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\n> > index dbe0573bd3a4..a095f4e27524 100644\n> > --- a/src/v4l2/v4l2_camera.h\n> > +++ b/src/v4l2/v4l2_camera.h\n> > @@ -14,9 +14,9 @@\n> > \n> > #include \n> > \n> > -#include \n> > #include \n> > #include \n> > +#include \n> > #include \n> > \n> > using namespace libcamera;\n> > diff --git a/test/mapped-buffer.cpp b/test/mapped-buffer.cpp\n> > index 5de8201e45f6..c9479194cb68 100644\n> > --- a/test/mapped-buffer.cpp\n> > +++ b/test/mapped-buffer.cpp\n> > @@ -9,7 +9,7 @@\n> > \n> > #include \n> > \n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > \n> > #include \"camera_test.h\"\n> > #include \"test.h\"\n> > diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h\n> > index 00c6399d3b8a..e981abf79225 100644\n> > --- a/test/v4l2_subdevice/v4l2_subdevice_test.h\n> > +++ b/test/v4l2_subdevice/v4l2_subdevice_test.h\n> > @@ -8,7 +8,7 @@\n> > #ifndef __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__\n> > #define __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__\n> > \n> > -#include \n> > +#include \n> > \n> > #include \"libcamera/internal/device_enumerator.h\"\n> > #include \"libcamera/internal/media_device.h\"\n> > diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp\n> > index 91b3e4a0dad6..6af96a983cd0 100644\n> > --- a/test/v4l2_videodevice/buffer_sharing.cpp\n> > +++ b/test/v4l2_videodevice/buffer_sharing.cpp\n> > @@ -12,7 +12,7 @@\n> > \n> > #include \n> > \n> > -#include \n> > +#include \n> > \n> > #include \n> > #include \n> > diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp\n> > index f12c8bef97f6..805cb610296f 100644\n> > --- a/test/v4l2_videodevice/capture_async.cpp\n> > +++ b/test/v4l2_videodevice/capture_async.cpp\n> > @@ -7,7 +7,7 @@\n> > \n> > #include \n> > \n> > -#include \n> > +#include \n> > \n> > #include \n> > #include \n> > diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> > index fe4b3cc6487f..ebf3e245f86b 100644\n> > --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> > +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> > @@ -7,7 +7,7 @@\n> > \n> > #include \n> > \n> > -#include \n> > +#include \n> > \n> > #include \n> > #include \n> > diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.h b/test/v4l2_videodevice/v4l2_videodevice_test.h\n> > index 21054561e068..d46540d4861e 100644\n> > --- a/test/v4l2_videodevice/v4l2_videodevice_test.h\n> > +++ b/test/v4l2_videodevice/v4l2_videodevice_test.h\n> > @@ -9,7 +9,7 @@\n> > \n> > #include \n> > \n> > -#include \n> > +#include \n> > \n> > #include \"libcamera/internal/camera_sensor.h\"\n> > #include \"libcamera/internal/device_enumerator.h\"","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id AA0A2C0100\n\tfor ;\n\tMon, 5 Jul 2021 10:23:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1AC8568503;\n\tMon, 5 Jul 2021 12:23:16 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2B8346050A\n\tfor ;\n\tMon, 5 Jul 2021 12:23:14 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 84C01E7;\n\tMon, 5 Jul 2021 12:23:13 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"bJBUelDk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625480593;\n\tbh=pXJXTAJ5VKNGzDxOigPD5LcxX3bKxDmb2ARUFU0Kch8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=bJBUelDkEPDPR9CL9KOciE/zc+o9qdUw6ZewAnVxW70Vko+DXC2kCBGQLbCu5U1I3\n\tKefvsKsrLyqiLFFncV7Pv8T0TDrDcLvzyjUncOQqddBsjhlPUJ+0nfS4dLAI8+/tpX\n\tXLHRngSbFYb8DxX1RVjmwqXUFG2eghz+K5uyR/zI=","Date":"Mon, 5 Jul 2021 13:22:31 +0300","From":"Laurent Pinchart ","To":"Umang Jain ","Message-ID":"","References":"<20210704232817.8205-1-laurent.pinchart@ideasonboard.com>\n\t<20210704232817.8205-3-laurent.pinchart@ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename\n\tbuffer.h to framebuffer.h","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17972,"web_url":"https://patchwork.libcamera.org/comment/17972/","msgid":"<20210705103035.n7vvdmfafklm5i7s@uno.localdomain>","date":"2021-07-05T10:30:35","subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename\n\tbuffer.h to framebuffer.h","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Mon, Jul 05, 2021 at 02:28:16AM +0300, Laurent Pinchart wrote:\n> libcamera names header files based on the classes they define. The\n> buffer.h file is an exception. Rename it to framebuffer.h.\n>\n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> include/libcamera/{buffer.h => framebuffer.h} | 8 ++++----\n> .../libcamera/internal/{buffer.h => framebuffer.h} | 10 +++++-----\n> include/libcamera/internal/ipa_data_serializer.h | 2 +-\n> include/libcamera/internal/meson.build | 2 +-\n> include/libcamera/internal/tracepoints/request.tp | 2 +-\n> include/libcamera/internal/v4l2_videodevice.h | 2 +-\n> include/libcamera/ipa/ipa_interface.h | 2 +-\n> include/libcamera/meson.build | 2 +-\n> include/libcamera/stream.h | 2 +-\n> src/android/camera_device.h | 4 ++--\n> src/android/camera_stream.h | 4 ++--\n> src/android/camera_worker.h | 2 +-\n> src/android/jpeg/encoder.h | 2 +-\n> src/android/jpeg/encoder_libjpeg.h | 2 +-\n> src/android/jpeg/post_processor_jpeg.h | 2 +-\n> src/android/jpeg/thumbnailer.h | 2 +-\n> src/android/mm/generic_camera_buffer.cpp | 2 +-\n> src/android/post_processor.h | 4 ++--\n> src/cam/buffer_writer.h | 2 +-\n> src/cam/capture.h | 2 +-\n> src/ipa/ipu3/ipu3.cpp | 4 ++--\n> src/ipa/raspberrypi/raspberrypi.cpp | 4 ++--\n> src/ipa/rkisp1/rkisp1.cpp | 2 +-\n> src/libcamera/{buffer.cpp => framebuffer.cpp} | 14 +++++++-------\n> src/libcamera/framebuffer_allocator.cpp | 2 +-\n> src/libcamera/meson.build | 2 +-\n> src/libcamera/pipeline/ipu3/frames.cpp | 2 +-\n> src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n> src/libcamera/pipeline/simple/converter.cpp | 2 +-\n> src/libcamera/pipeline_handler.cpp | 2 +-\n> src/libcamera/request.cpp | 2 +-\n> src/qcam/dng_writer.h | 2 +-\n> src/qcam/main_window.h | 2 +-\n> src/qcam/viewfinder.h | 2 +-\n> src/qcam/viewfinder_gl.h | 2 +-\n> src/qcam/viewfinder_qt.h | 2 +-\n> src/v4l2/v4l2_camera.h | 2 +-\n> test/mapped-buffer.cpp | 2 +-\n> test/v4l2_subdevice/v4l2_subdevice_test.h | 2 +-\n> test/v4l2_videodevice/buffer_sharing.cpp | 2 +-\n> test/v4l2_videodevice/capture_async.cpp | 2 +-\n> test/v4l2_videodevice/v4l2_m2mdevice.cpp | 2 +-\n> test/v4l2_videodevice/v4l2_videodevice_test.h | 2 +-\n> 44 files changed, 62 insertions(+), 62 deletions(-)\n> rename include/libcamera/{buffer.h => framebuffer.h} (89%)\n> rename include/libcamera/internal/{buffer.h => framebuffer.h} (78%)\n> rename src/libcamera/{buffer.cpp => framebuffer.cpp} (97%)\n>\n> diff --git a/include/libcamera/buffer.h b/include/libcamera/framebuffer.h\n> similarity index 89%\n> rename from include/libcamera/buffer.h\n> rename to include/libcamera/framebuffer.h\n> index 323d1cba41a9..baf22a466907 100644\n> --- a/include/libcamera/buffer.h\n> +++ b/include/libcamera/framebuffer.h\n> @@ -2,10 +2,10 @@\n> /*\n> * Copyright (C) 2019, Google Inc.\n> *\n> - * buffer.h - Buffer handling\n> + * framebuffer.h - Frame buffer handling\n> */\n> -#ifndef __LIBCAMERA_BUFFER_H__\n> -#define __LIBCAMERA_BUFFER_H__\n> +#ifndef __LIBCAMERA_FRAMEBUFFER_H__\n> +#define __LIBCAMERA_FRAMEBUFFER_H__\n>\n> #include \n> #include \n> @@ -71,4 +71,4 @@ private:\n>\n> } /* namespace libcamera */\n>\n> -#endif /* __LIBCAMERA_BUFFER_H__ */\n> +#endif /* __LIBCAMERA_FRAMEBUFFER_H__ */\n> diff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/framebuffer.h\n> similarity index 78%\n> rename from include/libcamera/internal/buffer.h\n> rename to include/libcamera/internal/framebuffer.h\n> index beae0cb98544..0c76fc62af1d 100644\n> --- a/include/libcamera/internal/buffer.h\n> +++ b/include/libcamera/internal/framebuffer.h\n> @@ -2,10 +2,10 @@\n> /*\n> * Copyright (C) 2020, Google Inc.\n> *\n> - * buffer.h - Internal buffer handling\n> + * framebuffer.h - Internal frame buffer handling\n> */\n> -#ifndef __LIBCAMERA_INTERNAL_BUFFER_H__\n> -#define __LIBCAMERA_INTERNAL_BUFFER_H__\n> +#ifndef __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__\n> +#define __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__\n>\n> #include \n> #include \n> @@ -13,7 +13,7 @@\n> #include \n> #include \n>\n> -#include \n> +#include \n>\n> namespace libcamera {\n>\n> @@ -49,4 +49,4 @@ public:\n>\n> } /* namespace libcamera */\n>\n> -#endif /* __LIBCAMERA_INTERNAL_BUFFER_H__ */\n> +#endif /* __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__ */\n> diff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h\n> index 76325b1d109f..519093bd314f 100644\n> --- a/include/libcamera/internal/ipa_data_serializer.h\n> +++ b/include/libcamera/internal/ipa_data_serializer.h\n> @@ -16,8 +16,8 @@\n>\n> #include \n>\n> -#include \n> #include \n> +#include \n> #include \n> #include \n>\n> diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\n> index 16a76ebdf9cc..6d4eb7ed3df6 100644\n> --- a/include/libcamera/internal/meson.build\n> +++ b/include/libcamera/internal/meson.build\n> @@ -11,7 +11,6 @@ libcamera_tracepoint_header = custom_target(\n>\n> libcamera_internal_headers = files([\n> 'bayer_format.h',\n> - 'buffer.h',\n> 'byte_stream_buffer.h',\n> 'camera_controls.h',\n> 'camera_sensor.h',\n> @@ -23,6 +22,7 @@ libcamera_internal_headers = files([\n> 'device_enumerator_sysfs.h',\n> 'device_enumerator_udev.h',\n> 'formats.h',\n> + 'framebuffer.h',\n> 'ipa_manager.h',\n> 'ipa_module.h',\n> 'ipa_proxy.h',\n> diff --git a/include/libcamera/internal/tracepoints/request.tp b/include/libcamera/internal/tracepoints/request.tp\n> index 9c841b97438a..37d8c46f4d96 100644\n> --- a/include/libcamera/internal/tracepoints/request.tp\n> +++ b/include/libcamera/internal/tracepoints/request.tp\n> @@ -5,7 +5,7 @@\n> * request.tp - Tracepoints for the request object\n> */\n>\n> -#include \n> +#include \n> #include \n>\n> TRACEPOINT_EVENT_CLASS(\n> diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\n> index a7c3d5290d92..e767ec84c4da 100644\n> --- a/include/libcamera/internal/v4l2_videodevice.h\n> +++ b/include/libcamera/internal/v4l2_videodevice.h\n> @@ -20,7 +20,7 @@\n> #include \n> #include \n>\n> -#include \n> +#include \n> #include \n> #include \n>\n> diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h\n> index 9a15c86b16e2..1590584c1fb4 100644\n> --- a/include/libcamera/ipa/ipa_interface.h\n> +++ b/include/libcamera/ipa/ipa_interface.h\n> @@ -15,8 +15,8 @@\n>\n> #include \n>\n> -#include \n> #include \n> +#include \n> #include \n>\n> namespace libcamera {\n> diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\n> index e4d5c655c1e9..5b25ef847ed4 100644\n> --- a/include/libcamera/meson.build\n> +++ b/include/libcamera/meson.build\n> @@ -1,12 +1,12 @@\n> # SPDX-License-Identifier: CC0-1.0\n>\n> libcamera_public_headers = files([\n> - 'buffer.h',\n> 'camera.h',\n> 'camera_manager.h',\n> 'compiler.h',\n> 'controls.h',\n> 'file_descriptor.h',\n> + 'framebuffer.h',\n> 'framebuffer_allocator.h',\n> 'geometry.h',\n> 'logging.h',\n> diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h\n> index bb47c390f8a1..0c55e7164592 100644\n> --- a/include/libcamera/stream.h\n> +++ b/include/libcamera/stream.h\n> @@ -12,7 +12,7 @@\n> #include \n> #include \n>\n> -#include \n> +#include \n> #include \n> #include \n>\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 3361918d4484..32ba15566621 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -18,12 +18,12 @@\n> #include \n> #include \n>\n> -#include \n> #include \n> +#include \n> #include \n> #include \n>\n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> #include \"camera_capabilities.h\"\n> #include \"camera_metadata.h\"\n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index 8ecc6e345414..629d9e00e08d 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -13,13 +13,13 @@\n>\n> #include \n>\n> -#include \n> #include \n> +#include \n> #include \n> #include \n> #include \n>\n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> class CameraDevice;\n> class CameraMetadata;\n> diff --git a/src/android/camera_worker.h b/src/android/camera_worker.h\n> index 6e1aee4a3247..67ae50bd9288 100644\n> --- a/src/android/camera_worker.h\n> +++ b/src/android/camera_worker.h\n> @@ -12,8 +12,8 @@\n> #include \n> #include \n>\n> -#include \n> #include \n> +#include \n> #include \n> #include \n>\n> diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\n> index 28e7f92a3ecb..a28522f41714 100644\n> --- a/src/android/jpeg/encoder.h\n> +++ b/src/android/jpeg/encoder.h\n> @@ -9,7 +9,7 @@\n>\n> #include \n>\n> -#include \n> +#include \n> #include \n>\n> class Encoder\n> diff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\n> index 838da7728382..14bf89223982 100644\n> --- a/src/android/jpeg/encoder_libjpeg.h\n> +++ b/src/android/jpeg/encoder_libjpeg.h\n> @@ -9,8 +9,8 @@\n>\n> #include \"encoder.h\"\n>\n> -#include \"libcamera/internal/buffer.h\"\n> #include \"libcamera/internal/formats.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> #include \n>\n> diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> index 5d2d4ab224b1..5c399be9eb6a 100644\n> --- a/src/android/jpeg/post_processor_jpeg.h\n> +++ b/src/android/jpeg/post_processor_jpeg.h\n> @@ -13,7 +13,7 @@\n>\n> #include \n>\n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> class CameraDevice;\n>\n> diff --git a/src/android/jpeg/thumbnailer.h b/src/android/jpeg/thumbnailer.h\n> index 4e9226c34104..68cbf74329a9 100644\n> --- a/src/android/jpeg/thumbnailer.h\n> +++ b/src/android/jpeg/thumbnailer.h\n> @@ -9,8 +9,8 @@\n>\n> #include \n>\n> -#include \"libcamera/internal/buffer.h\"\n> #include \"libcamera/internal/formats.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> class Thumbnailer\n> {\n> diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp\n> index 326fdc066499..166be36efd5b 100644\n> --- a/src/android/mm/generic_camera_buffer.cpp\n> +++ b/src/android/mm/generic_camera_buffer.cpp\n> @@ -11,7 +11,7 @@\n>\n> #include \n>\n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> using namespace libcamera;\n>\n> diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> index 547fda379ed8..689f85d9d3b8 100644\n> --- a/src/android/post_processor.h\n> +++ b/src/android/post_processor.h\n> @@ -7,10 +7,10 @@\n> #ifndef __ANDROID_POST_PROCESSOR_H__\n> #define __ANDROID_POST_PROCESSOR_H__\n>\n> -#include \n> +#include \n> #include \n>\n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> #include \"camera_buffer.h\"\n>\n> diff --git a/src/cam/buffer_writer.h b/src/cam/buffer_writer.h\n> index 47e26103e13e..604ce8702ec7 100644\n> --- a/src/cam/buffer_writer.h\n> +++ b/src/cam/buffer_writer.h\n> @@ -10,7 +10,7 @@\n> #include \n> #include \n>\n> -#include \n> +#include \n>\n> class BufferWriter\n> {\n> diff --git a/src/cam/capture.h b/src/cam/capture.h\n> index 59d138766b1e..de478c98e9c1 100644\n> --- a/src/cam/capture.h\n> +++ b/src/cam/capture.h\n> @@ -11,8 +11,8 @@\n> #include \n> #include \n>\n> -#include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index f43f862085bb..71698d36e50f 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -13,14 +13,14 @@\n>\n> #include \n>\n> -#include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> #include \n>\n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> #include \"ipu3_agc.h\"\n> #include \"ipu3_awb.h\"\n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 4d09a84f6532..4ae81f352596 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -18,17 +18,17 @@\n> #include \n> #include \n>\n> -#include \n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> #include \n> #include \n>\n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> #include \"agc_algorithm.hpp\"\n> #include \"agc_status.h\"\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index cdfb4d139e41..b881d42ea131 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -17,8 +17,8 @@\n>\n> #include \n>\n> -#include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> diff --git a/src/libcamera/buffer.cpp b/src/libcamera/framebuffer.cpp\n> similarity index 97%\n> rename from src/libcamera/buffer.cpp\n> rename to src/libcamera/framebuffer.cpp\n> index e4c345d518da..4bde556c4013 100644\n> --- a/src/libcamera/buffer.cpp\n> +++ b/src/libcamera/framebuffer.cpp\n> @@ -2,11 +2,11 @@\n> /*\n> * Copyright (C) 2019, Google Inc.\n> *\n> - * buffer.cpp - Buffer handling\n> + * framebuffer.cpp - Frame buffer handling\n> */\n>\n> -#include \n> -#include \"libcamera/internal/buffer.h\"\n> +#include \n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> #include \n> #include \n> @@ -16,11 +16,11 @@\n> #include \n>\n> /**\n> - * \\file libcamera/buffer.h\n> - * \\brief Buffer handling\n> + * \\file libcamera/framebuffer.h\n> + * \\brief Frame buffer handling\n> *\n> - * \\file libcamera/internal/buffer.h\n> - * \\brief Internal buffer handling support\n> + * \\file libcamera/internal/framebuffer.h\n> + * \\brief Internal frame buffer handling support\n> */\n>\n> namespace libcamera {\n> diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp\n> index 86a57923286c..695073fd1c1c 100644\n> --- a/src/libcamera/framebuffer_allocator.cpp\n> +++ b/src/libcamera/framebuffer_allocator.cpp\n> @@ -11,8 +11,8 @@\n>\n> #include \n>\n> -#include \n> #include \n> +#include \n> #include \n>\n> #include \"libcamera/internal/pipeline_handler.h\"\n> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> index 517e763d40f0..4f08580157f9 100644\n> --- a/src/libcamera/meson.build\n> +++ b/src/libcamera/meson.build\n> @@ -2,7 +2,6 @@\n>\n> libcamera_sources = files([\n> 'bayer_format.cpp',\n> - 'buffer.cpp',\n> 'byte_stream_buffer.cpp',\n> 'camera.cpp',\n> 'camera_controls.cpp',\n> @@ -17,6 +16,7 @@ libcamera_sources = files([\n> 'device_enumerator_sysfs.cpp',\n> 'file_descriptor.cpp',\n> 'formats.cpp',\n> + 'framebuffer.cpp',\n> 'framebuffer_allocator.cpp',\n> 'geometry.cpp',\n> 'ipa_controls.cpp',\n> diff --git a/src/libcamera/pipeline/ipu3/frames.cpp b/src/libcamera/pipeline/ipu3/frames.cpp\n> index d9a2249b81ff..ce5ccbf18e41 100644\n> --- a/src/libcamera/pipeline/ipu3/frames.cpp\n> +++ b/src/libcamera/pipeline/ipu3/frames.cpp\n> @@ -7,7 +7,7 @@\n>\n> #include \"frames.h\"\n>\n> -#include \n> +#include \n> #include \n>\n> #include \"libcamera/internal/pipeline_handler.h\"\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 082eb1ee1c23..4f1a5985d62f 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -30,10 +30,10 @@\n> #include \n>\n> #include \"libcamera/internal/bayer_format.h\"\n> -#include \"libcamera/internal/buffer.h\"\n> #include \"libcamera/internal/camera_sensor.h\"\n> #include \"libcamera/internal/delayed_controls.h\"\n> #include \"libcamera/internal/device_enumerator.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n> #include \"libcamera/internal/ipa_manager.h\"\n> #include \"libcamera/internal/media_device.h\"\n> #include \"libcamera/internal/pipeline_handler.h\"\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 00df4f0b3e6b..42911a8fdfdb 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -17,10 +17,10 @@\n> #include \n> #include \n>\n> -#include \n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\n> index 3baf78f9364c..b5e34c4cd0c5 100644\n> --- a/src/libcamera/pipeline/simple/converter.cpp\n> +++ b/src/libcamera/pipeline/simple/converter.cpp\n> @@ -14,7 +14,7 @@\n> #include \n> #include \n>\n> -#include \n> +#include \n> #include \n> #include \n>\n> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\n> index 0ed172dcd750..c9928d444b04 100644\n> --- a/src/libcamera/pipeline_handler.cpp\n> +++ b/src/libcamera/pipeline_handler.cpp\n> @@ -12,9 +12,9 @@\n> #include \n> #include \n>\n> -#include \n> #include \n> #include \n> +#include \n>\n> #include \"libcamera/internal/device_enumerator.h\"\n> #include \"libcamera/internal/media_device.h\"\n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index 518384eb8cf6..5faf3c71ff02 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -12,9 +12,9 @@\n>\n> #include \n>\n> -#include \n> #include \n> #include \n> +#include \n> #include \n>\n> #include \"libcamera/internal/camera_controls.h\"\n> diff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h\n> index bf44c879aff7..20905f37ab94 100644\n> --- a/src/qcam/dng_writer.h\n> +++ b/src/qcam/dng_writer.h\n> @@ -10,9 +10,9 @@\n> #ifdef HAVE_TIFF\n> #define HAVE_DNG\n>\n> -#include \n> #include \n> #include \n> +#include \n> #include \n>\n> using namespace libcamera;\n> diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> index 271314614391..85d56ce49abe 100644\n> --- a/src/qcam/main_window.h\n> +++ b/src/qcam/main_window.h\n> @@ -18,10 +18,10 @@\n> #include \n> #include \n>\n> -#include \n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\n> index e33dc4525224..46747c227d0c 100644\n> --- a/src/qcam/viewfinder.h\n> +++ b/src/qcam/viewfinder.h\n> @@ -11,8 +11,8 @@\n> #include \n> #include \n>\n> -#include \n> #include \n> +#include \n>\n> struct MappedBuffer {\n> \tvoid *memory;\n> diff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\n> index bce94c87f2fb..4a0f8ca58f29 100644\n> --- a/src/qcam/viewfinder_gl.h\n> +++ b/src/qcam/viewfinder_gl.h\n> @@ -21,8 +21,8 @@\n> #include \n> #include \n>\n> -#include \n> #include \n> +#include \n>\n> #include \"viewfinder.h\"\n>\n> diff --git a/src/qcam/viewfinder_qt.h b/src/qcam/viewfinder_qt.h\n> index d755428887c0..501c72a70dec 100644\n> --- a/src/qcam/viewfinder_qt.h\n> +++ b/src/qcam/viewfinder_qt.h\n> @@ -14,8 +14,8 @@\n> #include \n> #include \n>\n> -#include \n> #include \n> +#include \n> #include \n>\n> #include \"format_converter.h\"\n> diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\n> index dbe0573bd3a4..a095f4e27524 100644\n> --- a/src/v4l2/v4l2_camera.h\n> +++ b/src/v4l2/v4l2_camera.h\n> @@ -14,9 +14,9 @@\n>\n> #include \n>\n> -#include \n> #include \n> #include \n> +#include \n> #include \n>\n> using namespace libcamera;\n> diff --git a/test/mapped-buffer.cpp b/test/mapped-buffer.cpp\n> index 5de8201e45f6..c9479194cb68 100644\n> --- a/test/mapped-buffer.cpp\n> +++ b/test/mapped-buffer.cpp\n> @@ -9,7 +9,7 @@\n>\n> #include \n>\n> -#include \"libcamera/internal/buffer.h\"\n> +#include \"libcamera/internal/framebuffer.h\"\n>\n> #include \"camera_test.h\"\n> #include \"test.h\"\n> diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h\n> index 00c6399d3b8a..e981abf79225 100644\n> --- a/test/v4l2_subdevice/v4l2_subdevice_test.h\n> +++ b/test/v4l2_subdevice/v4l2_subdevice_test.h\n> @@ -8,7 +8,7 @@\n> #ifndef __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__\n> #define __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__\n>\n> -#include \n> +#include \n>\n> #include \"libcamera/internal/device_enumerator.h\"\n> #include \"libcamera/internal/media_device.h\"\n> diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp\n> index 91b3e4a0dad6..6af96a983cd0 100644\n> --- a/test/v4l2_videodevice/buffer_sharing.cpp\n> +++ b/test/v4l2_videodevice/buffer_sharing.cpp\n> @@ -12,7 +12,7 @@\n>\n> #include \n>\n> -#include \n> +#include \n>\n> #include \n> #include \n> diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp\n> index f12c8bef97f6..805cb610296f 100644\n> --- a/test/v4l2_videodevice/capture_async.cpp\n> +++ b/test/v4l2_videodevice/capture_async.cpp\n> @@ -7,7 +7,7 @@\n>\n> #include \n>\n> -#include \n> +#include \n>\n> #include \n> #include \n> diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> index fe4b3cc6487f..ebf3e245f86b 100644\n> --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> @@ -7,7 +7,7 @@\n>\n> #include \n>\n> -#include \n> +#include \n>\n> #include \n> #include \n> diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.h b/test/v4l2_videodevice/v4l2_videodevice_test.h\n> index 21054561e068..d46540d4861e 100644\n> --- a/test/v4l2_videodevice/v4l2_videodevice_test.h\n> +++ b/test/v4l2_videodevice/v4l2_videodevice_test.h\n> @@ -9,7 +9,7 @@\n>\n> #include \n>\n> -#include \n> +#include \n>\n> #include \"libcamera/internal/camera_sensor.h\"\n> #include \"libcamera/internal/device_enumerator.h\"\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E289DBD794\n\tfor ;\n\tMon, 5 Jul 2021 10:29:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5904068503;\n\tMon, 5 Jul 2021 12:29:48 +0200 (CEST)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 47B816050A\n\tfor ;\n\tMon, 5 Jul 2021 12:29:47 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id C07FF1BF211;\n\tMon, 5 Jul 2021 10:29:46 +0000 (UTC)"],"Date":"Mon, 5 Jul 2021 12:30:35 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Message-ID":"<20210705103035.n7vvdmfafklm5i7s@uno.localdomain>","References":"<20210704232817.8205-1-laurent.pinchart@ideasonboard.com>\n\t<20210704232817.8205-3-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210704232817.8205-3-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename\n\tbuffer.h to framebuffer.h","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":18002,"web_url":"https://patchwork.libcamera.org/comment/18002/","msgid":"","date":"2021-07-07T08:25:30","subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename\n\tbuffer.h to framebuffer.h","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"content":"Hi Laurent, thank you for the patch.\n\nOn Mon, Jul 5, 2021 at 7:29 PM Jacopo Mondi wrote:\n>\n> Hi Laurent,\n>\n> On Mon, Jul 05, 2021 at 02:28:16AM +0300, Laurent Pinchart wrote:\n> > libcamera names header files based on the classes they define. The\n> > buffer.h file is an exception. Rename it to framebuffer.h.\n> >\n> > Signed-off-by: Laurent Pinchart \n>\n> Reviewed-by: Jacopo Mondi \n>\n\nReviewed-by: Hirokazu Honda \n\n> Thanks\n> j\n>\n> > ---\n> > include/libcamera/{buffer.h => framebuffer.h} | 8 ++++----\n> > .../libcamera/internal/{buffer.h => framebuffer.h} | 10 +++++-----\n> > include/libcamera/internal/ipa_data_serializer.h | 2 +-\n> > include/libcamera/internal/meson.build | 2 +-\n> > include/libcamera/internal/tracepoints/request.tp | 2 +-\n> > include/libcamera/internal/v4l2_videodevice.h | 2 +-\n> > include/libcamera/ipa/ipa_interface.h | 2 +-\n> > include/libcamera/meson.build | 2 +-\n> > include/libcamera/stream.h | 2 +-\n> > src/android/camera_device.h | 4 ++--\n> > src/android/camera_stream.h | 4 ++--\n> > src/android/camera_worker.h | 2 +-\n> > src/android/jpeg/encoder.h | 2 +-\n> > src/android/jpeg/encoder_libjpeg.h | 2 +-\n> > src/android/jpeg/post_processor_jpeg.h | 2 +-\n> > src/android/jpeg/thumbnailer.h | 2 +-\n> > src/android/mm/generic_camera_buffer.cpp | 2 +-\n> > src/android/post_processor.h | 4 ++--\n> > src/cam/buffer_writer.h | 2 +-\n> > src/cam/capture.h | 2 +-\n> > src/ipa/ipu3/ipu3.cpp | 4 ++--\n> > src/ipa/raspberrypi/raspberrypi.cpp | 4 ++--\n> > src/ipa/rkisp1/rkisp1.cpp | 2 +-\n> > src/libcamera/{buffer.cpp => framebuffer.cpp} | 14 +++++++-------\n> > src/libcamera/framebuffer_allocator.cpp | 2 +-\n> > src/libcamera/meson.build | 2 +-\n> > src/libcamera/pipeline/ipu3/frames.cpp | 2 +-\n> > src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n> > src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n> > src/libcamera/pipeline/simple/converter.cpp | 2 +-\n> > src/libcamera/pipeline_handler.cpp | 2 +-\n> > src/libcamera/request.cpp | 2 +-\n> > src/qcam/dng_writer.h | 2 +-\n> > src/qcam/main_window.h | 2 +-\n> > src/qcam/viewfinder.h | 2 +-\n> > src/qcam/viewfinder_gl.h | 2 +-\n> > src/qcam/viewfinder_qt.h | 2 +-\n> > src/v4l2/v4l2_camera.h | 2 +-\n> > test/mapped-buffer.cpp | 2 +-\n> > test/v4l2_subdevice/v4l2_subdevice_test.h | 2 +-\n> > test/v4l2_videodevice/buffer_sharing.cpp | 2 +-\n> > test/v4l2_videodevice/capture_async.cpp | 2 +-\n> > test/v4l2_videodevice/v4l2_m2mdevice.cpp | 2 +-\n> > test/v4l2_videodevice/v4l2_videodevice_test.h | 2 +-\n> > 44 files changed, 62 insertions(+), 62 deletions(-)\n> > rename include/libcamera/{buffer.h => framebuffer.h} (89%)\n> > rename include/libcamera/internal/{buffer.h => framebuffer.h} (78%)\n> > rename src/libcamera/{buffer.cpp => framebuffer.cpp} (97%)\n> >\n> > diff --git a/include/libcamera/buffer.h b/include/libcamera/framebuffer.h\n> > similarity index 89%\n> > rename from include/libcamera/buffer.h\n> > rename to include/libcamera/framebuffer.h\n> > index 323d1cba41a9..baf22a466907 100644\n> > --- a/include/libcamera/buffer.h\n> > +++ b/include/libcamera/framebuffer.h\n> > @@ -2,10 +2,10 @@\n> > /*\n> > * Copyright (C) 2019, Google Inc.\n> > *\n> > - * buffer.h - Buffer handling\n> > + * framebuffer.h - Frame buffer handling\n> > */\n> > -#ifndef __LIBCAMERA_BUFFER_H__\n> > -#define __LIBCAMERA_BUFFER_H__\n> > +#ifndef __LIBCAMERA_FRAMEBUFFER_H__\n> > +#define __LIBCAMERA_FRAMEBUFFER_H__\n> >\n> > #include \n> > #include \n> > @@ -71,4 +71,4 @@ private:\n> >\n> > } /* namespace libcamera */\n> >\n> > -#endif /* __LIBCAMERA_BUFFER_H__ */\n> > +#endif /* __LIBCAMERA_FRAMEBUFFER_H__ */\n> > diff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/framebuffer.h\n> > similarity index 78%\n> > rename from include/libcamera/internal/buffer.h\n> > rename to include/libcamera/internal/framebuffer.h\n> > index beae0cb98544..0c76fc62af1d 100644\n> > --- a/include/libcamera/internal/buffer.h\n> > +++ b/include/libcamera/internal/framebuffer.h\n> > @@ -2,10 +2,10 @@\n> > /*\n> > * Copyright (C) 2020, Google Inc.\n> > *\n> > - * buffer.h - Internal buffer handling\n> > + * framebuffer.h - Internal frame buffer handling\n> > */\n> > -#ifndef __LIBCAMERA_INTERNAL_BUFFER_H__\n> > -#define __LIBCAMERA_INTERNAL_BUFFER_H__\n> > +#ifndef __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__\n> > +#define __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__\n> >\n> > #include \n> > #include \n> > @@ -13,7 +13,7 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > +#include \n> >\n> > namespace libcamera {\n> >\n> > @@ -49,4 +49,4 @@ public:\n> >\n> > } /* namespace libcamera */\n> >\n> > -#endif /* __LIBCAMERA_INTERNAL_BUFFER_H__ */\n> > +#endif /* __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__ */\n> > diff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h\n> > index 76325b1d109f..519093bd314f 100644\n> > --- a/include/libcamera/internal/ipa_data_serializer.h\n> > +++ b/include/libcamera/internal/ipa_data_serializer.h\n> > @@ -16,8 +16,8 @@\n> >\n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> >\n> > diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\n> > index 16a76ebdf9cc..6d4eb7ed3df6 100644\n> > --- a/include/libcamera/internal/meson.build\n> > +++ b/include/libcamera/internal/meson.build\n> > @@ -11,7 +11,6 @@ libcamera_tracepoint_header = custom_target(\n> >\n> > libcamera_internal_headers = files([\n> > 'bayer_format.h',\n> > - 'buffer.h',\n> > 'byte_stream_buffer.h',\n> > 'camera_controls.h',\n> > 'camera_sensor.h',\n> > @@ -23,6 +22,7 @@ libcamera_internal_headers = files([\n> > 'device_enumerator_sysfs.h',\n> > 'device_enumerator_udev.h',\n> > 'formats.h',\n> > + 'framebuffer.h',\n> > 'ipa_manager.h',\n> > 'ipa_module.h',\n> > 'ipa_proxy.h',\n> > diff --git a/include/libcamera/internal/tracepoints/request.tp b/include/libcamera/internal/tracepoints/request.tp\n> > index 9c841b97438a..37d8c46f4d96 100644\n> > --- a/include/libcamera/internal/tracepoints/request.tp\n> > +++ b/include/libcamera/internal/tracepoints/request.tp\n> > @@ -5,7 +5,7 @@\n> > * request.tp - Tracepoints for the request object\n> > */\n> >\n> > -#include \n> > +#include \n> > #include \n> >\n> > TRACEPOINT_EVENT_CLASS(\n> > diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\n> > index a7c3d5290d92..e767ec84c4da 100644\n> > --- a/include/libcamera/internal/v4l2_videodevice.h\n> > +++ b/include/libcamera/internal/v4l2_videodevice.h\n> > @@ -20,7 +20,7 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > +#include \n> > #include \n> > #include \n> >\n> > diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h\n> > index 9a15c86b16e2..1590584c1fb4 100644\n> > --- a/include/libcamera/ipa/ipa_interface.h\n> > +++ b/include/libcamera/ipa/ipa_interface.h\n> > @@ -15,8 +15,8 @@\n> >\n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> > #include \n> >\n> > namespace libcamera {\n> > diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\n> > index e4d5c655c1e9..5b25ef847ed4 100644\n> > --- a/include/libcamera/meson.build\n> > +++ b/include/libcamera/meson.build\n> > @@ -1,12 +1,12 @@\n> > # SPDX-License-Identifier: CC0-1.0\n> >\n> > libcamera_public_headers = files([\n> > - 'buffer.h',\n> > 'camera.h',\n> > 'camera_manager.h',\n> > 'compiler.h',\n> > 'controls.h',\n> > 'file_descriptor.h',\n> > + 'framebuffer.h',\n> > 'framebuffer_allocator.h',\n> > 'geometry.h',\n> > 'logging.h',\n> > diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h\n> > index bb47c390f8a1..0c55e7164592 100644\n> > --- a/include/libcamera/stream.h\n> > +++ b/include/libcamera/stream.h\n> > @@ -12,7 +12,7 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > +#include \n> > #include \n> > #include \n> >\n> > diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> > index 3361918d4484..32ba15566621 100644\n> > --- a/src/android/camera_device.h\n> > +++ b/src/android/camera_device.h\n> > @@ -18,12 +18,12 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> >\n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > #include \"camera_capabilities.h\"\n> > #include \"camera_metadata.h\"\n> > diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> > index 8ecc6e345414..629d9e00e08d 100644\n> > --- a/src/android/camera_stream.h\n> > +++ b/src/android/camera_stream.h\n> > @@ -13,13 +13,13 @@\n> >\n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> >\n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > class CameraDevice;\n> > class CameraMetadata;\n> > diff --git a/src/android/camera_worker.h b/src/android/camera_worker.h\n> > index 6e1aee4a3247..67ae50bd9288 100644\n> > --- a/src/android/camera_worker.h\n> > +++ b/src/android/camera_worker.h\n> > @@ -12,8 +12,8 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> >\n> > diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\n> > index 28e7f92a3ecb..a28522f41714 100644\n> > --- a/src/android/jpeg/encoder.h\n> > +++ b/src/android/jpeg/encoder.h\n> > @@ -9,7 +9,7 @@\n> >\n> > #include \n> >\n> > -#include \n> > +#include \n> > #include \n> >\n> > class Encoder\n> > diff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\n> > index 838da7728382..14bf89223982 100644\n> > --- a/src/android/jpeg/encoder_libjpeg.h\n> > +++ b/src/android/jpeg/encoder_libjpeg.h\n> > @@ -9,8 +9,8 @@\n> >\n> > #include \"encoder.h\"\n> >\n> > -#include \"libcamera/internal/buffer.h\"\n> > #include \"libcamera/internal/formats.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > #include \n> >\n> > diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> > index 5d2d4ab224b1..5c399be9eb6a 100644\n> > --- a/src/android/jpeg/post_processor_jpeg.h\n> > +++ b/src/android/jpeg/post_processor_jpeg.h\n> > @@ -13,7 +13,7 @@\n> >\n> > #include \n> >\n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > class CameraDevice;\n> >\n> > diff --git a/src/android/jpeg/thumbnailer.h b/src/android/jpeg/thumbnailer.h\n> > index 4e9226c34104..68cbf74329a9 100644\n> > --- a/src/android/jpeg/thumbnailer.h\n> > +++ b/src/android/jpeg/thumbnailer.h\n> > @@ -9,8 +9,8 @@\n> >\n> > #include \n> >\n> > -#include \"libcamera/internal/buffer.h\"\n> > #include \"libcamera/internal/formats.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > class Thumbnailer\n> > {\n> > diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp\n> > index 326fdc066499..166be36efd5b 100644\n> > --- a/src/android/mm/generic_camera_buffer.cpp\n> > +++ b/src/android/mm/generic_camera_buffer.cpp\n> > @@ -11,7 +11,7 @@\n> >\n> > #include \n> >\n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > using namespace libcamera;\n> >\n> > diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> > index 547fda379ed8..689f85d9d3b8 100644\n> > --- a/src/android/post_processor.h\n> > +++ b/src/android/post_processor.h\n> > @@ -7,10 +7,10 @@\n> > #ifndef __ANDROID_POST_PROCESSOR_H__\n> > #define __ANDROID_POST_PROCESSOR_H__\n> >\n> > -#include \n> > +#include \n> > #include \n> >\n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > #include \"camera_buffer.h\"\n> >\n> > diff --git a/src/cam/buffer_writer.h b/src/cam/buffer_writer.h\n> > index 47e26103e13e..604ce8702ec7 100644\n> > --- a/src/cam/buffer_writer.h\n> > +++ b/src/cam/buffer_writer.h\n> > @@ -10,7 +10,7 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > +#include \n> >\n> > class BufferWriter\n> > {\n> > diff --git a/src/cam/capture.h b/src/cam/capture.h\n> > index 59d138766b1e..de478c98e9c1 100644\n> > --- a/src/cam/capture.h\n> > +++ b/src/cam/capture.h\n> > @@ -11,8 +11,8 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> > index f43f862085bb..71698d36e50f 100644\n> > --- a/src/ipa/ipu3/ipu3.cpp\n> > +++ b/src/ipa/ipu3/ipu3.cpp\n> > @@ -13,14 +13,14 @@\n> >\n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > #include \n> >\n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > #include \"ipu3_agc.h\"\n> > #include \"ipu3_awb.h\"\n> > diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> > index 4d09a84f6532..4ae81f352596 100644\n> > --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> > +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> > @@ -18,17 +18,17 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > #include \n> > #include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > #include \n> > #include \n> >\n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > #include \"agc_algorithm.hpp\"\n> > #include \"agc_status.h\"\n> > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> > index cdfb4d139e41..b881d42ea131 100644\n> > --- a/src/ipa/rkisp1/rkisp1.cpp\n> > +++ b/src/ipa/rkisp1/rkisp1.cpp\n> > @@ -17,8 +17,8 @@\n> >\n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > diff --git a/src/libcamera/buffer.cpp b/src/libcamera/framebuffer.cpp\n> > similarity index 97%\n> > rename from src/libcamera/buffer.cpp\n> > rename to src/libcamera/framebuffer.cpp\n> > index e4c345d518da..4bde556c4013 100644\n> > --- a/src/libcamera/buffer.cpp\n> > +++ b/src/libcamera/framebuffer.cpp\n> > @@ -2,11 +2,11 @@\n> > /*\n> > * Copyright (C) 2019, Google Inc.\n> > *\n> > - * buffer.cpp - Buffer handling\n> > + * framebuffer.cpp - Frame buffer handling\n> > */\n> >\n> > -#include \n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > #include \n> > #include \n> > @@ -16,11 +16,11 @@\n> > #include \n> >\n> > /**\n> > - * \\file libcamera/buffer.h\n> > - * \\brief Buffer handling\n> > + * \\file libcamera/framebuffer.h\n> > + * \\brief Frame buffer handling\n> > *\n> > - * \\file libcamera/internal/buffer.h\n> > - * \\brief Internal buffer handling support\n> > + * \\file libcamera/internal/framebuffer.h\n> > + * \\brief Internal frame buffer handling support\n> > */\n> >\n> > namespace libcamera {\n> > diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp\n> > index 86a57923286c..695073fd1c1c 100644\n> > --- a/src/libcamera/framebuffer_allocator.cpp\n> > +++ b/src/libcamera/framebuffer_allocator.cpp\n> > @@ -11,8 +11,8 @@\n> >\n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> > #include \n> >\n> > #include \"libcamera/internal/pipeline_handler.h\"\n> > diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> > index 517e763d40f0..4f08580157f9 100644\n> > --- a/src/libcamera/meson.build\n> > +++ b/src/libcamera/meson.build\n> > @@ -2,7 +2,6 @@\n> >\n> > libcamera_sources = files([\n> > 'bayer_format.cpp',\n> > - 'buffer.cpp',\n> > 'byte_stream_buffer.cpp',\n> > 'camera.cpp',\n> > 'camera_controls.cpp',\n> > @@ -17,6 +16,7 @@ libcamera_sources = files([\n> > 'device_enumerator_sysfs.cpp',\n> > 'file_descriptor.cpp',\n> > 'formats.cpp',\n> > + 'framebuffer.cpp',\n> > 'framebuffer_allocator.cpp',\n> > 'geometry.cpp',\n> > 'ipa_controls.cpp',\n> > diff --git a/src/libcamera/pipeline/ipu3/frames.cpp b/src/libcamera/pipeline/ipu3/frames.cpp\n> > index d9a2249b81ff..ce5ccbf18e41 100644\n> > --- a/src/libcamera/pipeline/ipu3/frames.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/frames.cpp\n> > @@ -7,7 +7,7 @@\n> >\n> > #include \"frames.h\"\n> >\n> > -#include \n> > +#include \n> > #include \n> >\n> > #include \"libcamera/internal/pipeline_handler.h\"\n> > diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > index 082eb1ee1c23..4f1a5985d62f 100644\n> > --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > @@ -30,10 +30,10 @@\n> > #include \n> >\n> > #include \"libcamera/internal/bayer_format.h\"\n> > -#include \"libcamera/internal/buffer.h\"\n> > #include \"libcamera/internal/camera_sensor.h\"\n> > #include \"libcamera/internal/delayed_controls.h\"\n> > #include \"libcamera/internal/device_enumerator.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> > #include \"libcamera/internal/ipa_manager.h\"\n> > #include \"libcamera/internal/media_device.h\"\n> > #include \"libcamera/internal/pipeline_handler.h\"\n> > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > index 00df4f0b3e6b..42911a8fdfdb 100644\n> > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > @@ -17,10 +17,10 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > #include \n> > #include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\n> > index 3baf78f9364c..b5e34c4cd0c5 100644\n> > --- a/src/libcamera/pipeline/simple/converter.cpp\n> > +++ b/src/libcamera/pipeline/simple/converter.cpp\n> > @@ -14,7 +14,7 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > +#include \n> > #include \n> > #include \n> >\n> > diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\n> > index 0ed172dcd750..c9928d444b04 100644\n> > --- a/src/libcamera/pipeline_handler.cpp\n> > +++ b/src/libcamera/pipeline_handler.cpp\n> > @@ -12,9 +12,9 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > #include \n> > #include \n> > +#include \n> >\n> > #include \"libcamera/internal/device_enumerator.h\"\n> > #include \"libcamera/internal/media_device.h\"\n> > diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> > index 518384eb8cf6..5faf3c71ff02 100644\n> > --- a/src/libcamera/request.cpp\n> > +++ b/src/libcamera/request.cpp\n> > @@ -12,9 +12,9 @@\n> >\n> > #include \n> >\n> > -#include \n> > #include \n> > #include \n> > +#include \n> > #include \n> >\n> > #include \"libcamera/internal/camera_controls.h\"\n> > diff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h\n> > index bf44c879aff7..20905f37ab94 100644\n> > --- a/src/qcam/dng_writer.h\n> > +++ b/src/qcam/dng_writer.h\n> > @@ -10,9 +10,9 @@\n> > #ifdef HAVE_TIFF\n> > #define HAVE_DNG\n> >\n> > -#include \n> > #include \n> > #include \n> > +#include \n> > #include \n> >\n> > using namespace libcamera;\n> > diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\n> > index 271314614391..85d56ce49abe 100644\n> > --- a/src/qcam/main_window.h\n> > +++ b/src/qcam/main_window.h\n> > @@ -18,10 +18,10 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > #include \n> > #include \n> > #include \n> > +#include \n> > #include \n> > #include \n> > #include \n> > diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\n> > index e33dc4525224..46747c227d0c 100644\n> > --- a/src/qcam/viewfinder.h\n> > +++ b/src/qcam/viewfinder.h\n> > @@ -11,8 +11,8 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> >\n> > struct MappedBuffer {\n> > void *memory;\n> > diff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\n> > index bce94c87f2fb..4a0f8ca58f29 100644\n> > --- a/src/qcam/viewfinder_gl.h\n> > +++ b/src/qcam/viewfinder_gl.h\n> > @@ -21,8 +21,8 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> >\n> > #include \"viewfinder.h\"\n> >\n> > diff --git a/src/qcam/viewfinder_qt.h b/src/qcam/viewfinder_qt.h\n> > index d755428887c0..501c72a70dec 100644\n> > --- a/src/qcam/viewfinder_qt.h\n> > +++ b/src/qcam/viewfinder_qt.h\n> > @@ -14,8 +14,8 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > #include \n> > +#include \n> > #include \n> >\n> > #include \"format_converter.h\"\n> > diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\n> > index dbe0573bd3a4..a095f4e27524 100644\n> > --- a/src/v4l2/v4l2_camera.h\n> > +++ b/src/v4l2/v4l2_camera.h\n> > @@ -14,9 +14,9 @@\n> >\n> > #include \n> >\n> > -#include \n> > #include \n> > #include \n> > +#include \n> > #include \n> >\n> > using namespace libcamera;\n> > diff --git a/test/mapped-buffer.cpp b/test/mapped-buffer.cpp\n> > index 5de8201e45f6..c9479194cb68 100644\n> > --- a/test/mapped-buffer.cpp\n> > +++ b/test/mapped-buffer.cpp\n> > @@ -9,7 +9,7 @@\n> >\n> > #include \n> >\n> > -#include \"libcamera/internal/buffer.h\"\n> > +#include \"libcamera/internal/framebuffer.h\"\n> >\n> > #include \"camera_test.h\"\n> > #include \"test.h\"\n> > diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h\n> > index 00c6399d3b8a..e981abf79225 100644\n> > --- a/test/v4l2_subdevice/v4l2_subdevice_test.h\n> > +++ b/test/v4l2_subdevice/v4l2_subdevice_test.h\n> > @@ -8,7 +8,7 @@\n> > #ifndef __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__\n> > #define __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__\n> >\n> > -#include \n> > +#include \n> >\n> > #include \"libcamera/internal/device_enumerator.h\"\n> > #include \"libcamera/internal/media_device.h\"\n> > diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp\n> > index 91b3e4a0dad6..6af96a983cd0 100644\n> > --- a/test/v4l2_videodevice/buffer_sharing.cpp\n> > +++ b/test/v4l2_videodevice/buffer_sharing.cpp\n> > @@ -12,7 +12,7 @@\n> >\n> > #include \n> >\n> > -#include \n> > +#include \n> >\n> > #include \n> > #include \n> > diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp\n> > index f12c8bef97f6..805cb610296f 100644\n> > --- a/test/v4l2_videodevice/capture_async.cpp\n> > +++ b/test/v4l2_videodevice/capture_async.cpp\n> > @@ -7,7 +7,7 @@\n> >\n> > #include \n> >\n> > -#include \n> > +#include \n> >\n> > #include \n> > #include \n> > diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> > index fe4b3cc6487f..ebf3e245f86b 100644\n> > --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> > +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\n> > @@ -7,7 +7,7 @@\n> >\n> > #include \n> >\n> > -#include \n> > +#include \n> >\n> > #include \n> > #include \n> > diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.h b/test/v4l2_videodevice/v4l2_videodevice_test.h\n> > index 21054561e068..d46540d4861e 100644\n> > --- a/test/v4l2_videodevice/v4l2_videodevice_test.h\n> > +++ b/test/v4l2_videodevice/v4l2_videodevice_test.h\n> > @@ -9,7 +9,7 @@\n> >\n> > #include \n> >\n> > -#include \n> > +#include \n> >\n> > #include \"libcamera/internal/camera_sensor.h\"\n> > #include \"libcamera/internal/device_enumerator.h\"\n> > --\n> > Regards,\n> >\n> > Laurent Pinchart\n> >","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 41DC5BD794\n\tfor ;\n\tWed, 7 Jul 2021 08:25:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EDD7968507;\n\tWed, 7 Jul 2021 10:25:43 +0200 (CEST)","from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com\n\t[IPv6:2a00:1450:4864:20::52d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 57346684E6\n\tfor ;\n\tWed, 7 Jul 2021 10:25:42 +0200 (CEST)","by mail-ed1-x52d.google.com with SMTP id k17so2315492edq.2\n\tfor ;\n\tWed, 07 Jul 2021 01:25:42 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"mqBcV84B\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=X92AJnS6cdG4dFOiz+0t/JPMbePzXYTon0og4fh+NKU=;\n\tb=mqBcV84BGdeEWDOEL3NVqB0SeqJDZvqrEhPmk/eWkPavlPPYvoF9ThShUmBgVbi6NK\n\tHbhvHUp9fdlXc8SOC7XzlfyX+SA3XMHu7QbElmxW8A5UUxhRy1HTC6JI3qnPIJrPR9kc\n\tmcCkJ9ATpVnOfHeSwwoPmyvKWU+43DrS/twvY=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=X92AJnS6cdG4dFOiz+0t/JPMbePzXYTon0og4fh+NKU=;\n\tb=L7wtcLPzB/tFa0UjfYr/bibzdpSAkRM9GBYx3NJnphIMFKW/XviRhpSKSftzy+SMCJ\n\t1a7DqCYEl9kgbU+d9qbDnnsLfuj99KRgJ8FVbteTnBkJllzu/aFFTbRcnULCa3Bsaw0W\n\tLGVF9gi8s1QikhqMr/qZlPQO0T7Bsw7HD2NfL+QrKhba6ffJCTtz0PYEu9eUgW+Ggl0Q\n\tRsjmiibJCnIUBMLmVeq1hUJvwR1oLY04s0sgyN7u2Ooc/wr8n/a9jEM9jv/l9WKq1vce\n\tWHgmIIg6VJS3x5NU2e0ycIoRy3+jjZIvWa/BIO6EVEOIkJriMm41/qT3/i6C1trjdYwO\n\terHQ==","X-Gm-Message-State":"AOAM53311t+STtI6HqIv7zfaiIaa5pckSj1zcmTIh68gTxmj2oxVH+Ag\n\teV8HGpRfxUab7g341S3bor2CCXr9XrKgaew6P1WbwQ==","X-Google-Smtp-Source":"ABdhPJwY3IKFYpTN9xPAcRE5wVG2znVQsvFOq0fnCqbGaPEct/c/JiUctU9nXBl0Py46A89Zx5veBB1P4Vxvq9fxdos=","X-Received":"by 2002:a05:6402:4249:: with SMTP id\n\tg9mr7373196edb.73.1625646341849; \n\tWed, 07 Jul 2021 01:25:41 -0700 (PDT)","MIME-Version":"1.0","References":"<20210704232817.8205-1-laurent.pinchart@ideasonboard.com>\n\t<20210704232817.8205-3-laurent.pinchart@ideasonboard.com>\n\t<20210705103035.n7vvdmfafklm5i7s@uno.localdomain>","In-Reply-To":"<20210705103035.n7vvdmfafklm5i7s@uno.localdomain>","From":"Hirokazu Honda ","Date":"Wed, 7 Jul 2021 17:25:30 +0900","Message-ID":"","To":"Jacopo Mondi ","Content-Type":"text/plain; charset=\"UTF-8\"","Subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename\n\tbuffer.h to framebuffer.h","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera devel ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":18005,"web_url":"https://patchwork.libcamera.org/comment/18005/","msgid":"","date":"2021-07-07T09:03:08","subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename\n\tbuffer.h to framebuffer.h","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 05/07/2021 11:22, Laurent Pinchart wrote:\n\n>>> rename include/libcamera/{buffer.h => framebuffer.h} (89%)\n>>> rename include/libcamera/internal/{buffer.h => framebuffer.h} (78%)\n>>\n>> Are you sure you want to name it framebuffer.h for the internal header \n>> also? I get the impression that the patch attempts to eliminates the \n>> exception, filename vs class-name mismatch, but the internal header with \n>> this change, will still be an exception. Why shouldn't we be leaning \n>> towards\n>>\n>>  rename include/libcamera/internal/{buffer.h => mappedbuffer.h} (78%) ?\n> \n> That's a good point. Note however how patch 3/3 adds the\n> FrameBuffer::Private class to internal/framebuffer.h. The MappedBuffer\n> class is hijacking framebuffer.h a little bit, maybe it should be split\n> into a separate header. It has been added to buffer.h out of simplicity,\n> and we have other headers that have a main purpose and also carry\n> auxiliary classes.\n\nI would have said all the more reason to rename this to mappedbuffer.h\ndirectly here, (as that's all it contains) - and re-introduce\nframebuffer.h in 3/3.\n\nBut ... I won't object to either route, if this is done on top so\n\nReviewed-by: Kieran Bingham \n\n\n> In any case, I think this should be addressed in a separate patch if we\n> decide to go that route.\n\nSplitting MappedBuffers out sounds like a sensible thing to do though,\nespecially given they are considered to be a helper 'on top' of our\nBuffer API (yet only used internally here).\n\n>> Other than that, patch looks good to me,\n>>\n>> Reviewed-by: Umang Jain \n\nUmnag, As you've already essentially done exactly this for the IPA -\nwould you be happy to submit a patch to clean this up on top of\nLaurent's series, if it doesn't get updated here?\n\n--\nKieran","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id A7D4EC3224\n\tfor ;\n\tWed, 7 Jul 2021 09:03:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 14CF568505;\n\tWed, 7 Jul 2021 11:03:12 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 17DCF684E6\n\tfor ;\n\tWed, 7 Jul 2021 11:03:11 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 878E82E4;\n\tWed, 7 Jul 2021 11:03:10 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"hW9bqzc4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625648590;\n\tbh=HcTyKX9xbYsKbXgBlMlXy6oTBdgjwsaV0xHbmwKzUSc=;\n\th=To:Cc:References:From:Subject:Date:In-Reply-To:From;\n\tb=hW9bqzc4cSs2A3VMraMs10QSYcj1q/pxvbhVqZLXl3lNMx6peKwHceB7//voxviX8\n\tNCV54jd/5xqH1lUjNPqKtsUYV9fCERBm+NDDZcBYNsA57lbFtdQWUjZfVBn80FIgOM\n\t1kw10Zk/1432SEbXAxregZVbdQXQPYJm6zY7+prI=","To":"Laurent Pinchart ,\n\tUmang Jain ","References":"<20210704232817.8205-1-laurent.pinchart@ideasonboard.com>\n\t<20210704232817.8205-3-laurent.pinchart@ideasonboard.com>\n\t\n\t","From":"Kieran Bingham ","Message-ID":"","Date":"Wed, 7 Jul 2021 10:03:08 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename\n\tbuffer.h to framebuffer.h","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]