From patchwork Tue Jul 26 12:45:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 16784 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 BC964C3276 for ; Tue, 26 Jul 2022 12:46:13 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 803E26331A; Tue, 26 Jul 2022 14:46:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1658839573; bh=DZaxv2T17gLdbYtEhtz8H/QG4ShyhpAO0hAj8ka2Qao=; 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=zPwFM3dT6bZGQpFYVy+dEO8LAQbABY5lcnoABernrYUCWvADcJhz0yoh46McAJTH4 J5vqqnBoHA4D5/uTGaaauKTPemrpszo6PH3c8fiEIGye2k0R7tpghJGx+rrO3sHNZ4 sdSW0kmFZIAjz0peucoaN5mx6vdu6s2pSfquH5qMkZWtc5sJ1Tdt+l2z3lCrcLoIeH aEVD2k9+EHinc2WeSIOVkmL3upZ3S3J8Uxh7XOZIRh3SSNj+Ch5s66J8vEMzI219mE vZAs+emOZkgXfyfRLWWN/zxt0w3lpltDThMYROl+E3xBp2P0E5zSfC2Sdkn/uVDrWD ubSgJ8mcUfEMw== Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 921C063328 for ; Tue, 26 Jul 2022 14:46:09 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="EIpbsE4K"; dkim-atps=neutral Received: by mail-wm1-x32f.google.com with SMTP id id17so8680450wmb.1 for ; Tue, 26 Jul 2022 05:46:09 -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=NY7JyaOac2q2MSMD7Q38yiXfBA4PvnnhUAE6F35MFJg=; b=EIpbsE4KXQSnZiyqDNGz6N6N3xl7VKoU9hBDti7+nJGGklG9BhFXTWidhCGEumMDQj N9SPX/o435tQBWQxJyl6sfiFi1c2lR1PRdQXkTMX9s9P4rQJgQqhS/6fLBeUJVA9wUPF JsXKzcxzVE403gQ9QglkFyJ3J2ObVdXOzO0Z462RgkgBssJwHdV+YbN0in5kiUc/1wvL YRYhJjKiwTcsAhp21RnS9xUEvJaQhSnJDV5QQz9s+RuLPyq5SUQHPejstIzKyPQOwsU8 3ZhU7SuRZVKefDyHjXw4KVkwS+TuTm32jMxYskDG8K5iTOp3LgTtNjklgFpxb7XLnV/N i97A== 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=NY7JyaOac2q2MSMD7Q38yiXfBA4PvnnhUAE6F35MFJg=; b=U6OvrxJKOQYVrJ4tCioYjl9xcpWcdmczQAPLPxO8q4NasubtbkAivSi9YaW1T65Fsr pY2Ae/J+hO/zTIaJhZBn8Rdb2US24We5/nwPwxmCH07LAPFwTMCbnQlkuCgjfB0QDq9o XiTvUpJpx9ll2RREgjvuKTqPJMv5Qde0qUXDUdfL7PjnbEntEW+4H/0BNBJ6sLFziWEP 7GW8iMqRHPAE+WK7pDvWGmPtQXzrtmYAFHw5prM9DfMWDZPSw0XfyH52X1N52xVk8Npw s45ShaFT4712ikgkbZEvVEq4D3RvJqzahNhRhCySJOIKDncOvu3mHhiT46EPBckxE10a TQpQ== X-Gm-Message-State: AJIora/XzNLm9/HvqL4jWRn4ppi4b6HQkFWNILj9ucHYSxCq78PJsOAZ PqK1YoMS0WmL7IElWoQdvJ4KFhDSz45b8Q== X-Google-Smtp-Source: AGRyM1ufCLW/T25ULWifsSTRBgmnTFQdDiAr7bXIxqxfAz2W0eP6AefkUi6LtR5mCz9C1H98cl3prQ== X-Received: by 2002:a05:600c:1d22:b0:3a3:69f5:b242 with SMTP id l34-20020a05600c1d2200b003a369f5b242mr5005663wms.202.1658839568610; Tue, 26 Jul 2022 05:46:08 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id y17-20020adfd091000000b0021e87ec980bsm5948460wrh.84.2022.07.26.05.46.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 05:46:08 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Tue, 26 Jul 2022 13:45:44 +0100 Message-Id: <20220726124549.1646-13-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220726124549.1646-1-naush@raspberrypi.com> References: <20220726124549.1646-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 12/17] 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 9d184a158411..c7b7c1b2d938 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 8b0523834dcf..8d2c497aef3a 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 blackLevelR; /* out of 16 bits */ uint16_t blackLevelG; uint16_t blackLevelB; }; - -#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 c2d9c7301b19..e97368aaab54 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 noiseConstant; double noiseSlope; 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 689beed394a7..843260f013ae 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 noiseConstant; double noiseSlope; }; - -#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