From patchwork Fri Jun 11 08:42:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 12567 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 3B99AC320B for ; Fri, 11 Jun 2021 08:42:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E5F3F68938; Fri, 11 Jun 2021 10:42:43 +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="DEb8Li22"; dkim-atps=neutral Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B41E668938 for ; Fri, 11 Jun 2021 10:42:41 +0200 (CEST) Received: by mail-pl1-x631.google.com with SMTP id v12so2482526plo.10 for ; Fri, 11 Jun 2021 01:42:41 -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=ISKwOyPLfe/Qtg2gfe2ELFZN2Vcig6j4flu625qxuEg=; b=DEb8Li22r+Q2sJDsmC+MrUFJ5EmljsBT9H0cX3iYX1J37TwGGMxH0gSqJvlJ+nd5uY zay2O1mjXcOfpcu3oKvGepYwneaKPZWMoadt2DxBcmQqM5GFamwU/oVxPhobQsEUvHLD LxULRRSwiamAKjlUT3Mq03pqythnGtCVm1g2Q= 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=ISKwOyPLfe/Qtg2gfe2ELFZN2Vcig6j4flu625qxuEg=; b=Qw7oHAZgyCVuYkPaFANZMbQXJfAyEyaPt6nd0PpdTtSjpIeipObikweFI3kDFyw+K7 xOmztsDf5M6XKTsqXQqPCfd5z3mKJYiEfe9NSQ2WfeYsWjS/mOvGZJc3YolA+FXajW3w ftRVvbGe3pU7wQkKYVrljyM/7cvPt2gBRIskhRL9Xv0R6sjmXcCRWJDr6D1mqSau2qnm XmJ7951lNTNqce8zPH4ZZEP9Iz2mDq7xWtRRIrW6x++PDgKpvhNTzMH0ePvQrr/1L9YT DRDSyHqEOUzm4l/U/wOYYfQUc3UrrRrIWXc4EDMOm6VIIDRuw79HXo/0cjIg8aq7Tjug 2vmw== X-Gm-Message-State: AOAM532DLYX3COQdgiTFAtSPHFjEguZ+i1G56paw1gzTv4zUeqncNfTM s0ZmLYuapwbraIX4Q+TDNN+jM5nhFplXCw== X-Google-Smtp-Source: ABdhPJzSWCsKwLFsxUiJ+i6VxuvJNekYYrOoq3eV6vK0XTTBbkscbR0xr+7mxRE9JajmlERKK/HzyQ== X-Received: by 2002:a17:90a:1b6b:: with SMTP id q98mr8402031pjq.53.1623400960242; Fri, 11 Jun 2021 01:42:40 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:367e:c2e4:d691:eca1]) by smtp.gmail.com with ESMTPSA id 20sm4323542pfi.170.2021.06.11.01.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 01:42:39 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Fri, 11 Jun 2021 17:42:28 +0900 Message-Id: <20210611084228.1830629-5-hiroh@chromium.org> X-Mailer: git-send-email 2.32.0.272.g935e593368-goog In-Reply-To: <20210611084228.1830629-1-hiroh@chromium.org> References: <20210611084228.1830629-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 4/4] android: camera_device: Propagate the requested test pattern mode 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" Propagate the requested test pattern mode to libcamera::Camera through libcamera::Request and also set the android metadata to the test pattern mode contained by the complete Request. Signed-off-by: Hirokazu Honda --- src/android/camera_device.cpp | 50 ++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 5e961003..442c36b1 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1926,16 +1926,57 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor) return 0; /* Translate the Android request settings to libcamera controls. */ + ControlList &controls = descriptor->request_->controls(); camera_metadata_ro_entry_t entry; if (settings.getEntry(ANDROID_SCALER_CROP_REGION, &entry)) { const int32_t *data = entry.data.i32; Rectangle cropRegion{ data[0], data[1], static_cast(data[2]), static_cast(data[3]) }; - ControlList &controls = descriptor->request_->controls(); controls.set(controls::ScalerCrop, cropRegion); } + if (settings.getEntry(ANDROID_SENSOR_TEST_PATTERN_MODE, &entry)) { + const int32_t data = *entry.data.i32; + switch (data) { + case ANDROID_SENSOR_TEST_PATTERN_MODE_OFF: + controls.set(controls::draft::TestPatternMode, + controls::draft::TestPatternModeOff); + break; + + case ANDROID_SENSOR_TEST_PATTERN_MODE_SOLID_COLOR: + controls.set(controls::draft::TestPatternMode, + controls::draft::TestPatternModeSolidColor); + break; + + case ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS: + controls.set(controls::draft::TestPatternMode, + controls::draft::TestPatternModeColorBars); + break; + + case ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS_FADE_TO_GRAY: + controls.set(controls::draft::TestPatternMode, + controls::draft::TestPatternModeColorBarsFadeToGray); + break; + + case ANDROID_SENSOR_TEST_PATTERN_MODE_PN9: + controls.set(controls::draft::TestPatternMode, + controls::draft::TestPatternModePn9); + break; + + case ANDROID_SENSOR_TEST_PATTERN_MODE_CUSTOM1: + controls.set(controls::draft::TestPatternMode, + controls::draft::TestPatternModeCustom1); + break; + + default: + LOG(HAL, Error) + << "Unknown test pattern mode: " << data; + + return -EINVAL; + } + } + return 0; } @@ -2368,6 +2409,13 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons resultMetadata->addEntry(ANDROID_SCALER_CROP_REGION, cropRect); } + if (metadata.contains(controls::draft::TestPatternMode)) { + const int32_t testPatternMode = + metadata.get(controls::draft::TestPatternMode); + resultMetadata->addEntry(ANDROID_SENSOR_TEST_PATTERN_MODE, + testPatternMode); + } + /* * Return the result metadata pack even is not valid: get() will return * nullptr.