From patchwork Mon Jun 7 01:14:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 12499 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 794C1C320B for ; Mon, 7 Jun 2021 01:14:19 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3EC706892D; Mon, 7 Jun 2021 03:14:19 +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="a6WkK9dd"; dkim-atps=neutral Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6EB3268931 for ; Mon, 7 Jun 2021 03:14:17 +0200 (CEST) Received: by mail-pj1-x1031.google.com with SMTP id i22so8847624pju.0 for ; Sun, 06 Jun 2021 18:14:17 -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=hqu8pksEUVvipvwGZ2F8p2REk5PKW/IuLTrKzsk2/go=; b=a6WkK9ddx0XgdFAnaL+lD4BfuoULMdt+8uy1dgq9bMGe5lfxjEOW/WHJy9bepcqJYD Kl0NPQ6soPOXG9yguwWXZUKHTvTDL3HOP/TwX2Wc1bZg2Ur9Gew8JYQSGv7s4B7SJNwW x4ZFdm5f+HL202AJN7aBC1XNPAAB2l57hcrNI= 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=hqu8pksEUVvipvwGZ2F8p2REk5PKW/IuLTrKzsk2/go=; b=WTSUGefdI0Sd0+vcCHYXlNhfsB5eB1nuern9dZqPNuX4rRgbUESo2DGwZRvC/3ou3z zrDr0m55InFAr1yi9O1aVcaTQoP57TLu6TYV4QLmbx5lg78HO/PPsY7A5ECh9ZBomvKL 9L1x2uv9jaTwbP41a6xywESfVmCQevbqIqaFcXQCg7FTN802GRccHxvYg/hWF08GHH6y GpFpFAiLQQbsogH2cHyyEVW8YiXHcAohqqWrD01Zfb0UJNPjd6UIvBMOL27fmqOuaEF6 Nf/13++IbI7Sh3C4XIg4yIe2hwK3iFqC+gA+/3FaMtCPLgEVu9YsrEwXw0MyjypvzPjD HZPw== X-Gm-Message-State: AOAM533PX0I7s3ilo3PnfH0cHHqprxsNvF4BwKkFK2G4ifVcRg7ovJOQ Yj6MK7PGEo6WjRowPnXJdMlnBWCXYVcu3lcb X-Google-Smtp-Source: ABdhPJw9243EclzvWVMwGIPT4VMQixng9SPb2Q95E8NEqAE3mNIVRP+ZEMDPbN5l745cnfHUVcAp7Q== X-Received: by 2002:a17:90b:e8a:: with SMTP id fv10mr26508620pjb.160.1623028455801; Sun, 06 Jun 2021 18:14:15 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:6eb1:2d91:79ee:2043]) by smtp.gmail.com with ESMTPSA id h12sm7303655pgn.54.2021.06.06.18.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Jun 2021 18:14:15 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Mon, 7 Jun 2021 10:14:02 +0900 Message-Id: <20210607011402.55331-6-hiroh@chromium.org> X-Mailer: git-send-email 2.32.0.rc1.229.g3e70b5a671-goog In-Reply-To: <20210607011402.55331-1-hiroh@chromium.org> References: <20210607011402.55331-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v7 6/6] 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 to the Android camera stack the list of supported test pattern modes constructed by inspecting the values reported by libcamera through the controls::draft::TestPatternMode control. Signed-off-by: Hirokazu Honda Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/android/camera_device.cpp | 51 ++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index fe332ec3..5e961003 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1083,11 +1083,56 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() staticMetadata_->addEntry(ANDROID_SENSOR_ORIENTATION, orientation_); - std::vector testPatterModes = { - ANDROID_SENSOR_TEST_PATTERN_MODE_OFF, + std::vector testPatternModes = { + ANDROID_SENSOR_TEST_PATTERN_MODE_OFF }; + const auto &testPatternsInfo = + controlsInfo.find(&controls::draft::TestPatternMode); + if (testPatternsInfo != controlsInfo.end()) { + const auto &values = testPatternsInfo->second.values(); + ASSERT(!values.empty()); + for (const auto &value : values) { + switch (value.get()) { + case controls::draft::TestPatternModeOff: + /* + * ANDROID_SENSOR_TEST_PATTERN_MODE_OFF is + * already in testPatternModes. + */ + break; + + case controls::draft::TestPatternModeSolidColor: + testPatternModes.push_back( + ANDROID_SENSOR_TEST_PATTERN_MODE_SOLID_COLOR); + break; + + case controls::draft::TestPatternModeColorBars: + testPatternModes.push_back( + ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS); + break; + + case controls::draft::TestPatternModeColorBarsFadeToGray: + testPatternModes.push_back( + ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS_FADE_TO_GRAY); + break; + + case controls::draft::TestPatternModePn9: + testPatternModes.push_back( + ANDROID_SENSOR_TEST_PATTERN_MODE_PN9); + break; + + case controls::draft::TestPatternModeCustom1: + /* We don't support this yet. */ + break; + + default: + LOG(HAL, Error) << "Unknown test pattern mode: " + << value.get(); + continue; + } + } + } staticMetadata_->addEntry(ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES, - testPatterModes); + testPatternModes); uint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN; staticMetadata_->addEntry(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,