From patchwork Wed Apr 21 04:23:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 12019 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 4E531BDB16 for ; Wed, 21 Apr 2021 04:24:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1132268847; Wed, 21 Apr 2021 06:24:01 +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="lC0drX+g"; dkim-atps=neutral Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DE77468847 for ; Wed, 21 Apr 2021 06:23:58 +0200 (CEST) Received: by mail-pg1-x52b.google.com with SMTP id q10so28536910pgj.2 for ; Tue, 20 Apr 2021 21:23:58 -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=oqMdxWFl01BiCkNk8pajo+3bLMuJCJj2thUDkBkDj74=; b=lC0drX+g4lbcTnhYQPm8gj+xNQ/X5/TaTGKkCWpdm1FqaCKbH1NkWuaLla/+mb3N/u qv1eqhoPV+b9Uyr/p5t6gylSqbNMNuXCoCTndHmTjlfPDTB+QITIODc07FLPE6VaMFKW AZfbLgkb481Zf+0Q9kOWpTNzTkCGZgkFb6tbg= 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=oqMdxWFl01BiCkNk8pajo+3bLMuJCJj2thUDkBkDj74=; b=fhibcxGKFzvOOr6qhb0BdkTi7Qe59CGzsuSCvKgQt7m+EnYyQKMBkHM1AVdHSDsBBw zAZ9/UgKE9gJnBaVbZDkB5zL0MA53OFwZkjOzDVKQfZV+r0Q8b7XqDGEgCjPGC/ayrAy mNrfhWovBrNhXyAtLK/XFJzVnaRRcc04q/5IQgbD+S2WD7FhWePJtgsu0tYeT/A17qll qucy1FU0Hr8q7rIoLYukUNdq8tT42k2FuZVwH307/r3yKcAOTXQT+5sz6vRuuNu2Rgnr XjXr1pCJ3Sh1EvBa9P0NMm5rJS/FPg3RU8PYpxKewU6eJwAvtVez0zjNVF26Nhk5lLen svtw== X-Gm-Message-State: AOAM532WN9+iGW5Dj1rrKtxRYkTq2MaRrMWMKBBnV87o3t+3BeDmr1gt Iw7gv1lJp99TBgMI1OZKTYdrpElQDFqTFg== X-Google-Smtp-Source: ABdhPJz56qO+X5XfxXJw/t4qApnh8F5kDLuOFe/be49VRf00IYJeUkay73pYwb3gqeTTKr78G9mucw== X-Received: by 2002:a17:90a:c589:: with SMTP id l9mr8526604pjt.24.1618979037276; Tue, 20 Apr 2021 21:23:57 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:2:7aaa:cbeb:5d87:4ab6]) by smtp.gmail.com with ESMTPSA id z18sm461316pfa.39.2021.04.20.21.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 21:23:56 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 21 Apr 2021 13:23:41 +0900 Message-Id: <20210421042346.312854-3-hiroh@chromium.org> X-Mailer: git-send-email 2.31.1.368.gbe11c130af-goog In-Reply-To: <20210421042346.312854-1-hiroh@chromium.org> References: <20210421042346.312854-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/7] libcamera: Controls: Add ControlTypeMenu 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" This adds control type for v4l2 menu. Signed-off-by: Hirokazu Honda --- include/libcamera/controls.h | 28 ++++++++++++++++++++++++++++ src/libcamera/controls.cpp | 7 +++++++ 2 files changed, 35 insertions(+) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 1a5690a5..357819e7 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -9,6 +9,7 @@ #define __LIBCAMERA_CONTROLS_H__ #include +#include #include #include #include @@ -32,6 +33,28 @@ enum ControlType { ControlTypeString, ControlTypeRectangle, ControlTypeSize, + ControlTypeMenu, +}; + +struct ControlMenu { + uint32_t index; + bool isName = false; + + union { + char name[28]; + int64_t value; + }; + + std::string toString() const + { + std::stringstream ss; + ss << "index: " << index; + if (isName) + ss << "name: " << name; + else + ss << "value: " << value; + return ss.str(); + } }; namespace details { @@ -85,6 +108,11 @@ struct control_type { static constexpr ControlType value = ControlTypeSize; }; +template<> +struct control_type { + static constexpr ControlType value = ControlTypeMenu; +}; + template struct control_type> : public control_type> { }; diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index c58ed394..8ab5ac92 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -60,6 +60,7 @@ static constexpr size_t ControlValueSize[] = { [ControlTypeString] = sizeof(char), [ControlTypeRectangle] = sizeof(Rectangle), [ControlTypeSize] = sizeof(Size), + [ControlTypeMenu] = sizeof(ControlMenu), }; } /* namespace */ @@ -254,6 +255,12 @@ std::string ControlValue::toString() const str += value->toString(); break; } + case ControlTypeMenu: { + const ControlMenu *value = + reinterpret_cast(data); + str += value->toString(); + break; + } case ControlTypeNone: case ControlTypeString: break;