From patchwork Mon Feb 1 08:56:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 11100 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 38B5AC33BB for ; Mon, 1 Feb 2021 08:57:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B7BDD683F7; Mon, 1 Feb 2021 09:57:03 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="bX1VJwuw"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 849B960307 for ; Mon, 1 Feb 2021 09:57:02 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DA089443; Mon, 1 Feb 2021 09:57:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1612169822; bh=rZVRaCVNDEAimCFV/5Myf7EEPb+ZhWthG0HdKB86K8E=; h=From:To:Cc:Subject:Date:From; b=bX1VJwuwU3PwFSeIXEofyMvXjSQ/cUULyojEWdDbq8CO+pDjyY15y2cWY2r1YiRIt bzR8+q/8VVXBWgO4ybDjOBkfQgucBtLvy3xlNOTmKqAl4LiEb82OlNsfPIF8YrF4RX lFACP8IQKv29w5OlKNqLSP7yYqqCsG2BvdZfHiCA= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Mon, 1 Feb 2021 17:56:51 +0900 Message-Id: <20210201085651.21281-1-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] android: camera_device: Set default max frame duration 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" Set the max frame duration in the static metadata to 1 second. This allows the following CTS test to pass: - android.hardware.camera2.cts.SurfaceViewPreviewTest#testPreviewFpsRange Signed-off-by: Paul Elder --- src/android/camera_device.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index c1025e81..a71af540 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -705,10 +705,10 @@ std::tuple CameraDevice::calculateStaticMetadataSize() { /* * \todo Keep this in sync with the actual number of entries. - * Currently: 53 entries, 782 bytes of static metadata + * Currently: 54 entries, 794 bytes of static metadata */ - uint32_t numEntries = 53; - uint32_t byteSize = 810; + uint32_t numEntries = 54; + uint32_t byteSize = 822; /* * Calculate space occupation in bytes for dynamically built metadata @@ -932,6 +932,10 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() &exposureTimeRange, 2); } + int64_t maxFrameDuration = 1000000000; + staticMetadata_->addEntry(ANDROID_SENSOR_INFO_MAX_FRAME_DURATION, + &maxFrameDuration, 1); + staticMetadata_->addEntry(ANDROID_SENSOR_ORIENTATION, &orientation_, 1); std::vector testPatterModes = { @@ -1179,6 +1183,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() ANDROID_SENSOR_INFO_SENSITIVITY_RANGE, ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT, ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE, + ANDROID_SENSOR_INFO_MAX_FRAME_DURATION, ANDROID_SENSOR_ORIENTATION, ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES, ANDROID_SENSOR_INFO_PHYSICAL_SIZE,