From patchwork Thu Jan 12 12:10:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 18104 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 00084C3293 for ; Thu, 12 Jan 2023 12:10:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 949EA625E7; Thu, 12 Jan 2023 13:10:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1673525449; bh=5qJSv9qloZbp4WTYuHb9d7+EK8c+aWU6h8/633U5MD4=; 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=ROM10voV7VHcmA4wFfb7f9g9jiw74MZ+Yhik9YbJnvDtR0tJ+pX4JRGR/xDpK8l2M G2z10agvbh+qL7hVL4zK71LO0zkjDWFhdc4Qq9FL/awjrKds1TJiuH3UbDlMaIFN5F iUmKwFsdtrhTC6znVG84x/cPYbOFPKUIrzzaRHazc0e+UK0JH/Z99CERhXvkxYfa63 PImXkbHVDDYV8FVzkpKaVZ32Paeykq1W6mFajjgukaP17tIrV37qQjAc6STv4bbsOg hDVqcMuJb/Ko/+2g6DiN/GMm9pAnAXVfgkf2FEcYvMB35O+c57wKJc0W2vozzLE2u7 R4kF+UflyXsYQ== Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A8401625D0 for ; Thu, 12 Jan 2023 13:10:47 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="bB9V5AMS"; dkim-atps=neutral Received: by mail-wr1-x430.google.com with SMTP id co23so17886119wrb.4 for ; Thu, 12 Jan 2023 04:10:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U8BY1Hbj/TP4UpyBoupossfU1k5vI8GWk2bScUkfbYg=; b=bB9V5AMSWOwKrJMlZbC+tWeER9kX7k7/tuLaBOvmS67zysnQkrnXXH/O4ReNi7eWmb SAmYFxqQtNett+UEX9G4V1k49Z7C4BDz9guor3+FF7mB4rNa2n7vNVvN0fR04RsQjCbz mnOKZG32iLXoNuadvb6AMHFI4hVGiFkL3NNmZpKfbRUrbi4C412lE7JDfWuCzaI5a34E EJR9kCL6JTYsmq9BJnkvH/H0pTZO3IRBbfY9EVlcVP1tyBZfNLA9gI1EXFkj4Y7zWwAa X1bH8K/P7yxZG0D1wl3z0jrGCd45Lf5p/nu58aMyamTfQl1dd2j6xq1JE3TNnBOuquSo jNgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U8BY1Hbj/TP4UpyBoupossfU1k5vI8GWk2bScUkfbYg=; b=f7FSR+nLtQooTKLpo1gv4GVtaDRQXVionsq5N48zrvu447b5pKm18fUrBB/XnrR7/K u0V5nmW+MimftB4IkJ4Jm8wkLtKD4Gn/Ew9Gm0ELPw+1CsioY9Cb66g8xiG0jSAoeY1e ykiTQI5xWMEgKPYvyUy8NwF9ibYhjXsoPcKoTxsikzRK7Y+sifjwCR4OE254BamHfzYX riyikGjJ2XFhxTKJfV3ZVTzsToudmP7EmvAz60F/Ps3CcIyTeXiiwfuJ/Nycu2AvyfhL c4avx1d4duHZ2FqMoaQu+7SFw/XAhCWiIYpTtBnjarAg07G/qzS6HXRMAqMFeWqEicz7 qOPA== X-Gm-Message-State: AFqh2kq1J3sF8p+U/MNmNvyvhNIVQjVur67LhuhgGo2IWjrb7IHg3k6Q y1PEqw3VED2cBDFQqtCmQlyR2dV0sIw6BdMD X-Google-Smtp-Source: AMrXdXvwdbE9DhQCNRAGdeXE9YbrX8GJZWj9x+oa3siJ2rBPKkXwuRJ99cKy67EBE6pGu4mau0wsuw== X-Received: by 2002:a05:6000:a1d:b0:2bb:dcf9:482b with SMTP id co29-20020a0560000a1d00b002bbdcf9482bmr12752788wrb.47.1673525447026; Thu, 12 Jan 2023 04:10:47 -0800 (PST) Received: from pi4-davidp.pitowers.org ([2a00:1098:3142:14:e4a2:3070:eea4:e434]) by smtp.gmail.com with ESMTPSA id l7-20020a5d6747000000b002b57bae7174sm16318578wrw.5.2023.01.12.04.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jan 2023 04:10:46 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Thu, 12 Jan 2023 12:10:43 +0000 Message-Id: <20230112121044.28003-2-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230112121044.28003-1-david.plowman@raspberrypi.com> References: <20230112121044.28003-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 1/2] libcamera: camera: fix validateColorSpaces to choose the correct "main" colour space 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: David Plowman via libcamera-devel From: David Plowman Reply-To: David Plowman Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The intention is that the "main" colour space is the colour space of the largest non-raw stream. Unfortunately the use of "config_[i].size" is clearly incorrect, and has been copied from prior versions of the code. This small change merely corrects the error. Signed-off-by: David Plowman Reviewed-by: Naushir Patuck Reviewed-by: Umang Jain --- src/libcamera/camera.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 2d947a44..0da167a7 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -361,6 +361,7 @@ CameraConfiguration::Status CameraConfiguration::validateColorSpaces(ColorSpaceF * largest non-raw stream with a defined color space (if there is one). */ std::optional colorSpace; + Size size; for (auto [i, cfg] : utils::enumerate(config_)) { if (!cfg.colorSpace) @@ -369,9 +370,10 @@ CameraConfiguration::Status CameraConfiguration::validateColorSpaces(ColorSpaceF if (cfg.colorSpace->adjust(cfg.pixelFormat)) status = Adjusted; - if (cfg.colorSpace != ColorSpace::Raw && - (!colorSpace || cfg.size > config_[i].size)) + if (cfg.colorSpace != ColorSpace::Raw && cfg.size > size) { colorSpace = cfg.colorSpace; + size = cfg.size; + } } if (!colorSpace || !(flags & ColorSpaceFlag::StreamsShareColorSpace))