From patchwork Mon Jan 25 08:19:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 10987 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 49BABBD808 for ; Mon, 25 Jan 2021 08:19:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A8126682A8; Mon, 25 Jan 2021 09:19:38 +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="W6g1nQRG"; dkim-atps=neutral Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CDAA368212 for ; Mon, 25 Jan 2021 09:19:37 +0100 (CET) Received: by mail-wm1-x334.google.com with SMTP id y187so9892422wmd.3 for ; Mon, 25 Jan 2021 00:19:37 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=wwOK9OH0Hh2287T4li/4enCYaYykXaqQiilFMXP8GnQ=; b=W6g1nQRGvbgvfNx294JARgSfLH5yszQysbR7swi9ZTS0gl/Em3VBxXbp1mBrV3IJLU Q2IiyvNtaKM0HYVcaDImHNbjuE2EIbuBtcHV67smCBkFCdVknnyTc57yQA+MbKepUvWb yi9m4CLH6Fu4+yhqaQzmB3veDBvsmctlfgix9gx7QvA97qz+5Xj7pfqKj5tYD//aJyrX VKfZNqkSpMun97JofPKxJvsWmPKHlAlw4t7crCXVjlbaELzt+DtZqfKblpg/QOLE0R/7 p2MB0D04jff4ISjNpO2iflkUNzFrN2lxDcqjNnVWuWBMX7nZHJStthyS7KXBxBDSdt6x /oug== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=wwOK9OH0Hh2287T4li/4enCYaYykXaqQiilFMXP8GnQ=; b=XqtMEn8oJmhG6kDT3fnAtM+OTQE0v5Obld8Y//JuG1bHpprHE4qoJmfqIj/g4nqS6p eiWifhfj3TGodjIMdUe+ZwEebGK8HqMyqXvOnYjgI37zIYwKBZPUFJ5Ikzumgv6wwIbx q9E1E1G4BcN4V9X2Y2q7vaESM+TZIf5OvhRd0ILIpes6HaQV/fbCIOAfDhBehnpW0c9j 3Rk4OSH0bs9f81zluwAUm73PFubB+2xtuOs1UOdatYscU8k4iyk/M3qk55Xj7nzb8TS2 BNZr4mt09KN83QfumT4S2QUu+/KtFo/lXZ7mZ3Ls+y376OaJ9ZRpcYIWlsUbLrKesb2a 0inw== X-Gm-Message-State: AOAM530PFxnXeO1rHIzRDeJZMUgbADfVlG5gw6YklCr7whTr2iYVQA8/ m+1ijrw0GC0WNbWQIRp4eRgsj96VNTqNBz3b X-Google-Smtp-Source: ABdhPJxHZjEgqma2E21mYYlsyFSXJdihBL4d8x1mzv7klMK1OCbF3K62hZph7QZ9Ovd0kEP6KmV/Uw== X-Received: by 2002:a1c:e043:: with SMTP id x64mr379601wmg.48.1611562777200; Mon, 25 Jan 2021 00:19:37 -0800 (PST) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id p18sm19976634wmc.31.2021.01.25.00.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 00:19:36 -0800 (PST) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Mon, 25 Jan 2021 08:19:32 +0000 Message-Id: <20210125081932.799132-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210124140506.786503-1-naush@raspberrypi.com> References: <20210124140506.786503-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] 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 forcing the integer constants to be 64-bit wide by using the INT64_C() macro. 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 */