From patchwork Tue Aug 4 11:31:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9180 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com 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 44CEBBD86F for ; Tue, 4 Aug 2020 11:31:23 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0FA3B6042B; Tue, 4 Aug 2020 13:31:23 +0200 (CEST) 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="LO9XGvvB"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 31E16603C9 for ; Tue, 4 Aug 2020 13:31:21 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D0776564; Tue, 4 Aug 2020 13:31:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1596540675; bh=V3gffTspTv+bDMskl0HkcS8BKrtK4W1B6GIy+yS7nHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LO9XGvvBJuclo2LuOaZzivPC8a2Wi8V2YppRTJDejL43smZGCnZ6j4zAsNUIn+KMW sQfH8fKta6YQG3NEBMpKeVjEXsfyelDa1P32sRXSu/0eiITMW37/2aKNC0CBptivz4 g82rKr7GHsIT41oK+Su+6Il1YgOmUHSc7bqk10VY= From: Kieran Bingham To: libcamera devel Date: Tue, 4 Aug 2020 12:31:07 +0100 Message-Id: <20200804113107.127257-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200804113107.127257-1-kieran.bingham@ideasonboard.com> References: <20200804113107.127257-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] android: camera_metadata: Report storage usages 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 the actual usage of the containers used for camera_metadata. This is particularly useful whilst we require manual pre-allocation of the correctly determined size requirements. Signed-off-by: Kieran Bingham --- src/android/camera_device.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 42b08cfc5fed..1a6ad81c6282 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -844,6 +844,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() availableResultKeys.data(), availableResultKeys.size()); + LOG(HAL, Debug) << "StaticMetadata usage: " << staticMetadata_->usage(); + if (!staticMetadata_->isValid()) { LOG(HAL, Error) << "Failed to construct static metadata"; delete staticMetadata_; @@ -947,6 +949,8 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type) requestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1); + LOG(HAL, Debug) << "requestTemplate usage: " << requestTemplate->usage(); + if (!requestTemplate->isValid()) { LOG(HAL, Error) << "Failed to construct request template"; delete requestTemplate; @@ -1483,6 +1487,8 @@ std::unique_ptr CameraDevice::getResultMetadata(int frame_number resultMetadata->addEntry(ANDROID_STATISTICS_SCENE_FLICKER, &scene_flicker, 1); + LOG(HAL, Debug) << "resultMetadata usage: " << resultMetadata->usage(); + /* * Return the result metadata pack even is not valid: get() will return * nullptr.