[{"id":28903,"web_url":"https://patchwork.libcamera.org/comment/28903/","msgid":"<170990446845.252503.8982923199863477729@ping.linuxembedded.co.uk>","date":"2024-03-08T13:27:48","subject":"Re: [PATCH] cam: capture_script: Make parseRectangles work for\n\tnon-array","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Jacopo Mondi (2024-03-08 10:42:18)\n> From: Paul Elder \n> \n> parseRectangles currently always parses Rectangle controls as an array\n> of Rectangles. This causes non-array Rectangle controls to not be parsed\n> correctly, as when the ControlValue is get()ed, the non-array assertion\n> will fail.\n> \n> Set the ControlValue with a single Rectangle in case a single Rectangle\n> has been specified in the yaml capture script to fix that.\n> \n\nI believe this is reasonable, as we've had this in a branch for a while.\n\nI wonder if anything should be done to make this happen at the\nControlValue::set() / template level more automagically - but I suspect\nthat's not worth it.\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Paul Elder \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/apps/cam/capture_script.cpp | 5 ++++-\n> 1 file changed, 4 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/apps/cam/capture_script.cpp b/src/apps/cam/capture_script.cpp\n> index 062a7258e414..1215713fac18 100644\n> --- a/src/apps/cam/capture_script.cpp\n> +++ b/src/apps/cam/capture_script.cpp\n> @@ -351,7 +351,10 @@ ControlValue CaptureScript::parseRectangles()\n> }\n> \n> ControlValue controlValue;\n> - controlValue.set(Span(rectangles));\n> + if (rectangles.size() == 1)\n> + controlValue.set(rectangles.at(0));\n> + else\n> + controlValue.set(Span(rectangles));\n> \n> return controlValue;\n> }\n> -- \n> 2.43.2\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 3B275BD160\n\tfor ;\n\tFri, 8 Mar 2024 13:27:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 870A06286F;\n\tFri, 8 Mar 2024 14:27:53 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3249161C89\n\tfor ;\n\tFri, 8 Mar 2024 14:27:51 +0100 (CET)","from pendragon.ideasonboard.com\n\t(aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net\n\t[82.37.23.78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0D3C0CD1;\n\tFri, 8 Mar 2024 14:27:32 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"T2zt7sbz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1709904452;\n\tbh=svLxvo9cLAP077VyYdxtkWzZ+q0Dl4pKx01oKwq09WQ=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=T2zt7sbzpUl6aWJBSJbUa49pvRK4pDaBbC+jHM1DIkhCS51Avx4ROQtN4zoPIUpUn\n\tI61pfjFHZaCfqwLvHmzfY0YzbTIY/jUaj2xrODPqrccZQTUHOW/QLiodwYfEwT+OcK\n\t/KVWikysLqOstZ1nl+H6Vw9eH0w5oSgaQMtROnW8=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240308104219.52676-1-jacopo.mondi@ideasonboard.com>","References":"<20240308104219.52676-1-jacopo.mondi@ideasonboard.com>","Subject":"Re: [PATCH] cam: capture_script: Make parseRectangles work for\n\tnon-array","From":"Kieran Bingham ","To":"Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Fri, 08 Mar 2024 13:27:48 +0000","Message-ID":"<170990446845.252503.8982923199863477729@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Jacopo Mondi ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":28904,"web_url":"https://patchwork.libcamera.org/comment/28904/","msgid":"","date":"2024-03-08T13:28:49","subject":"Re: [PATCH] cam: capture_script: Make parseRectangles work for\n\tnon-array","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Jacopo\n\nOn 08/03/24 4:12 pm, Jacopo Mondi wrote:\n> From: Paul Elder \n>\n> parseRectangles currently always parses Rectangle controls as an array\n\nnit: s/parseRectangles/parseRectangles()/\n> of Rectangles. This causes non-array Rectangle controls to not be parsed\n> correctly, as when the ControlValue is get()ed, the non-array assertion\n> will fail.\n>\n> Set the ControlValue with a single Rectangle in case a single Rectangle\n> has been specified in the yaml capture script to fix that.\n>\n> Signed-off-by: Paul Elder \n> Signed-off-by: Jacopo Mondi \nLGTM\n\nReviewed-by: Umang Jain \n\n> ---\n> src/apps/cam/capture_script.cpp | 5 ++++-\n> 1 file changed, 4 insertions(+), 1 deletion(-)\n>\n> diff --git a/src/apps/cam/capture_script.cpp b/src/apps/cam/capture_script.cpp\n> index 062a7258e414..1215713fac18 100644\n> --- a/src/apps/cam/capture_script.cpp\n> +++ b/src/apps/cam/capture_script.cpp\n> @@ -351,7 +351,10 @@ ControlValue CaptureScript::parseRectangles()\n> \t}\n> \n> \tControlValue controlValue;\n> -\tcontrolValue.set(Span(rectangles));\n> +\tif (rectangles.size() == 1)\n> +\t\tcontrolValue.set(rectangles.at(0));\n> +\telse\n> +\t\tcontrolValue.set(Span(rectangles));\n> \n> \treturn controlValue;\n> }","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 72083BD160\n\tfor ;\n\tFri, 8 Mar 2024 13:28:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 326CF62868;\n\tFri, 8 Mar 2024 14:28:59 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 481D862865\n\tfor ;\n\tFri, 8 Mar 2024 14:28:57 +0100 (CET)","from [192.168.1.102] (unknown [103.251.226.70])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0D8F8CD1;\n\tFri, 8 Mar 2024 14:28:36 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"PKVNn5fc\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1709904518;\n\tbh=wQa8XdNqRCi9H6DNniwlj1vJQ0AZNE8IWUHcq0aRhds=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=PKVNn5fc9F7WJdrf3XIY5Ro1bX7XGNZzoDW1o2gsCgbaTcua4G6+v5fiWWKBfqmnw\n\tPtIo4mjUWJlhBMmd5WJiEfmYMsrBrT5e6wdwOlf8kqh2qViKtqGikCXpeRTvM7zxRb\n\tgNxq0JPBwQMoHTR1T0njUJAiXbAxJWQdyvG23bzE=","Message-ID":"","Date":"Fri, 8 Mar 2024 18:58:49 +0530","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH] cam: capture_script: Make parseRectangles work for\n\tnon-array","Content-Language":"en-US","To":"Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20240308104219.52676-1-jacopo.mondi@ideasonboard.com>","From":"Umang Jain ","In-Reply-To":"<20240308104219.52676-1-jacopo.mondi@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]