From patchwork Sun Jan 24 14:05:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 10974 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 01154BD808 for ; Sun, 24 Jan 2021 14:05:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 438F56829F; Sun, 24 Jan 2021 15:05:14 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="OTNPaGlK"; dkim-atps=neutral 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 78CDE6823D for ; Sun, 24 Jan 2021 15:05:12 +0100 (CET) Received: by mail-wm1-x32f.google.com with SMTP id o10so9104342wmc.1 for ; Sun, 24 Jan 2021 06:05:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=n9D4J5SwNdhQcSxAfeArxWLUh8dmYZ/TT2l15nlspHA=; b=OTNPaGlK+pIpm4EP0UgWDz9O3jS84ojE5JIF65XWmC+945nsF+m6FZWlFktsvD6OWn 7ZyK3+4t2F+IWu64ajaUhtB4bAczbzrgYIiRHVTrntaPHFLOYlQhjYxvazef6nBXdRim eCFmTRHEQbvG0CWyykqkjsJ+v1QJQW23Za50qR3tjgU5JxnhyezeQFsaXzAiM++K2PPl +aDqrl6jDTbBF6ciW7VlrKL17VzPHVufIP9AbePxvbs/TmBJwsfx7n853zoixsrZAHL/ Q+GMGD4MJnE9eLn3ACf7rt4eOsrUloEnon6ks+3H7wMCuGeIWX+JXBjwTYeASod/hSSA kOeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=n9D4J5SwNdhQcSxAfeArxWLUh8dmYZ/TT2l15nlspHA=; b=VhtWZfqkzVO2KZXyNC/BXig29C806QmURevjW3/pu9DJjvwd8ucXMYimhaGqKUgL0q rDxg4ZEvu9OGz/lyIs9ZrrvMNqBgAM6zOqaNF0orrMtx0vh/n4MGW2v9r+5BDe1AIBXy VeddGIrgsFtHbfWa4H5P/vIvvOM1zMXLwPcHcxhdwO7JBOFoffwdUnss1YCpY3BS9ydl EGAHYQnZSS9TxFBr7w5TViPmUT4qlLWiuwiletji0VZiXJHzEpw/ZpyQqF1a34Uerpy8 sZB04+ZkwtGyqxaK6n3Y240C44twJQcUkOIJ9MpWebUdeVUjdOtMOQ76O3RsrylvU8LU E9EA== X-Gm-Message-State: AOAM530wpV7BYSkb/oF+mc0s7k4zvpRHSC7VGxvU145E41N7RbA3ziak k1lbCTI/RK1DWXl47zf1J8HUjb/oYGTzqapy X-Google-Smtp-Source: ABdhPJzKIzwahf2sq/uEpxbJ0EFq3qxDVuyOO4n5/uvV57q6xV0DwYBeLNd824bf886bLSGMsNU9Nw== X-Received: by 2002:a1c:4057:: with SMTP id n84mr11915835wma.141.1611497111625; Sun, 24 Jan 2021 06:05:11 -0800 (PST) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id u16sm19311053wrn.68.2021.01.24.06.05.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 06:05:10 -0800 (PST) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Sun, 24 Jan 2021 14:05:03 +0000 Message-Id: <20210124140506.786503-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 1/4] raspberrypi: Add the correct integer const postfix for FrameDurations 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: , Cc: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" At startup, ControlInfoMap::generateIdmap() threw a log message warning that the controls::FrameDurations had a type mismatch based on the min/max values provided in libcamera::RPi::Controls initialiser. Fix this warning by adding and explicit int64_t postfix to the const values for min and max. Signed-off-by: Naushir Patuck Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- include/libcamera/ipa/raspberrypi.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h index 1de36039cee0..4038428bdba4 100644 --- a/include/libcamera/ipa/raspberrypi.h +++ b/include/libcamera/ipa/raspberrypi.h @@ -7,6 +7,8 @@ #ifndef __LIBCAMERA_IPA_INTERFACE_RASPBERRYPI_H__ #define __LIBCAMERA_IPA_INTERFACE_RASPBERRYPI_H__ +#include + #include #include @@ -65,7 +67,7 @@ static const ControlInfoMap Controls = { { &controls::Sharpness, ControlInfo(0.0f, 16.0f, 1.0f) }, { &controls::ColourCorrectionMatrix, ControlInfo(-16.0f, 16.0f) }, { &controls::ScalerCrop, ControlInfo(Rectangle{}, Rectangle(65535, 65535, 65535, 65535), Rectangle{}) }, - { &controls::FrameDurations, ControlInfo(1000, 1000000000) }, + { &controls::FrameDurations, ControlInfo(INT64_C(1000), INT64_C(1000000000)) }, }; } /* namespace RPi */