From patchwork Tue Jan 3 11:33:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 18083 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 8A8AEC3291 for ; Tue, 3 Jan 2023 11:33:20 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 950F661F0F; Tue, 3 Jan 2023 12:33:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1672745599; bh=AjsZ5OBxjl+SqU7Re2waHsIwAPXf1FOEa0JjUaSIn9U=; 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=XkZq/EkE48brT5PuOVlYoQLL/GJiN6kyTOOYf4+Hk8RRhc8aj0Bzb/rq0J1kvc/hl fPkGrxp6cMdC1BhQ4rH9+j3FynyhQ2CrI2iwGWfZOYyiUN3Xeq8PZXOxY4+AQbU9+b FrIkrBcBGHsMz3xTU3QoBewM7zXgtaiXtQLHKFueRc8zFcOOzgD2Z7AzN6Hhb8WFX0 f/vUPskhLNGStvgKhZVeY8Us1FweulsxohxjcSWiQL1NO5tUdiiOk/PQm208hEREwe 3+kFMxHrQ6yD2tG9V4sPwCEhtV9OxL8wTrhRaH+grd6RPZqt6qPEOp/CtvxJg1IV5i U+BoJWIL02Qkg== Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BD75861F0F for ; Tue, 3 Jan 2023 12:33:17 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="OYQUy6h9"; dkim-atps=neutral Received: by mail-wr1-x42a.google.com with SMTP id az7so4724520wrb.5 for ; Tue, 03 Jan 2023 03:33:17 -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=K49KIMd4v47JvPDJ6npG1gv54cNQtVc9KB/uy2SBRng=; b=OYQUy6h9b67uzVQft6YChIjHChYSysnGu3Zx9IvyxbdstPduoPn5srqD8bU5l5wJPw EDs6+/BnDSCFNQQT3rZTvHRb6ZG+k13cQTCNFsyHGXCXHkWbaz1aOJFZiqhHG2jsAN25 Hl7jOgl3XCT3gptTn167zfwmm83wgN9FUX6v9r5bNyZ5WT6YYWFiEqKIl8F0ndo1qzJJ DPMx60RcTd/pAoTh14b7Nm7mo5IB0/T3EM8QWNbMavk7gDWSEofpDr6bB21i7ugmyj82 YNOCgbpeAwgwCcF85ZcnU8nHC9ttz03M76BruDqbUi5kfSzbraPDYOq9D8S703MZfFnz IS+A== 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=K49KIMd4v47JvPDJ6npG1gv54cNQtVc9KB/uy2SBRng=; b=IDvP8ep6Ob5o8ClnHANMIg50i4SdgX395ORDLfZTWhMNnq+NoEk48O7sHWRgCbpCJ9 aBK+tPnH3Pz7c69YFWtJ2J+s9aGIjdw8hiwLIgXAhJ1/IMApK3ci02KJfLGjjmWiC/jp QOgxXADOQD2fqEYfxzerQ6EsLyYRMw2DaDdie6Lo1i0IoUaolOGDrFmNEGNE///bTcq6 vL3PBFC4jPgeFsSsqzniTyl3WywNMoQ/XTm80LebYq89bbTnwOETAbRM/6yVZ6CbHYtF hi4kBoqLD5OAZxj8WnAsjyHnRBCq7nKeY/6fhrVNtGw165Fcgi5Wcqk4hOlqN+uH8Yym XzXA== X-Gm-Message-State: AFqh2krNSU4ftPrT3TYBC7eWfRgmO4Y0c2e8Xozo2gT9bsQxE1kKKLVk wQI3/RWkoX24uaHDDC4pIMpCBUVcftdU+Sr3 X-Google-Smtp-Source: AMrXdXvDPrLVf7pt9S7UNbU1IN0crpI8RFDYz85+T5zKGuIh5oivuxzi6GV4MPA4Kay/7OqAkHURQQ== X-Received: by 2002:a5d:4645:0:b0:27f:fb47:2362 with SMTP id j5-20020a5d4645000000b0027ffb472362mr16893604wrs.49.1672745597112; Tue, 03 Jan 2023 03:33:17 -0800 (PST) Received: from pi4-davidp.pitowers.org ([2a00:1098:3142:14:e4a2:3070:eea4:e434]) by smtp.gmail.com with ESMTPSA id h10-20020a5d4fca000000b00281eab50380sm24325767wrw.117.2023.01.03.03.33.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 03:33:16 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Tue, 3 Jan 2023 11:33:12 +0000 Message-Id: <20230103113313.5423-2-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230103113313.5423-1-david.plowman@raspberrypi.com> References: <20230103113313.5423-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 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: Jacopo Mondi Reviewed-by: Naushir Patuck --- 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))