From patchwork Tue Apr 13 06:19:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 11897 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 BFAB1BD224 for ; Tue, 13 Apr 2021 06:19:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7985A68805; Tue, 13 Apr 2021 08:19:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="GtG7BlvA"; dkim-atps=neutral Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F1A4F605AE for ; Tue, 13 Apr 2021 08:19:34 +0200 (CEST) Received: by mail-pj1-x1035.google.com with SMTP id cu16so5920025pjb.4 for ; Mon, 12 Apr 2021 23:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ox+C7Af69yIOx2a+58sLdnlGiHUk+GH4jLb5Jk/KAYI=; b=GtG7BlvASClndtlgXEPc4ucS1Wi/A2uaDWInLDLgcmcDqer0kIaYN3pvb+q17XRr/j s+tsN9qwQFFYQub7elWukqPkfCC4bUp6GJDRtnAr58w2ffQ98XLhBdq/VhOUb5JcAk4m UETZl6+wDKuHZbqTj7k0r2lxOeyErXuwp3trg= 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:mime-version:content-transfer-encoding; bh=Ox+C7Af69yIOx2a+58sLdnlGiHUk+GH4jLb5Jk/KAYI=; b=dRA696e4lCrYZA7psSW0AYMMSyhM/IKoLq9Cpih8hBxg2A1ulMSMUjrTysXPoEaikL Fco2DaKVLoSMAsE72d6US7tJDv/BAgfilpbEftOiZ2RbJ4KeIyd42va8qXHIBG1Nnd1t ZhqRHi+dHLK7cuW1sGUaDSPQsOzoF15iZVf0yIsCV0UToDNWJU8GO6+juEeDddJQTLKK u04ReyzP6XJVnYzO7AunQ6NLhIWGeEc5AnLrNRL1IvlZ8yJQUx1O0wQGQR8ZySuenP8u J6a4fd9kEvLiBiyB8QcjkDl1cmF5VtvM/4j0TOJ2ZcDBjyABVTQ8AhFhjhstZFkCcTe3 Fh/w== X-Gm-Message-State: AOAM533sdSpTvM3LtR9BmPkCmb6/8t9GhaOGN7ztePlbTO0oNWfbzgnn Ba4Sxmf9nLn7WSM/9UOIoewaX6NP/6BQYQ== X-Google-Smtp-Source: ABdhPJy6ef7aLY7cGsGPiXsA7eZpUH2Q8GEoh+zKbOzN4SPhiFy76kKrOajnNZG3vrNifz2bSlQ9eA== X-Received: by 2002:a17:902:708b:b029:e6:77ca:3cb6 with SMTP id z11-20020a170902708bb02900e677ca3cb6mr30759437plk.84.1618294773434; Mon, 12 Apr 2021 23:19:33 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:2:84f5:7981:dfbe:8f02]) by smtp.gmail.com with ESMTPSA id n4sm11666063pfu.45.2021.04.12.23.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 23:19:32 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Tue, 13 Apr 2021 15:19:24 +0900 Message-Id: <20210413061925.3054927-2-hiroh@chromium.org> X-Mailer: git-send-email 2.31.1.295.g9ea45b61b8-goog In-Reply-To: <20210413061925.3054927-1-hiroh@chromium.org> References: <20210413061925.3054927-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] libcamera: V4L2Device: Use std::vector for v4l2_ext_control in setControls() 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The original code uses Variable-Length-Array, which is not officially supported in C++. This replaces the array with std::vector. Reviewed-by: Kieran Bingham --- src/libcamera/v4l2_device.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 78c289c2..8625dde8 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -280,12 +280,11 @@ ControlList V4L2Device::getControls(const std::vector &ids) */ int V4L2Device::setControls(ControlList *ctrls) { - unsigned int count = ctrls->size(); - if (count == 0) + if (ctrls->empty()) return 0; - struct v4l2_ext_control v4l2Ctrls[count]; - memset(v4l2Ctrls, 0, sizeof(v4l2Ctrls)); + std::vector v4l2Ctrls(ctrls->size()); + memset(v4l2Ctrls.data(), 0, v4l2Ctrls.size()); unsigned int i = 0; for (auto &ctrl : *ctrls) { @@ -332,15 +331,15 @@ int V4L2Device::setControls(ControlList *ctrls) struct v4l2_ext_controls v4l2ExtCtrls = {}; v4l2ExtCtrls.which = V4L2_CTRL_WHICH_CUR_VAL; - v4l2ExtCtrls.controls = v4l2Ctrls; - v4l2ExtCtrls.count = count; + v4l2ExtCtrls.controls = v4l2Ctrls.data(); + v4l2ExtCtrls.count = v4l2Ctrls.size(); int ret = ioctl(VIDIOC_S_EXT_CTRLS, &v4l2ExtCtrls); if (ret) { unsigned int errorIdx = v4l2ExtCtrls.error_idx; /* Generic validation error. */ - if (errorIdx == 0 || errorIdx >= count) { + if (errorIdx == 0 || errorIdx >= v4l2Ctrls.size()) { LOG(V4L2, Error) << "Unable to set controls: " << strerror(-ret); return -EINVAL; @@ -349,11 +348,12 @@ int V4L2Device::setControls(ControlList *ctrls) /* A specific control failed. */ LOG(V4L2, Error) << "Unable to set control " << errorIdx << ": " << strerror(-ret); - count = errorIdx - 1; + + v4l2Ctrls.resize(errorIdx); ret = errorIdx; } - updateControls(ctrls, v4l2Ctrls, count); + updateControls(ctrls, v4l2Ctrls.data(), v4l2Ctrls.size()); return ret; }