From patchwork Mon Jul 25 13:46:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 16764 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 45598C3275 for ; Mon, 25 Jul 2022 13:47:00 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0467763334; Mon, 25 Jul 2022 15:47:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1658756820; bh=ICJUk2o2oJnqSilwj0nt1rOSRkrZoOOhrAdqUYXM4Sg=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=sij0oEo+tFg+xBWE10r+EfYuaUYkVzMkqLcjbmhFEEXMK+lav7HyLdNHtFimWFsrK t/ldK08fVdNyUzlK+xrEBhFMQoA1+4Xjw0lXBZI0xDQ/1jJxx6CdJ1FlXnU5EArc1X b+BUTTuB0rjDbWUaClt+5mCqIjS/mTWNKx/lOt3S47iN8gmveBNfN3Xr8/rVbH90RL TrMT84dr28qSrX3O5XDdJ8CxiRf02q16+eeEOt+0xi4E5PyE7S1ktd/yrUopXVeHgu oVbZJGh0L5bllD1J8y3FO7Lz73nX3AKvvrvu8Ade3SS4lHr7xsSdjahLnPT52lF0b4 om2ToAB4JXXbg== Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 26D3B6332A for ; Mon, 25 Jul 2022 15:46:54 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="ooPTWHAo"; dkim-atps=neutral Received: by mail-wm1-x329.google.com with SMTP id v5so6858653wmj.0 for ; Mon, 25 Jul 2022 06:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0uqRKAosCavxIb8pdLuYhk4+6H7yktRiEYKUOQ5K9HQ=; b=ooPTWHAoIEluaMy+volm6ZrZzm91+l3hNuLw6QtksbDiChmZ5wsE+se2Kcjzum7diS yd0/NiwvYeipwOikTtlPK6zdUEQspWRGY5/mFVNb0ks7LSWoxa8C8s31lNwmjVFtfPMn dwfcDXiYU73ZNj++xMjqR9ZgNxNtR4DxTMElZsFAoy5DGy11nvFLtqx1nnPqr2z+n1ax 9F7ngFEZWi5CWb73bi+SIeD+DHiltlcUGwsVqJYBI38mbllLJQ/yfk01XuawZGxl6qVb W+oETO7r8w3t88XMpsgClyTsCNTmPg0wrsRyCLh5VeKKG5vG0RzFkl3F6dvCMyMRC1VI nI/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0uqRKAosCavxIb8pdLuYhk4+6H7yktRiEYKUOQ5K9HQ=; b=Pk2nScQzSAnJJP2GRIqdz/Z3kiJXE2SxtHIU90w4YZeRJEb5y6Fb6ZVXO3zmieL5t0 u9Plug9vHdScYPJg8KIt/xekpexqy8X9kj3BBHAto1SJWVtFsZdIF7TfKScRrRnelTId /KW/qppak7J1TLb5l/Clnp/Bd3oiUK88EKomOOpmhQAnrUVPFZjcxPVL0EmD8Muuy6Zt 8KQTYRK/EVj5bNwhlhiwaC7IF9UpbQriVDYxqqnHcQ4WyYtTe0jsrzX+Qxt97hWWJLev lgkKuxFMQifIahmOVQEFeAOOTw4lB3rocymygJ9rGdnFLxrzSs3TRRqIQ44DikaQjiCF 7NyA== X-Gm-Message-State: AJIora/zdhOUY8W/29zdlvLzIEIjx+y62xI+yQCaA8xFgnM8PJLguWMr qhB9fbD54/CKIrKssaBnfA+S3avWTJCj8g== X-Google-Smtp-Source: AGRyM1tgVI2SaVouKr4MAZf3Z7eWgRdUErId785ndtze1JS91bwqtR94OnssaSCvK26KYFeNIYgnYQ== X-Received: by 2002:a05:600c:358d:b0:3a3:3819:c07 with SMTP id p13-20020a05600c358d00b003a338190c07mr14439842wmq.76.1658756812830; Mon, 25 Jul 2022 06:46:52 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id a20-20020a05600c225400b003a32167b8d4sm18054320wmm.13.2022.07.25.06.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 06:46:52 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 25 Jul 2022 14:46:36 +0100 Message-Id: <20220725134639.4572-13-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220725134639.4572-1-naush@raspberrypi.com> References: <20220725134639.4572-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 12/15] ipa: raspberrypi: Remove extern "C" declarations 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: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Since the controller header files are now C++ specific, remove the extern "C" declarations. Signed-off-by: Naushir Patuck Reviewed-by: Laurent Pinchart --- src/ipa/raspberrypi/controller/agc_status.h | 8 -------- src/ipa/raspberrypi/controller/alsc_status.h | 8 -------- src/ipa/raspberrypi/controller/awb_status.h | 8 -------- src/ipa/raspberrypi/controller/black_level_status.h | 8 -------- src/ipa/raspberrypi/controller/camera_mode.h | 8 -------- src/ipa/raspberrypi/controller/ccm_status.h | 8 -------- src/ipa/raspberrypi/controller/contrast_status.h | 8 -------- src/ipa/raspberrypi/controller/denoise_status.h | 8 -------- src/ipa/raspberrypi/controller/dpc_status.h | 8 -------- src/ipa/raspberrypi/controller/focus_status.h | 8 -------- src/ipa/raspberrypi/controller/geq_status.h | 8 -------- src/ipa/raspberrypi/controller/lux_status.h | 8 -------- src/ipa/raspberrypi/controller/noise_status.h | 8 -------- src/ipa/raspberrypi/controller/sharpen_status.h | 8 -------- 14 files changed, 112 deletions(-) diff --git a/src/ipa/raspberrypi/controller/agc_status.h b/src/ipa/raspberrypi/controller/agc_status.h index 6723bc9e8200..e9174667476f 100644 --- a/src/ipa/raspberrypi/controller/agc_status.h +++ b/src/ipa/raspberrypi/controller/agc_status.h @@ -13,10 +13,6 @@ * "agc.status" metadata. */ -#ifdef __cplusplus -extern "C" { -#endif - /* * Note: total_exposure_value will be reported as zero until the algorithm has * seen statistics and calculated meaningful values. The contents should be @@ -39,7 +35,3 @@ struct AgcStatus { double digitalGain; int locked; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/alsc_status.h b/src/ipa/raspberrypi/controller/alsc_status.h index e074f9359faa..d7122f5190ce 100644 --- a/src/ipa/raspberrypi/controller/alsc_status.h +++ b/src/ipa/raspberrypi/controller/alsc_status.h @@ -11,10 +11,6 @@ * "alsc.status" metadata. */ -#ifdef __cplusplus -extern "C" { -#endif - #define ALSC_CELLS_X 16 #define ALSC_CELLS_Y 12 @@ -23,7 +19,3 @@ struct AlscStatus { double g[ALSC_CELLS_Y][ALSC_CELLS_X]; double b[ALSC_CELLS_Y][ALSC_CELLS_X]; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/awb_status.h b/src/ipa/raspberrypi/controller/awb_status.h index 2f6e88ef6e7f..353906f8aefd 100644 --- a/src/ipa/raspberrypi/controller/awb_status.h +++ b/src/ipa/raspberrypi/controller/awb_status.h @@ -11,10 +11,6 @@ * under the tag "awb.status". */ -#ifdef __cplusplus -extern "C" { -#endif - struct AwbStatus { char mode[32]; double temperatureK; @@ -22,7 +18,3 @@ struct AwbStatus { double gainG; double gainB; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/black_level_status.h b/src/ipa/raspberrypi/controller/black_level_status.h index ad83ddad5283..94517c7c6cda 100644 --- a/src/ipa/raspberrypi/controller/black_level_status.h +++ b/src/ipa/raspberrypi/controller/black_level_status.h @@ -8,16 +8,8 @@ /* The "black level" algorithm stores the black levels to use. */ -#ifdef __cplusplus -extern "C" { -#endif - struct BlackLevelStatus { uint16_t black_level_r; /* out of 16 bits */ uint16_t black_level_g; uint16_t black_level_b; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/camera_mode.h b/src/ipa/raspberrypi/controller/camera_mode.h index 47a0fea424ca..6e1597d23a28 100644 --- a/src/ipa/raspberrypi/controller/camera_mode.h +++ b/src/ipa/raspberrypi/controller/camera_mode.h @@ -16,10 +16,6 @@ * including binning, scaling, cropping etc. */ -#ifdef __cplusplus -extern "C" { -#endif - #define CAMERA_MODE_NAME_LEN 32 struct CameraMode { @@ -46,7 +42,3 @@ struct CameraMode { /* sensitivity of this mode */ double sensitivity; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/ccm_status.h b/src/ipa/raspberrypi/controller/ccm_status.h index 4cdd8bed0311..44471d0ef901 100644 --- a/src/ipa/raspberrypi/controller/ccm_status.h +++ b/src/ipa/raspberrypi/controller/ccm_status.h @@ -8,15 +8,7 @@ /* The "ccm" algorithm generates an appropriate colour matrix. */ -#ifdef __cplusplus -extern "C" { -#endif - struct CcmStatus { double matrix[9]; double saturation; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/contrast_status.h b/src/ipa/raspberrypi/controller/contrast_status.h index 5eb084f78e71..88152575288f 100644 --- a/src/ipa/raspberrypi/controller/contrast_status.h +++ b/src/ipa/raspberrypi/controller/contrast_status.h @@ -11,10 +11,6 @@ * of contrast stretching based on the AGC histogram. */ -#ifdef __cplusplus -extern "C" { -#endif - #define CONTRAST_NUM_POINTS 33 struct ContrastPoint { @@ -27,7 +23,3 @@ struct ContrastStatus { double brightness; double contrast; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/denoise_status.h b/src/ipa/raspberrypi/controller/denoise_status.h index a41e7e89c428..6ac2fb404bb4 100644 --- a/src/ipa/raspberrypi/controller/denoise_status.h +++ b/src/ipa/raspberrypi/controller/denoise_status.h @@ -8,17 +8,9 @@ /* This stores the parameters required for Denoise. */ -#ifdef __cplusplus -extern "C" { -#endif - struct DenoiseStatus { double noise_constant; double noise_slope; double strength; unsigned int mode; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/dpc_status.h b/src/ipa/raspberrypi/controller/dpc_status.h index c99ad8c500a6..685ffc7b91b5 100644 --- a/src/ipa/raspberrypi/controller/dpc_status.h +++ b/src/ipa/raspberrypi/controller/dpc_status.h @@ -8,14 +8,6 @@ /* The "DPC" algorithm sets defective pixel correction strength. */ -#ifdef __cplusplus -extern "C" { -#endif - struct DpcStatus { int strength; /* 0 = "off", 1 = "normal", 2 = "strong" */ }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/focus_status.h b/src/ipa/raspberrypi/controller/focus_status.h index c75795dc0621..f0dbe4e2c4a2 100644 --- a/src/ipa/raspberrypi/controller/focus_status.h +++ b/src/ipa/raspberrypi/controller/focus_status.h @@ -14,15 +14,7 @@ * measurements, it's not driving any kind of auto-focus algorithm! */ -#ifdef __cplusplus -extern "C" { -#endif - struct FocusStatus { unsigned int num; uint32_t focusMeasures[FOCUS_REGIONS]; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/geq_status.h b/src/ipa/raspberrypi/controller/geq_status.h index 0ebb7ce71d5b..791f34ca2e52 100644 --- a/src/ipa/raspberrypi/controller/geq_status.h +++ b/src/ipa/raspberrypi/controller/geq_status.h @@ -8,15 +8,7 @@ /* The "GEQ" algorithm calculates the green equalisation thresholds */ -#ifdef __cplusplus -extern "C" { -#endif - struct GeqStatus { uint16_t offset; double slope; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/lux_status.h b/src/ipa/raspberrypi/controller/lux_status.h index c1134bec3694..cd5ed473c10d 100644 --- a/src/ipa/raspberrypi/controller/lux_status.h +++ b/src/ipa/raspberrypi/controller/lux_status.h @@ -17,15 +17,7 @@ * (presumably meaningless) value in the image metadata. */ -#ifdef __cplusplus -extern "C" { -#endif - struct LuxStatus { double lux; double aperture; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/noise_status.h b/src/ipa/raspberrypi/controller/noise_status.h index 60b995f4fa4f..67cf63e5f70c 100644 --- a/src/ipa/raspberrypi/controller/noise_status.h +++ b/src/ipa/raspberrypi/controller/noise_status.h @@ -8,15 +8,7 @@ /* The "noise" algorithm stores an estimate of the noise profile for this image. */ -#ifdef __cplusplus -extern "C" { -#endif - struct NoiseStatus { double noise_constant; double noise_slope; }; - -#ifdef __cplusplus -} -#endif diff --git a/src/ipa/raspberrypi/controller/sharpen_status.h b/src/ipa/raspberrypi/controller/sharpen_status.h index 5ea21ab23f91..c66eaa73af3b 100644 --- a/src/ipa/raspberrypi/controller/sharpen_status.h +++ b/src/ipa/raspberrypi/controller/sharpen_status.h @@ -8,10 +8,6 @@ /* The "sharpen" algorithm stores the strength to use. */ -#ifdef __cplusplus -extern "C" { -#endif - struct SharpenStatus { /* controls the smallest level of detail (or noise!) that sharpening will pick up */ double threshold; @@ -22,7 +18,3 @@ struct SharpenStatus { /* The sharpening strength requested by the user or application. */ double userStrength; }; - -#ifdef __cplusplus -} -#endif