Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 12804,
    "url": "https://patchwork.libcamera.org/api/1.1/patches/12804/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/12804/",
    "project": {
        "id": 1,
        "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api",
        "name": "libcamera",
        "link_name": "libcamera",
        "list_id": "libcamera_core",
        "list_email": "libcamera-devel@lists.libcamera.org",
        "web_url": "",
        "scm_url": "",
        "webscm_url": ""
    },
    "msgid": "<20210704232817.8205-3-laurent.pinchart@ideasonboard.com>",
    "date": "2021-07-04T23:28:16",
    "name": "[libcamera-devel,2/3] libcamera: buffer: Rename buffer.h to framebuffer.h",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "3250e25387a1240e78650dc0967bfa4deb970283",
    "submitter": {
        "id": 2,
        "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api",
        "name": "Laurent Pinchart",
        "email": "laurent.pinchart@ideasonboard.com"
    },
    "delegate": {
        "id": 14,
        "url": "https://patchwork.libcamera.org/api/1.1/users/14/?format=api",
        "username": "pinchartl",
        "first_name": "Laurent",
        "last_name": "Pinchart",
        "email": "laurent.pinchart@ideasonboard.com"
    },
    "mbox": "https://patchwork.libcamera.org/patch/12804/mbox/",
    "series": [
        {
            "id": 2206,
            "url": "https://patchwork.libcamera.org/api/1.1/series/2206/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2206",
            "date": "2021-07-04T23:28:14",
            "name": "libcamera: Make Framebuffer class Extensible",
            "version": 1,
            "mbox": "https://patchwork.libcamera.org/series/2206/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/12804/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/12804/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>",
        "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 1FD1EC0100\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun,  4 Jul 2021 23:29:06 +0000 (UTC)",
            "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 28A8F68511;\n\tMon,  5 Jul 2021 01:29:05 +0200 (CEST)",
            "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A480D60285\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  5 Jul 2021 01:29:02 +0200 (CEST)",
            "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3246DE7;\n\tMon,  5 Jul 2021 01:29:02 +0200 (CEST)"
        ],
        "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"PejG+U6C\"; dkim-atps=neutral",
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625441342;\n\tbh=1Kd2NE0xjyPuFgEmbj4m+e80O33xGH4ELyB+2v2jWVE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=PejG+U6CkoJEF5fbMXdGu5Ci3eEbWasB66Pk1Bg+kSEvyzc2m4bFqrHIXBRSJvagG\n\t6zA5BIC/OJ9nyR9XJ4v5oueGSeikk2YTCbqAAgeAlChwv5O7ALHizlXDduhvjLxnl7\n\tHVBzzwZ61Z63MzYhUBsEHKPRwVA1fXl298/Xv1GA=",
        "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Mon,  5 Jul 2021 02:28:16 +0300",
        "Message-Id": "<20210704232817.8205-3-laurent.pinchart@ideasonboard.com>",
        "X-Mailer": "git-send-email 2.31.1",
        "In-Reply-To": "<20210704232817.8205-1-laurent.pinchart@ideasonboard.com>",
        "References": "<20210704232817.8205-1-laurent.pinchart@ideasonboard.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH 2/3] libcamera: buffer: Rename buffer.h to\n\tframebuffer.h",
        "X-BeenThere": "libcamera-devel@lists.libcamera.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "<libcamera-devel.lists.libcamera.org>",
        "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>",
        "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>",
        "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>",
        "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>",
        "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>",
        "Errors-To": "libcamera-devel-bounces@lists.libcamera.org",
        "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"
    },
    "content": "libcamera names header files based on the classes they define. The\nbuffer.h file is an exception. Rename it to framebuffer.h.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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%)",
    "diff": "diff --git a/include/libcamera/buffer.h b/include/libcamera/framebuffer.h\nsimilarity index 89%\nrename from include/libcamera/buffer.h\nrename to include/libcamera/framebuffer.h\nindex 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 <stdint.h>\n #include <vector>\n@@ -71,4 +71,4 @@ private:\n \n } /* namespace libcamera */\n \n-#endif /* __LIBCAMERA_BUFFER_H__ */\n+#endif /* __LIBCAMERA_FRAMEBUFFER_H__ */\ndiff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/framebuffer.h\nsimilarity index 78%\nrename from include/libcamera/internal/buffer.h\nrename to include/libcamera/internal/framebuffer.h\nindex 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 <sys/mman.h>\n #include <vector>\n@@ -13,7 +13,7 @@\n #include <libcamera/base/class.h>\n #include <libcamera/base/span.h>\n \n-#include <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\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__ */\ndiff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h\nindex 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 <libcamera/base/log.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/control_ids.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/geometry.h>\n #include <libcamera/ipa/ipa_interface.h>\n \ndiff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex 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',\ndiff --git a/include/libcamera/internal/tracepoints/request.tp b/include/libcamera/internal/tracepoints/request.tp\nindex 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 <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/request.h>\n \n TRACEPOINT_EVENT_CLASS(\ndiff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\nindex 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 <libcamera/base/log.h>\n #include <libcamera/base/signal.h>\n \n-#include <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/geometry.h>\n #include <libcamera/pixel_format.h>\n \ndiff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h\nindex 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 <libcamera/base/signal.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/controls.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/geometry.h>\n \n namespace libcamera {\ndiff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex 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',\ndiff --git a/include/libcamera/stream.h b/include/libcamera/stream.h\nindex bb47c390f8a1..0c55e7164592 100644\n--- a/include/libcamera/stream.h\n+++ b/include/libcamera/stream.h\n@@ -12,7 +12,7 @@\n #include <string>\n #include <vector>\n \n-#include <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/geometry.h>\n #include <libcamera/pixel_format.h>\n \ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 3361918d4484..32ba15566621 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -18,12 +18,12 @@\n #include <libcamera/base/message.h>\n #include <libcamera/base/thread.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n-#include \"libcamera/internal/buffer.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n \n #include \"camera_capabilities.h\"\n #include \"camera_metadata.h\"\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex 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 <hardware/camera3.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/framebuffer_allocator.h>\n #include <libcamera/geometry.h>\n #include <libcamera/pixel_format.h>\n \n-#include \"libcamera/internal/buffer.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n \n class CameraDevice;\n class CameraMetadata;\ndiff --git a/src/android/camera_worker.h b/src/android/camera_worker.h\nindex 6e1aee4a3247..67ae50bd9288 100644\n--- a/src/android/camera_worker.h\n+++ b/src/android/camera_worker.h\n@@ -12,8 +12,8 @@\n #include <libcamera/base/object.h>\n #include <libcamera/base/thread.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \ndiff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\nindex 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 <libcamera/base/span.h>\n \n-#include <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/stream.h>\n \n class Encoder\ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 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 <jpeglib.h>\n \ndiff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\nindex 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 <libcamera/geometry.h>\n \n-#include \"libcamera/internal/buffer.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n \n class CameraDevice;\n \ndiff --git a/src/android/jpeg/thumbnailer.h b/src/android/jpeg/thumbnailer.h\nindex 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 <libcamera/geometry.h>\n \n-#include \"libcamera/internal/buffer.h\"\n #include \"libcamera/internal/formats.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n \n class Thumbnailer\n {\ndiff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp\nindex 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 <libcamera/base/log.h>\n \n-#include \"libcamera/internal/buffer.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n \n using namespace libcamera;\n \ndiff --git a/src/android/post_processor.h b/src/android/post_processor.h\nindex 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 <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/stream.h>\n \n-#include \"libcamera/internal/buffer.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n \n #include \"camera_buffer.h\"\n \ndiff --git a/src/cam/buffer_writer.h b/src/cam/buffer_writer.h\nindex 47e26103e13e..604ce8702ec7 100644\n--- a/src/cam/buffer_writer.h\n+++ b/src/cam/buffer_writer.h\n@@ -10,7 +10,7 @@\n #include <map>\n #include <string>\n \n-#include <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n \n class BufferWriter\n {\ndiff --git a/src/cam/capture.h b/src/cam/capture.h\nindex 59d138766b1e..de478c98e9c1 100644\n--- a/src/cam/capture.h\n+++ b/src/cam/capture.h\n@@ -11,8 +11,8 @@\n #include <stdint.h>\n #include <vector>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/framebuffer_allocator.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 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 <libcamera/base/log.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/control_ids.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/ipa/ipa_interface.h>\n #include <libcamera/ipa/ipa_module_info.h>\n #include <libcamera/ipa/ipu3_ipa_interface.h>\n #include <libcamera/request.h>\n \n-#include \"libcamera/internal/buffer.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n \n #include \"ipu3_agc.h\"\n #include \"ipu3_awb.h\"\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 4d09a84f6532..4ae81f352596 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -18,17 +18,17 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/span.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/control_ids.h>\n #include <libcamera/controls.h>\n #include <libcamera/file_descriptor.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/ipa/ipa_interface.h>\n #include <libcamera/ipa/ipa_module_info.h>\n #include <libcamera/ipa/raspberrypi.h>\n #include <libcamera/ipa/raspberrypi_ipa_interface.h>\n #include <libcamera/request.h>\n \n-#include \"libcamera/internal/buffer.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n \n #include \"agc_algorithm.hpp\"\n #include \"agc_status.h\"\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 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 <libcamera/base/log.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/control_ids.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/ipa/ipa_interface.h>\n #include <libcamera/ipa/ipa_module_info.h>\n #include <libcamera/ipa/rkisp1_ipa_interface.h>\ndiff --git a/src/libcamera/buffer.cpp b/src/libcamera/framebuffer.cpp\nsimilarity index 97%\nrename from src/libcamera/buffer.cpp\nrename to src/libcamera/framebuffer.cpp\nindex 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 <libcamera/buffer.h>\n-#include \"libcamera/internal/buffer.h\"\n+#include <libcamera/framebuffer.h>\n+#include \"libcamera/internal/framebuffer.h\"\n \n #include <errno.h>\n #include <string.h>\n@@ -16,11 +16,11 @@\n #include <libcamera/base/log.h>\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 {\ndiff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp\nindex 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 <libcamera/base/log.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/stream.h>\n \n #include \"libcamera/internal/pipeline_handler.h\"\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 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',\ndiff --git a/src/libcamera/pipeline/ipu3/frames.cpp b/src/libcamera/pipeline/ipu3/frames.cpp\nindex 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 <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/request.h>\n \n #include \"libcamera/internal/pipeline_handler.h\"\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 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 <linux/videodev2.h>\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\"\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 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 <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n #include <libcamera/control_ids.h>\n #include <libcamera/formats.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/ipa/core_ipa_interface.h>\n #include <libcamera/ipa/rkisp1_ipa_interface.h>\n #include <libcamera/ipa/rkisp1_ipa_proxy.h>\ndiff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\nindex 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 <libcamera/base/signal.h>\n #include <libcamera/base/utils.h>\n \n-#include <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/geometry.h>\n #include <libcamera/stream.h>\n \ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 0ed172dcd750..c9928d444b04 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -12,9 +12,9 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n #include <libcamera/camera_manager.h>\n+#include <libcamera/framebuffer.h>\n \n #include \"libcamera/internal/device_enumerator.h\"\n #include \"libcamera/internal/media_device.h\"\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex 518384eb8cf6..5faf3c71ff02 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -12,9 +12,9 @@\n \n #include <libcamera/base/log.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n #include <libcamera/control_ids.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/stream.h>\n \n #include \"libcamera/internal/camera_controls.h\"\ndiff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h\nindex 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 <libcamera/buffer.h>\n #include <libcamera/camera.h>\n #include <libcamera/controls.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/stream.h>\n \n using namespace libcamera;\ndiff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\nindex 271314614391..85d56ce49abe 100644\n--- a/src/qcam/main_window.h\n+++ b/src/qcam/main_window.h\n@@ -18,10 +18,10 @@\n #include <QQueue>\n #include <QTimer>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n #include <libcamera/camera_manager.h>\n #include <libcamera/controls.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/framebuffer_allocator.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\ndiff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\nindex e33dc4525224..46747c227d0c 100644\n--- a/src/qcam/viewfinder.h\n+++ b/src/qcam/viewfinder.h\n@@ -11,8 +11,8 @@\n #include <QList>\n #include <QSize>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/formats.h>\n+#include <libcamera/framebuffer.h>\n \n struct MappedBuffer {\n \tvoid *memory;\ndiff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\nindex bce94c87f2fb..4a0f8ca58f29 100644\n--- a/src/qcam/viewfinder_gl.h\n+++ b/src/qcam/viewfinder_gl.h\n@@ -21,8 +21,8 @@\n #include <QOpenGLWidget>\n #include <QSize>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/formats.h>\n+#include <libcamera/framebuffer.h>\n \n #include \"viewfinder.h\"\n \ndiff --git a/src/qcam/viewfinder_qt.h b/src/qcam/viewfinder_qt.h\nindex d755428887c0..501c72a70dec 100644\n--- a/src/qcam/viewfinder_qt.h\n+++ b/src/qcam/viewfinder_qt.h\n@@ -14,8 +14,8 @@\n #include <QSize>\n #include <QWidget>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/formats.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/pixel_format.h>\n \n #include \"format_converter.h\"\ndiff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex 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 <libcamera/base/semaphore.h>\n \n-#include <libcamera/buffer.h>\n #include <libcamera/camera.h>\n #include <libcamera/file_descriptor.h>\n+#include <libcamera/framebuffer.h>\n #include <libcamera/framebuffer_allocator.h>\n \n using namespace libcamera;\ndiff --git a/test/mapped-buffer.cpp b/test/mapped-buffer.cpp\nindex 5de8201e45f6..c9479194cb68 100644\n--- a/test/mapped-buffer.cpp\n+++ b/test/mapped-buffer.cpp\n@@ -9,7 +9,7 @@\n \n #include <libcamera/framebuffer_allocator.h>\n \n-#include \"libcamera/internal/buffer.h\"\n+#include \"libcamera/internal/framebuffer.h\"\n \n #include \"camera_test.h\"\n #include \"test.h\"\ndiff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h\nindex 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 <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n \n #include \"libcamera/internal/device_enumerator.h\"\n #include \"libcamera/internal/media_device.h\"\ndiff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp\nindex 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 <iostream>\n \n-#include <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n \n #include <libcamera/base/event_dispatcher.h>\n #include <libcamera/base/thread.h>\ndiff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp\nindex 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 <iostream>\n \n-#include <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n \n #include <libcamera/base/event_dispatcher.h>\n #include <libcamera/base/thread.h>\ndiff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp\nindex 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 <iostream>\n \n-#include <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n \n #include <libcamera/base/event_dispatcher.h>\n #include <libcamera/base/thread.h>\ndiff --git a/test/v4l2_videodevice/v4l2_videodevice_test.h b/test/v4l2_videodevice/v4l2_videodevice_test.h\nindex 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 <memory>\n \n-#include <libcamera/buffer.h>\n+#include <libcamera/framebuffer.h>\n \n #include \"libcamera/internal/camera_sensor.h\"\n #include \"libcamera/internal/device_enumerator.h\"\n",
    "prefixes": [
        "libcamera-devel",
        "2/3"
    ]
}