From patchwork Wed Apr 21 04:23:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 12024 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 83D89BDB17 for ; Wed, 21 Apr 2021 04:24:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 424D068856; Wed, 21 Apr 2021 06:24:08 +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="We9cpFK0"; dkim-atps=neutral Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 86626602C3 for ; Wed, 21 Apr 2021 06:24:06 +0200 (CEST) Received: by mail-pf1-x42e.google.com with SMTP id p67so22523014pfp.10 for ; Tue, 20 Apr 2021 21:24:06 -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=2ahqEEkbk0IO54qh9kBPBbYxJzeWa4xWg0+E7yMfngo=; b=We9cpFK0U/7LdWasytMKLoX1Gy0+j0JUEAmPdFT4rn43Vpa5ynER8uUEC7NvqAWW7y Nhd7JA3MMYaIWtzDFY/zQmxUI8Kp++MTJzGyuWLjWwECaJ6eA8w1UQOXJo+oITzmvtyG 7LuE8bhHsp5JWIv7UHZTKR2DM4ePK0OHrtxsc= 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=2ahqEEkbk0IO54qh9kBPBbYxJzeWa4xWg0+E7yMfngo=; b=PL7IfAty3AoFP7ffUiPXQx5FbQ0QRTSqJgVvhhXvW+gXxs0bKPuqKgRDsyG3CLGFuv GbXp2nGWCmiujLygSk+OjVOhvFHpEJ84YAk7qcf1VGTgxmGATsBIXH/km960MiIiVsAq JQesfiuGfCovGICmlO+ZKTAk+zwdlXlFsrVL3EjGgfE6emGX2K5okdT8hOsSgQbd7qEX PgwFRNF9GE7D+3XjalFdYbv6Eys8uk8Bnd/7GqK/onXTZc9xJ/YW+dvmGeCMGyGk6RNL bBmGIVV2BD8SJt4ZREN7VRaM5KlXshKoIxUQo2JEczeNdCTft2mqQaoDVZ9PLEUNVefq k5Lw== X-Gm-Message-State: AOAM533/p6CpVSmHGXxMIGs2nuxduPUQbPIenFnef/gmnx/ramLaOwDe dtxjt2I/eMczwWnwVjXi5PbmrxGm+lhBtw== X-Google-Smtp-Source: ABdhPJw5G9yb8tGK3V8PZYLmr0o56+um0LdVyF0UWHJiHfq3AhwqjNpruxvwoQv+XyPbxnGu497ZDA== X-Received: by 2002:a17:90b:302:: with SMTP id ay2mr8796379pjb.84.1618979044956; Tue, 20 Apr 2021 21:24:04 -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.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 21:24:04 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 21 Apr 2021 13:23:46 +0900 Message-Id: <20210421042346.312854-8-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 7/7] android: CameraDevice: Report queried test pattern modes 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" Report test pattern modes obtained by Camera::controls(). Signed-off-by: Hirokazu Honda --- src/android/camera_device.cpp | 46 ++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 3d5b5f24..a96bc09b 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1090,12 +1090,50 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() staticMetadata_->addEntry(ANDROID_SENSOR_ORIENTATION, &orientation_, 1); - std::vector testPatterModes = { - ANDROID_SENSOR_TEST_PATTERN_MODE_OFF, + const auto &testPatternsInfo = + controlsInfo.find(&controls::draft::TestPatternMode); + std::vector testPatternModes = { + ANDROID_SENSOR_TEST_PATTERN_MODE_OFF }; + if (testPatternsInfo != controlsInfo.end()) { + const auto &values = testPatternsInfo->second.values(); + if (!values.empty()) { + testPatternModes.clear(); + for (const auto &value : values) { + int aValue = -1; + switch (value.get()) { + case controls::draft::TestPatternModeOff: + aValue = ANDROID_SENSOR_TEST_PATTERN_MODE_OFF; + break; + case controls::draft::TestPatternModeSolidColor: + aValue = ANDROID_SENSOR_TEST_PATTERN_MODE_SOLID_COLOR; + break; + case controls::draft::TestPatternModeColorBars: + aValue = ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS; + break; + case controls::draft::TestPatternModeColorBarsFadeToGray: + aValue = ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS_FADE_TO_GRAY; + break; + case controls::draft::TestPatternModePn9: + aValue = ANDROID_SENSOR_TEST_PATTERN_MODE_PN9; + break; + case controls::draft::TestPatternModeCustom1: + aValue = ANDROID_SENSOR_TEST_PATTERN_MODE_CUSTOM1; + break; + default: + LOG(HAL, Error) + << "Unknown test pattern mode: " + << value.get(); + continue; + } + + testPatternModes.push_back(aValue); + } + } + } staticMetadata_->addEntry(ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES, - testPatterModes.data(), - testPatterModes.size()); + testPatternModes.data(), + testPatternModes.size()); uint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN; staticMetadata_->addEntry(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,