[{"id":16042,"web_url":"https://patchwork.libcamera.org/comment/16042/","msgid":"","date":"2021-03-30T03:25:41","subject":"Re: [libcamera-devel] [PATCH v3] android: camera_device: Add null\n\tcheck for ScalerCrop control","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Phi-Bang,\n\nOn Mon, Mar 29, 2021 at 07:40:46PM +0200, Phi-Bang Nguyen wrote:\n> The ScalerCrop control does not contain the null check which can\n> cause the camera HAL crash at boot. Fix it.\n> \n> Fixes: 31a1a628cd0e (\"android: camera_device: Register MAX_DIGITAL_ZOOM\")\n> \n> Signed-off-by: Phi-Bang Nguyen \n\nReviewed-by: Laurent Pinchart \n\nAnd pushed. Thank you :-)\n\n> ---\n> src/android/camera_device.cpp | 40 ++++++++++++++++++-----------------\n> 1 file changed, 21 insertions(+), 19 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index ae693664..9ec261c3 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1095,26 +1095,28 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t}\n> \n> \t/* Scaler static metadata. */\n> -\t{\n> -\t\t/*\n> -\t\t * \\todo The digital zoom factor is a property that depends\n> -\t\t * on the desired output configuration and the sensor frame size\n> -\t\t * input to the ISP. This information is not available to the\n> -\t\t * Android HAL, not at initialization time at least.\n> -\t\t *\n> -\t\t * As a workaround rely on pipeline handlers initializing the\n> -\t\t * ScalerCrop control with the camera default configuration and\n> -\t\t * use the maximum and minimum crop rectangles to calculate the\n> -\t\t * digital zoom factor.\n> -\t\t */\n> -\t\tconst auto info = controlsInfo.find(&controls::ScalerCrop);\n> -\t\tRectangle min = info->second.min().get();\n> -\t\tRectangle max = info->second.max().get();\n> -\t\tfloat maxZoom = std::min(1.0f * max.width / min.width,\n> -\t\t\t\t\t 1.0f * max.height / min.height);\n> -\t\tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n> -\t\t\t\t\t &maxZoom, 1);\n> +\n> +\t/*\n> +\t * \\todo The digital zoom factor is a property that depends\n> +\t * on the desired output configuration and the sensor frame size\n> +\t * input to the ISP. This information is not available to the\n> +\t * Android HAL, not at initialization time at least.\n> +\t *\n> +\t * As a workaround rely on pipeline handlers initializing the\n> +\t * ScalerCrop control with the camera default configuration and\n> +\t * use the maximum and minimum crop rectangles to calculate the\n> +\t * digital zoom factor.\n> +\t */\n> +\tfloat maxZoom = 1.0f;\n> +\tconst auto scalerCrop = controlsInfo.find(&controls::ScalerCrop);\n> +\tif (scalerCrop != controlsInfo.end()) {\n> +\t\tRectangle min = scalerCrop->second.min().get();\n> +\t\tRectangle max = scalerCrop->second.max().get();\n> +\t\tmaxZoom = std::min(1.0f * max.width / min.width,\n> +\t\t\t\t 1.0f * max.height / min.height);\n> \t}\n> +\tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n> +\t\t\t\t &maxZoom, 1);\n> \n> \tstd::vector availableStreamConfigurations;\n> \tavailableStreamConfigurations.reserve(streamConfigurations_.size() * 4);","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 279E6C32EA\n\tfor ;\n\tTue, 30 Mar 2021 03:26:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8247268782;\n\tTue, 30 Mar 2021 05:26:27 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6AF7D602D7\n\tfor ;\n\tTue, 30 Mar 2021 05:26:26 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DC6E3292;\n\tTue, 30 Mar 2021 05:26:25 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"NFX1rUjG\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1617074786;\n\tbh=HIIXNUWMTG2CzvsSKndCDhIfvvivL/1c7ln+bQYh98E=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=NFX1rUjG8jyW14CTQqJ+vTkhE/+Kss7Y/RHMaeN3loPX4fvGa6dR9Zw63/J+WR6t+\n\tjenCxgJZdigHUDPVxXlJ6DKO8kUY9qQCPKiJqgkoGMZB8CSdkuCYng+BZ1I2O7Dmqj\n\tT8noQexKVrAtwLc4lCknG9o4W/N0cYNWbHD73750=","Date":"Tue, 30 Mar 2021 06:25:41 +0300","From":"Laurent Pinchart ","To":"Phi-Bang Nguyen ","Message-ID":"","References":"\n\t<20210329174046.86591-1-pnguyen@baylibre.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210329174046.86591-1-pnguyen@baylibre.com>","Subject":"Re: [libcamera-devel] [PATCH v3] android: camera_device: Add null\n\tcheck for ScalerCrop control","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]