From patchwork Fri Jun 25 01:35:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 12705 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 9C1F4C321D for ; Fri, 25 Jun 2021 01:35:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 33229684D9; Fri, 25 Jun 2021 03:35:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="jX1Q/kBJ"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E12AD684E1 for ; Fri, 25 Jun 2021 03:35:48 +0200 (CEST) Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6908B501; Fri, 25 Jun 2021 03:35:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1624584948; bh=CdHc6GNycnTYQ4HZ4mSmvt80jfXl+YeEw74z0RMD9Ro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jX1Q/kBJa47xQrfUryaUFnH8T04+ikw43l+o/9MmguSJxiMju2KdeBaAWba3HyJqB cW33M0gJgQRTGA1lIi3qUp0bbrf95MS9zzqD+MDrFn6Ug0umM7ZPUYbzHrWx86Le14 kUnFnC95xi2cBMFYqyVTpoqNvwX7k5ZL8gGwfUN0= From: Kieran Bingham To: libcamera devel Date: Fri, 25 Jun 2021 02:35:36 +0100 Message-Id: <20210625013539.625803-14-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210625013539.625803-1-kieran.bingham@ideasonboard.com> References: <20210625013539.625803-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 13/16] libcamera/base: Move span to base library X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Move span, and adjust the Doxygen exlusion as well. Signed-off-by: Kieran Bingham Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart Reviewed-by: Hirokazu Honda --- Documentation/Doxyfile.in | 2 +- include/libcamera/base/file.h | 3 +-- include/libcamera/base/meson.build | 1 + include/libcamera/{ => base}/span.h | 0 include/libcamera/controls.h | 2 +- include/libcamera/internal/buffer.h | 2 +- include/libcamera/internal/byte_stream_buffer.h | 3 +-- include/libcamera/internal/pub_key.h | 2 +- include/libcamera/internal/v4l2_device.h | 2 +- include/libcamera/meson.build | 1 - src/android/camera_buffer.h | 3 +-- src/android/jpeg/encoder.h | 3 ++- src/android/jpeg/exif.h | 3 ++- src/ipa/libipa/histogram.h | 2 +- src/ipa/raspberrypi/cam_helper.hpp | 3 +-- src/ipa/raspberrypi/md_parser.hpp | 2 +- src/ipa/raspberrypi/raspberrypi.cpp | 2 +- src/libcamera/control_serializer.cpp | 2 +- src/libcamera/ipa_module.cpp | 3 +-- src/libcamera/pipeline/rkisp1/rkisp1_path.h | 2 +- test/span.cpp | 2 +- test/utils.cpp | 6 +++--- 22 files changed, 24 insertions(+), 27 deletions(-) rename include/libcamera/{ => base}/span.h (100%) diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in index 8305f56af7a8..a79d37706faf 100644 --- a/Documentation/Doxyfile.in +++ b/Documentation/Doxyfile.in @@ -834,7 +834,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = @TOP_SRCDIR@/include/libcamera/span.h \ +EXCLUDE = @TOP_SRCDIR@/include/libcamera/base/span.h \ @TOP_SRCDIR@/include/libcamera/internal/device_enumerator_sysfs.h \ @TOP_SRCDIR@/include/libcamera/internal/device_enumerator_udev.h \ @TOP_SRCDIR@/include/libcamera/internal/ipc_pipe_unixsocket.h \ diff --git a/include/libcamera/base/file.h b/include/libcamera/base/file.h index cecbb254591f..c3c7ca6013a8 100644 --- a/include/libcamera/base/file.h +++ b/include/libcamera/base/file.h @@ -13,8 +13,7 @@ #include #include - -#include +#include namespace libcamera { diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build index aaac324d7149..7c499b558fb0 100644 --- a/include/libcamera/base/meson.build +++ b/include/libcamera/base/meson.build @@ -15,6 +15,7 @@ libcamera_base_headers = files([ 'private.h', 'semaphore.h', 'signal.h', + 'span.h', 'thread.h', 'timer.h', 'utils.h', diff --git a/include/libcamera/span.h b/include/libcamera/base/span.h similarity index 100% rename from include/libcamera/span.h rename to include/libcamera/base/span.h diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index f62b6cf055d6..1bc958a43b22 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -15,9 +15,9 @@ #include #include +#include #include -#include namespace libcamera { diff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/buffer.h index 91dd24969385..beae0cb98544 100644 --- a/include/libcamera/internal/buffer.h +++ b/include/libcamera/internal/buffer.h @@ -11,9 +11,9 @@ #include #include +#include #include -#include namespace libcamera { diff --git a/include/libcamera/internal/byte_stream_buffer.h b/include/libcamera/internal/byte_stream_buffer.h index 7eefb1a71f07..d0f0df5ee87b 100644 --- a/include/libcamera/internal/byte_stream_buffer.h +++ b/include/libcamera/internal/byte_stream_buffer.h @@ -12,8 +12,7 @@ #include #include - -#include +#include namespace libcamera { diff --git a/include/libcamera/internal/pub_key.h b/include/libcamera/internal/pub_key.h index f5f988b58f74..9261c9c2a0ee 100644 --- a/include/libcamera/internal/pub_key.h +++ b/include/libcamera/internal/pub_key.h @@ -9,7 +9,7 @@ #include -#include +#include #if HAVE_GNUTLS struct gnutls_pubkey_st; diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h index 1edd664a9aef..77b835b3cb80 100644 --- a/include/libcamera/internal/v4l2_device.h +++ b/include/libcamera/internal/v4l2_device.h @@ -15,9 +15,9 @@ #include #include +#include #include -#include namespace libcamera { diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index d08bb3096aff..9a120d13346e 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -12,7 +12,6 @@ libcamera_public_headers = files([ 'logging.h', 'pixel_format.h', 'request.h', - 'span.h', 'stream.h', 'transform.h', ]) diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h index e850c4e36668..2617ff6b11a1 100644 --- a/src/android/camera_buffer.h +++ b/src/android/camera_buffer.h @@ -10,8 +10,7 @@ #include #include - -#include +#include class CameraBuffer final : public libcamera::Extensible { diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h index 8d449369869f..28e7f92a3ecb 100644 --- a/src/android/jpeg/encoder.h +++ b/src/android/jpeg/encoder.h @@ -7,8 +7,9 @@ #ifndef __ANDROID_JPEG_ENCODER_H__ #define __ANDROID_JPEG_ENCODER_H__ +#include + #include -#include #include class Encoder diff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h index 8aa1b123a737..23b0e0974459 100644 --- a/src/android/jpeg/exif.h +++ b/src/android/jpeg/exif.h @@ -13,8 +13,9 @@ #include +#include + #include -#include class Exif { diff --git a/src/ipa/libipa/histogram.h b/src/ipa/libipa/histogram.h index e06f1884395e..c2761cb29e7a 100644 --- a/src/ipa/libipa/histogram.h +++ b/src/ipa/libipa/histogram.h @@ -13,7 +13,7 @@ #include -#include +#include namespace libcamera { diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp index a66648197140..b19c95f67453 100644 --- a/src/ipa/raspberrypi/cam_helper.hpp +++ b/src/ipa/raspberrypi/cam_helper.hpp @@ -8,8 +8,7 @@ #include -#include - +#include #include #include "camera_mode.h" diff --git a/src/ipa/raspberrypi/md_parser.hpp b/src/ipa/raspberrypi/md_parser.hpp index 65aab02d51b6..8497216f8db7 100644 --- a/src/ipa/raspberrypi/md_parser.hpp +++ b/src/ipa/raspberrypi/md_parser.hpp @@ -8,7 +8,7 @@ #include -#include +#include /* * Camera metadata parser class. Usage as shown below. diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index a3f014495e80..4d09a84f6532 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -26,7 +27,6 @@ #include #include #include -#include #include "libcamera/internal/buffer.h" diff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp index dd5a26083747..300466285a57 100644 --- a/src/libcamera/control_serializer.cpp +++ b/src/libcamera/control_serializer.cpp @@ -12,11 +12,11 @@ #include #include +#include #include #include #include -#include #include "libcamera/internal/byte_stream_buffer.h" diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index 984c1fed9bdb..adfb8d407697 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -21,10 +21,9 @@ #include #include -#include - #include #include +#include #include #include "libcamera/internal/pipeline_handler.h" diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h index c185ac3992dd..91757600ccdc 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h @@ -11,11 +11,11 @@ #include #include +#include #include #include #include -#include #include "libcamera/internal/media_object.h" #include "libcamera/internal/v4l2_videodevice.h" diff --git a/test/span.cpp b/test/span.cpp index ca037c8f02fa..abf3a5d681bf 100644 --- a/test/span.cpp +++ b/test/span.cpp @@ -9,7 +9,7 @@ * Include first to ensure the header is self-contained, as there's no span.cpp * in libcamera. */ -#include +#include #include #include diff --git a/test/utils.cpp b/test/utils.cpp index 9cd2cd070cb9..d7f810e95e7a 100644 --- a/test/utils.cpp +++ b/test/utils.cpp @@ -11,11 +11,11 @@ #include #include -#include -#include - +#include #include +#include + #include "test.h" using namespace std;