From patchwork Thu Dec 2 13:21:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 14986 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 3FB62BF415 for ; Thu, 2 Dec 2021 13:21:23 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9232D60592; Thu, 2 Dec 2021 14:21:22 +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="HH6ZOP4N"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 84EF26011A for ; Thu, 2 Dec 2021 14:21:20 +0100 (CET) Received: from perceval.ideasonboard.com (unknown [103.251.226.170]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9651AD8C; Thu, 2 Dec 2021 14:21:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1638451280; bh=t9yQaDa9e7Svv2pYpWB6kI4AJSd1h0tG9EDAJv8+kHA=; h=From:To:Cc:Subject:Date:From; b=HH6ZOP4N7wN8dhoSN7N9hpMzlYVNKjJNQ8uYqaFWaTgTTN8pU9fGiRfjdhA6IyvVO SsX6uH9NUlBLAOfV09wW7rODs91l0rqpG/IPPOnoqLHRTZAnLaFPfqOGtq1NN5mo4d qXAWuQGSix9BtPEO8BNK0oShDXvPhmcDsAjk06zE= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Thu, 2 Dec 2021 18:51:10 +0530 Message-Id: <20211202132110.1067409-1-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH] android: Do not cap those minFrameDuration nearabout 30fps 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" We have some stream resolution which can provide slightly better frame duration than what we cap (i.e. 1/30 fps). The problem with this is CTS complains if the camera goes faster during the test than minFrameDuration reported for that stream. For instance, 1080p minFrameDuration: - Nautilus : 33282000 - Soraka : 33147000 Both are less than capped minFrameDuration (3333333). This patch considers this situation and doesn't cap the minFrameDuration if the hardware can provide frame durations slightly better. The delta considered is 1% only from the cap. Signed-off-by: Umang Jain --- On LIMITED level - no regressions were found : 230/231 pass rate On FULL level - this fixes the test: android.hardware.camera2.cts.SurfaceViewPreviewTest#testPreviewFpsRange --- src/android/camera_capabilities.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index 3e566755..6421456a 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -810,8 +810,17 @@ int CameraCapabilities::initializeStreamConfigurations() * control to be specified for each Request. Defer this * to the in-development configuration API rework. */ - if (minFrameDuration < 1e9 / 30.0) - minFrameDuration = 1e9 / 30.0; + int64_t capMinFrameDuration = 1e9 / 30.0; + if (minFrameDuration < capMinFrameDuration) { + float delta = (capMinFrameDuration - minFrameDuration) * 100 / capMinFrameDuration; + + /* + * If the delta is less than 1%, do not cap the + * frame duration. + */ + if (delta > 0.01) + minFrameDuration = capMinFrameDuration; + } streamConfigurations_.push_back({ res, androidFormat, minFrameDuration, maxFrameDuration,