From patchwork Mon Mar 23 23:28:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaaira Gupta X-Patchwork-Id: 3292 Return-Path: Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B8EAD60417 for ; Tue, 24 Mar 2020 00:29:58 +0100 (CET) Received: by mail-pf1-x441.google.com with SMTP id 23so8333615pfj.1 for ; Mon, 23 Mar 2020 16:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3J5D7TFPdLOULzPBNeyi1SvzT2BqMrZXa+z/CdzZtIM=; b=tqgWokWkhGppTaw3RTCuC2kdORsvduUaVFDF9KIHKmFJ5fbvxXKJKUDjlS3pdv2f9J B9l90I6Twp6fcKWgF4/2HBiAfUIBAfj2eFqHf5VczLovjn2Y6IFwXjeC3jv7zAKL5/3q ctmmJBNUluqd1Byp+VYgiWEcEP8cyLtgywvWI+W0dKp4Gl/zpV8dfY+DWL2/q/cEWDlJ +/NmRdTYV5ZGIKeORkDyl0H0GZl0N3RvAJPr5SBrr4N33mkaIJXKzFYpw9vJwl4CKpdm 8R20yeFfkHa6Nam9a7SbUnEqqgnABhW0u+SLHijdxXlah24M0VlDsOraWofsQQTrV+QZ eRsg== 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; bh=3J5D7TFPdLOULzPBNeyi1SvzT2BqMrZXa+z/CdzZtIM=; b=M6Bm5vpbGi5Jv0Q31ytd7joxcb0iuUFCcaKoRh/j1dXPxUZ0ga6+MGqLLIJjta2ZSD pnfc1ILZDNA/Mvl3VOqRJ6m5s0rgEx6BvQNcaV6Qa0xIhb4uCTnx4WI3v/iJAWi2YLK0 TRnaSICMOfMQ72KWp6mD2vS5KA7NpG2X23oWu1WjF1wc3md+XxllszwG2X3N4se/fwJ5 mk6vsoPri8SzSoT4S+CElIDiAJcFNxhFOkZZlIjt5/uIWNbomh+5I5oVw/LEN+2UnwZM R/qOF0JuN0ENYVhr0qKCo+BYCuSPBN/efTVM+YdLfKxP1+2Cl2S5A6sd787bYqLkcS1X kX4w== X-Gm-Message-State: ANhLgQ3yQxx7nDGx8LwhleSdt/iLbfpy+0C+6usgXggx/gfF1m+Bu++u v7+g3NRjcQ3j3q2niRUv6vEpiA== X-Google-Smtp-Source: ADFU+vvYHp69x8cjJEuUYsdZkVTQw4Jsd5iDSbEKq9GwrHOkknRn5Cp3ZtnlosKXSpZEaclNmUhxRw== X-Received: by 2002:aa7:988f:: with SMTP id r15mr27219764pfl.252.1585006197027; Mon, 23 Mar 2020 16:29:57 -0700 (PDT) Received: from kaaira-HP-Pavilion-Notebook ([103.113.213.154]) by smtp.gmail.com with ESMTPSA id d206sm13816336pfd.160.2020.03.23.16.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 16:29:56 -0700 (PDT) From: Kaaira Gupta To: libcamera-devel@lists.libcamera.org, Kieran Bingham , Helen Koike , Vaishali Thakkar Cc: Kaaira Gupta Date: Tue, 24 Mar 2020 04:58:59 +0530 Message-Id: <20200323232901.29169-2-kgupta@es.iitr.ac.in> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200323232901.29169-1-kgupta@es.iitr.ac.in> References: <20200323232901.29169-1-kgupta@es.iitr.ac.in> Subject: [libcamera-devel] [PATCH 1/3] libcamera: pipeline: Replace resize() with erase() in validate() 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-List-Received-Date: Mon, 23 Mar 2020 23:29:58 -0000 Replace .resize() with .erase() in validate() calls in all pipelines, because resize() calls default constructor StreamConfiguration() when it tries to increase the size. Signed-off-by: Kaaira Gupta Reviewed-by: Jacopo Mondi --- src/libcamera/pipeline/ipu3/ipu3.cpp | 9 +++++++-- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 8 ++++++-- src/libcamera/pipeline/uvcvideo.cpp | 8 ++++++-- src/libcamera/pipeline/vimc.cpp | 8 ++++++-- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 1b44460..7feb44c 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -298,9 +298,14 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate() if (config_.empty()) return Invalid; - /* Cap the number of entries to the available streams. */ + /* + * Cap the number of entries to the available streams. + * Use erase() instead of resize() because resize() uses default constructor + * when it increases config_'s size, which we wish to avoid. + */ + if (config_.size() > 2) { - config_.resize(2); + config_.erase(config_.begin() + 2, config_.end()); status = Adjusted; } diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 2f909ce..04b0ed3 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -447,9 +447,13 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate() if (config_.empty()) return Invalid; - /* Cap the number of entries to the available streams. */ + /* + * Cap the number of entries to the available streams. + * Use erase() instead of resize() because resize() uses default constructor + * when it increases config_'s size, which we wish to avoid. + */ if (config_.size() > 1) { - config_.resize(1); + config_.erase(config_.begin() + 1, config_.end()); status = Adjusted; } diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index ffbddf2..462eae2 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -97,9 +97,13 @@ CameraConfiguration::Status UVCCameraConfiguration::validate() if (config_.empty()) return Invalid; - /* Cap the number of entries to the available streams. */ + /* + * Cap the number of entries to the available streams. + * Use erase() instead of resize() because resize() uses default constructor + * when it increases config_'s size, which we wish to avoid. + */ if (config_.size() > 1) { - config_.resize(1); + config_.erase(config_.begin() + 1, config_.end()); status = Adjusted; } diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index b04a972..4c991ff 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -123,9 +123,13 @@ CameraConfiguration::Status VimcCameraConfiguration::validate() if (config_.empty()) return Invalid; - /* Cap the number of entries to the available streams. */ + /* + * Cap the number of entries to the available streams. + * Use erase() instead of resize() because resize() uses default constructor + * when it increases config_'s size, which we wish to avoid. + */ if (config_.size() > 1) { - config_.resize(1); + config_.erase(config_.begin() + 1, config_.end()); status = Adjusted; }