[{"id":4247,"web_url":"https://patchwork.libcamera.org/comment/4247/","msgid":"<20200324080817.5rjzs7juyia5ambn@uno.localdomain>","date":"2020-03-24T08:08:17","subject":"Re: [libcamera-devel] [PATCH 1/3] libcamera: pipeline: Replace\n\tresize() with erase() in validate()","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kaaira,\n\nOn Tue, Mar 24, 2020 at 04:58:59AM +0530, Kaaira Gupta wrote:\n> Replace .resize() with .erase() in validate() calls in all pipelines,\n> because resize() calls default constructor StreamConfiguration() when it\n> tries to increase the size.\n>\n> Signed-off-by: Kaaira Gupta \n> ---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 9 +++++++--\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 8 ++++++--\n> src/libcamera/pipeline/uvcvideo.cpp | 8 ++++++--\n> src/libcamera/pipeline/vimc.cpp | 8 ++++++--\n> 4 files changed, 25 insertions(+), 8 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 1b44460..7feb44c 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -298,9 +298,14 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n> \tif (config_.empty())\n> \t\treturn Invalid;\n>\n> -\t/* Cap the number of entries to the available streams. */\n> +\t/*\n> +\t * Cap the number of entries to the available streams.\n> +\t * Use erase() instead of resize() because resize() uses default constructor\n> +\t * when it increases config_'s size, which we wish to avoid.\n> +\t */\n> +\n\nAdditional blank line. Please drop it.\n\nApart from this\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> \tif (config_.size() > 2) {\n> -\t\tconfig_.resize(2);\n> +\t\tconfig_.erase(config_.begin() + 2, config_.end());\n> \t\tstatus = Adjusted;\n> \t}\n>\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 2f909ce..04b0ed3 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -447,9 +447,13 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> \tif (config_.empty())\n> \t\treturn Invalid;\n>\n> -\t/* Cap the number of entries to the available streams. */\n> +\t/*\n> +\t * Cap the number of entries to the available streams.\n> +\t * Use erase() instead of resize() because resize() uses default constructor\n> +\t * when it increases config_'s size, which we wish to avoid.\n> +\t */\n> \tif (config_.size() > 1) {\n> -\t\tconfig_.resize(1);\n> +\t\tconfig_.erase(config_.begin() + 1, config_.end());\n> \t\tstatus = Adjusted;\n> \t}\n>\n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index ffbddf2..462eae2 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -97,9 +97,13 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n> \tif (config_.empty())\n> \t\treturn Invalid;\n>\n> -\t/* Cap the number of entries to the available streams. */\n> +\t/*\n> +\t * Cap the number of entries to the available streams.\n> +\t * Use erase() instead of resize() because resize() uses default constructor\n> +\t * when it increases config_'s size, which we wish to avoid.\n> +\t */\n> \tif (config_.size() > 1) {\n> -\t\tconfig_.resize(1);\n> +\t\tconfig_.erase(config_.begin() + 1, config_.end());\n> \t\tstatus = Adjusted;\n> \t}\n>\n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index b04a972..4c991ff 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -123,9 +123,13 @@ CameraConfiguration::Status VimcCameraConfiguration::validate()\n> \tif (config_.empty())\n> \t\treturn Invalid;\n>\n> -\t/* Cap the number of entries to the available streams. */\n> +\t/*\n> +\t * Cap the number of entries to the available streams.\n> +\t * Use erase() instead of resize() because resize() uses default constructor\n> +\t * when it increases config_'s size, which we wish to avoid.\n> +\t */\n> \tif (config_.size() > 1) {\n> -\t\tconfig_.resize(1);\n> +\t\tconfig_.erase(config_.begin() + 1, config_.end());\n> \t\tstatus = Adjusted;\n> \t}\n>\n> --\n> 2.17.1\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5EE2060411\n\tfor ;\n\tTue, 24 Mar 2020 09:05:24 +0100 (CET)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 05A5C20003;\n\tTue, 24 Mar 2020 08:05:18 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Tue, 24 Mar 2020 09:08:17 +0100","From":"Jacopo Mondi ","To":"Kaaira Gupta ","Cc":"libcamera-devel@lists.libcamera.org,\n\tKieran Bingham ,\n\tHelen Koike ,\n\tVaishali Thakkar ","Message-ID":"<20200324080817.5rjzs7juyia5ambn@uno.localdomain>","References":"<20200323232901.29169-1-kgupta@es.iitr.ac.in>\n\t<20200323232901.29169-2-kgupta@es.iitr.ac.in>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200323232901.29169-2-kgupta@es.iitr.ac.in>","Subject":"Re: [libcamera-devel] [PATCH 1/3] libcamera: pipeline: Replace\n\tresize() with erase() in validate()","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","X-List-Received-Date":"Tue, 24 Mar 2020 08:05:24 -0000"}}]