From patchwork Tue Jul 21 22:01:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 8912 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 DAC48C2E68 for ; Tue, 21 Jul 2020 22:01:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4FD0560943; Wed, 22 Jul 2020 00:01:37 +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="HYzu6UXY"; 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 E585C6093F for ; Wed, 22 Jul 2020 00:01:32 +0200 (CEST) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BAD281229; Wed, 22 Jul 2020 00:01:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1595368891; bh=aR6pbl4HFuMWZ97vbpuQwd2fSxu2mCwmBotV6PbSAf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HYzu6UXYO3bbiXXxsELF4itXM1xsUzL8R1dLSM8OeR5g3BA4I69GmuI5XxSVMzB2r HSEbGsOOuO3pE2bZcmAJSsN7Pv0EdYroMzvSKMLN+x0TSVfxXuCDW9PAiRcce281Xf IHS5HjagRbrGSoZlJ6DDj4zoSNhDUW6ZDlvXX8FQ= From: Kieran Bingham To: libcamera devel Date: Tue, 21 Jul 2020 23:01:23 +0100 Message-Id: <20200721220126.202065-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200721220126.202065-1-kieran.bingham@ideasonboard.com> References: <20200721220126.202065-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 3/6] android: camera_device: Add ANDROID_JPEG_MAX_SIZE 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" Provide a key for ANDROID_JPEG_MAX_SIZE. The value of 13MB is currently arbitrary, but taken from the USB Camera HAL in CrOS platform2: // android.jpeg update_static(ANDROID_JPEG_MAX_SIZE, int32_t{13 << 20}); update_request(ANDROID_JPEG_QUALITY, uint8_t{90}); update_request(ANDROID_JPEG_THUMBNAIL_QUALITY, uint8_t{90}); update_request(ANDROID_JPEG_ORIENTATION, int32_t{0}); Note: The metadata entries/size updates are probably wrong, and should be automated. Signed-off-by: Kieran Bingham --- src/android/camera_device.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 3f3d7857f0ab..56652ac57676 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -407,10 +407,10 @@ std::tuple CameraDevice::calculateStaticMetadataSize() { /* * \todo Keep this in sync with the actual number of entries. - * Currently: 50 entries, 647 bytes of static metadata + * Currently: 51 entries, 651 bytes of static metadata */ - uint32_t numEntries = 50; - uint32_t byteSize = 647; + uint32_t numEntries = 51; + uint32_t byteSize = 651; /* * Calculate space occupation in bytes for dynamically built metadata @@ -567,6 +567,9 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() availableThumbnailSizes.data(), availableThumbnailSizes.size()); + int32_t jpegMaxSize = 13 << 20; /* 13631488 from USB HAL */ + staticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE, &jpegMaxSize, 1); + /* Sensor static metadata. */ int32_t pixelArraySize[] = { 2592, 1944, @@ -773,6 +776,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() ANDROID_CONTROL_AWB_LOCK_AVAILABLE, ANDROID_CONTROL_AVAILABLE_MODES, ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES, + ANDROID_JPEG_MAX_SIZE, ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE, ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE, ANDROID_SENSOR_INFO_SENSITIVITY_RANGE,