[{"id":21932,"web_url":"https://patchwork.libcamera.org/comment/21932/","msgid":"<164125240948.682966.10246328186418190467@Monstersaurus>","date":"2022-01-03T23:26:49","subject":"Re: [libcamera-devel] [PATCH] android: capabilities: Add static\n\twhite level","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Paul Elder (2021-12-21 05:15:49)\n> Plumb SENSOR_INFO_WHITE_LEVEL into the static metadata. Get the\n> information from the maximum bit depth raw format supported by the\n> sensor. Since we hardcode accept only 16-bit raw formats, take that\n\n\"Since we hardcode that we only accept 16-bit ....\"\n\n> hardcoded value. While at it, save the hardcoded value in a variable so\n> that if it is changed in the future this gets updated automatically.\n> \n> Note that nothing is added to the capability detector, as white level\n> will always be added to the static metadata. Add a comment to document\n> it.\n> \n> Bug: https://bugs.libcamera.org/show_bug.cgi?id=49\n> Signed-off-by: Paul Elder \n> ---\n> src/android/camera_capabilities.cpp | 9 ++++++++-\n> src/android/camera_capabilities.h | 1 +\n> 2 files changed, 9 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\n> index d5e79057..bc62a928 100644\n> --- a/src/android/camera_capabilities.cpp\n> +++ b/src/android/camera_capabilities.cpp\n> @@ -447,6 +447,7 @@ int CameraCapabilities::initialize(std::shared_ptr camera,\n> orientation_ = orientation;\n> facing_ = facing;\n> minISO_ = minISO;\n> + rawBitDepth_ = 16;\n> rawStreamAvailable_ = false;\n> maxFrameDuration_ = 0;\n> \n> @@ -667,7 +668,7 @@ int CameraCapabilities::initializeStreamConfigurations()\n> const PixelFormatInfo &info = PixelFormatInfo::info(mappedFormat);\n> switch (info.colourEncoding) {\n> case PixelFormatInfo::ColourEncodingRAW:\n> - if (info.bitsPerPixel != 16)\n> + if (info.bitsPerPixel != rawBitDepth_)\n\nShould this print a warning to say we're ignoring non-16-bit raw\nformats?\n\nOtherwise, seems ok, on the assumption that we don't currently care\nabout non-16-bit raw support.\n\n\nReviewed-by: Kieran Bingham \n\n> continue;\n> \n> rawStreamAvailable_ = true;\n> @@ -1335,6 +1336,12 @@ int CameraCapabilities::initializeStaticMetadata()\n> staticMetadata_->addEntry(ANDROID_SENSOR_INFO_MAX_FRAME_DURATION,\n> maxFrameDuration_);\n> \n> + /* This is required for FULL. */\n> + int whiteLevel = (1 << rawBitDepth_) - 1;\n> + staticMetadata_->addEntry(ANDROID_SENSOR_INFO_WHITE_LEVEL,\n> + whiteLevel);\n> + availableCharacteristicsKeys_.insert(ANDROID_SENSOR_INFO_WHITE_LEVEL);\n> +\n> /* Statistics static metadata. */\n> uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n> staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,\n> diff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h\n> index 7f554c63..2e6595fb 100644\n> --- a/src/android/camera_capabilities.h\n> +++ b/src/android/camera_capabilities.h\n> @@ -71,6 +71,7 @@ private:\n> int facing_;\n> int orientation_;\n> int minISO_;\n> + unsigned int rawBitDepth_;\n> bool rawStreamAvailable_;\n> int64_t maxFrameDuration_;\n> camera_metadata_enum_android_info_supported_hardware_level hwLevel_;\n> -- \n> 2.27.0\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 2579DBF415\n\tfor ;\n\tMon, 3 Jan 2022 23:26:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8AB0060868;\n\tTue, 4 Jan 2022 00:26:53 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A9D6B604F8\n\tfor ;\n\tTue, 4 Jan 2022 00:26:52 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 39107501;\n\tTue, 4 Jan 2022 00:26:52 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"tGzes2p1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1641252412;\n\tbh=q90xWFQ2lfRr9FbciVqZ/nsP6249OH1CuvnJck32plE=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=tGzes2p16uuCADpp4PPrzyxQgTkNIiT7jHPit6VKNov2HfdsNqf9/W7ouNbHRre0D\n\ttDv0KKoLrc/gsu1LThhumA0wQdwo2ye0fR0unQ65IW3TTENCjfINhfEu22ygBpnWv4\n\trAik+dt2iLhl7wQyQn2pcBewnwDIatKM0huP5Eso=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20211221051549.2647005-1-paul.elder@ideasonboard.com>","References":"<20211221051549.2647005-1-paul.elder@ideasonboard.com>","From":"Kieran Bingham ","To":"Paul Elder ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 03 Jan 2022 23:26:49 +0000","Message-ID":"<164125240948.682966.10246328186418190467@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH] android: capabilities: Add static\n\twhite level","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]