From 6a31a8d8e2742990f3b3a3dbf5157a9e1cb835ea Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon, 28 Jun 2021 01:54:17 +0300
Subject: libcamera: buffer: Rename buffer.h to framebuffer.h

libcamera names header files based on the classes they define. The
buffer.h file is an exception. Rename it to framebuffer.h.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/android/camera_device.h              | 4 ++--
 src/android/camera_stream.h              | 4 ++--
 src/android/camera_worker.h              | 2 +-
 src/android/jpeg/encoder.h               | 2 +-
 src/android/jpeg/encoder_libjpeg.h       | 2 +-
 src/android/jpeg/post_processor_jpeg.h   | 2 +-
 src/android/jpeg/thumbnailer.h           | 2 +-
 src/android/mm/generic_camera_buffer.cpp | 2 +-
 src/android/post_processor.h             | 4 ++--
 9 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/android')

diff --git a/src/android/camera_device.h b/src/android/camera_device.h
index d085a27f..089a6204 100644
--- a/src/android/camera_device.h
+++ b/src/android/camera_device.h
@@ -19,12 +19,12 @@
 #include <libcamera/base/message.h>
 #include <libcamera/base/thread.h>
 
-#include <libcamera/buffer.h>
 #include <libcamera/camera.h>
+#include <libcamera/framebuffer.h>
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
 
-#include "libcamera/internal/buffer.h"
+#include "libcamera/internal/framebuffer.h"
 
 #include "camera_capabilities.h"
 #include "camera_metadata.h"
diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h
index 8ecc6e34..629d9e00 100644
--- a/src/android/camera_stream.h
+++ b/src/android/camera_stream.h
@@ -13,13 +13,13 @@
 
 #include <hardware/camera3.h>
 
-#include <libcamera/buffer.h>
 #include <libcamera/camera.h>
+#include <libcamera/framebuffer.h>
 #include <libcamera/framebuffer_allocator.h>
 #include <libcamera/geometry.h>
 #include <libcamera/pixel_format.h>
 
-#include "libcamera/internal/buffer.h"
+#include "libcamera/internal/framebuffer.h"
 
 class CameraDevice;
 class CameraMetadata;
diff --git a/src/android/camera_worker.h b/src/android/camera_worker.h
index 6e1aee4a..67ae50bd 100644
--- a/src/android/camera_worker.h
+++ b/src/android/camera_worker.h
@@ -12,8 +12,8 @@
 #include <libcamera/base/object.h>
 #include <libcamera/base/thread.h>
 
-#include <libcamera/buffer.h>
 #include <libcamera/camera.h>
+#include <libcamera/framebuffer.h>
 #include <libcamera/request.h>
 #include <libcamera/stream.h>
 
diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h
index 28e7f92a..a28522f4 100644
--- a/src/android/jpeg/encoder.h
+++ b/src/android/jpeg/encoder.h
@@ -9,7 +9,7 @@
 
 #include <libcamera/base/span.h>
 
-#include <libcamera/buffer.h>
+#include <libcamera/framebuffer.h>
 #include <libcamera/stream.h>
 
 class Encoder
diff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h
index 838da772..14bf8922 100644
--- a/src/android/jpeg/encoder_libjpeg.h
+++ b/src/android/jpeg/encoder_libjpeg.h
@@ -9,8 +9,8 @@
 
 #include "encoder.h"
 
-#include "libcamera/internal/buffer.h"
 #include "libcamera/internal/formats.h"
+#include "libcamera/internal/framebuffer.h"
 
 #include <jpeglib.h>
 
diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h
index 5d2d4ab2..5c399be9 100644
--- a/src/android/jpeg/post_processor_jpeg.h
+++ b/src/android/jpeg/post_processor_jpeg.h
@@ -13,7 +13,7 @@
 
 #include <libcamera/geometry.h>
 
-#include "libcamera/internal/buffer.h"
+#include "libcamera/internal/framebuffer.h"
 
 class CameraDevice;
 
diff --git a/src/android/jpeg/thumbnailer.h b/src/android/jpeg/thumbnailer.h
index 4e9226c3..68cbf743 100644
--- a/src/android/jpeg/thumbnailer.h
+++ b/src/android/jpeg/thumbnailer.h
@@ -9,8 +9,8 @@
 
 #include <libcamera/geometry.h>
 
-#include "libcamera/internal/buffer.h"
 #include "libcamera/internal/formats.h"
+#include "libcamera/internal/framebuffer.h"
 
 class Thumbnailer
 {
diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp
index 326fdc06..166be36e 100644
--- a/src/android/mm/generic_camera_buffer.cpp
+++ b/src/android/mm/generic_camera_buffer.cpp
@@ -11,7 +11,7 @@
 
 #include <libcamera/base/log.h>
 
-#include "libcamera/internal/buffer.h"
+#include "libcamera/internal/framebuffer.h"
 
 using namespace libcamera;
 
diff --git a/src/android/post_processor.h b/src/android/post_processor.h
index 547fda37..689f85d9 100644
--- a/src/android/post_processor.h
+++ b/src/android/post_processor.h
@@ -7,10 +7,10 @@
 #ifndef __ANDROID_POST_PROCESSOR_H__
 #define __ANDROID_POST_PROCESSOR_H__
 
-#include <libcamera/buffer.h>
+#include <libcamera/framebuffer.h>
 #include <libcamera/stream.h>
 
-#include "libcamera/internal/buffer.h"
+#include "libcamera/internal/framebuffer.h"
 
 #include "camera_buffer.h"
 
-- 
cgit v1.2.1