[{"id":17537,"web_url":"https://patchwork.libcamera.org/comment/17537/","msgid":"","date":"2021-06-15T00:17:04","subject":"Re: [libcamera-devel] [PATCH] android: camera_device: Check if a\n\trequest is configured on processCaptureRequest()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Mon, Jun 14, 2021 at 03:03:03PM +0900, Hirokazu Honda wrote:\n> Adds a check on processCaptureRequest() if a given capture\n\ns/Adds/Add/\n\n> request contains a camera stream that has been configured.\n> \n> Signed-off-by: Hirokazu Honda \n> ---\n> src/android/camera_device.cpp | 111 +++++++++++++++++++++-------------\n> src/android/camera_device.h | 1 +\n> 2 files changed, 70 insertions(+), 42 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 3adb657b..5b182257 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -260,48 +260,6 @@ void sortCamera3StreamConfigs(std::vector &unsortedConfigs,\n> \tunsortedConfigs = sortedConfigs;\n> }\n> \n> -bool isValidRequest(camera3_capture_request_t *camera3Request)\n> -{\n> -\tif (!camera3Request) {\n> -\t\tLOG(HAL, Error) << \"No capture request provided\";\n> -\t\treturn false;\n> -\t}\n> -\n> -\tif (!camera3Request->num_output_buffers ||\n> -\t !camera3Request->output_buffers) {\n> -\t\tLOG(HAL, Error) << \"No output buffers provided\";\n> -\t\treturn false;\n> -\t}\n> -\n> -\tfor (uint32_t i = 0; i < camera3Request->num_output_buffers; i++) {\n> -\t\tconst camera3_stream_buffer_t &outputBuffer =\n> -\t\t\tcamera3Request->output_buffers[i];\n> -\t\tif (!outputBuffer.buffer || !(*outputBuffer.buffer)) {\n> -\t\t\tLOG(HAL, Error) << \"Invalid native handle\";\n> -\t\t\treturn false;\n> -\t\t}\n> -\n> -\t\tconst native_handle_t *handle = *outputBuffer.buffer;\n> -\t\tconstexpr int kNativeHandleMaxFds = 1024;\n> -\t\tif (handle->numFds < 0 || handle->numFds > kNativeHandleMaxFds) {\n> -\t\t\tLOG(HAL, Error)\n> -\t\t\t\t<< \"Invalid number of fds (\" << handle->numFds\n> -\t\t\t\t<< \") in buffer \" << i;\n> -\t\t\treturn false;\n> -\t\t}\n> -\n> -\t\tconstexpr int kNativeHandleMaxInts = 1024;\n> -\t\tif (handle->numInts < 0 || handle->numInts > kNativeHandleMaxInts) {\n> -\t\t\tLOG(HAL, Error)\n> -\t\t\t\t<< \"Invalid number of ints (\" << handle->numInts\n> -\t\t\t\t<< \") in buffer \" << i;\n> -\t\t\treturn false;\n> -\t\t}\n> -\t}\n> -\n> -\treturn true;\n> -}\n> -\n> const char *rotationToString(int rotation)\n> {\n> \tswitch (rotation) {\n> @@ -1934,6 +1892,75 @@ void CameraDevice::abortRequest(camera3_capture_request_t *request)\n> \tcallbacks_->process_capture_result(callbacks_, &result);\n> }\n> \n> +bool CameraDevice::isValidRequest(camera3_capture_request_t *camera3Request) const\n> +{\n> +\tif (!camera3Request) {\n> +\t\tLOG(HAL, Error) << \"No capture request provided\";\n> +\t\treturn false;\n> +\t}\n> +\n> +\tif (!camera3Request->num_output_buffers ||\n> +\t !camera3Request->output_buffers) {\n> +\t\tLOG(HAL, Error) << \"No output buffers provided\";\n> +\t\treturn false;\n> +\t}\n> +\n> +\t// configureStreams() is not called or fails.\n\nC-style comments please. I'd also write it as\n\n\t/* configureStreams() hasn't been called or has failed. */\n\n> +\tif (streams_.empty() || !config_) {\n> +\t\tLOG(HAL, Error) << \"No stream is configured\";\n> +\t\treturn false;\n> +\t}\n> +\n> +\tfor (uint32_t i = 0; i < camera3Request->num_output_buffers; i++) {\n> +\t\tconst camera3_stream_buffer_t &outputBuffer =\n> +\t\t\tcamera3Request->output_buffers[i];\n> +\t\tif (!outputBuffer.buffer || !(*outputBuffer.buffer)) {\n> +\t\t\tLOG(HAL, Error) << \"Invalid native handle\";\n> +\t\t\treturn false;\n> +\t\t}\n> +\n> +\t\tconst native_handle_t *handle = *outputBuffer.buffer;\n> +\t\tconstexpr int kNativeHandleMaxFds = 1024;\n> +\t\tif (handle->numFds < 0 || handle->numFds > kNativeHandleMaxFds) {\n> +\t\t\tLOG(HAL, Error)\n> +\t\t\t\t<< \"Invalid number of fds (\" << handle->numFds\n> +\t\t\t\t<< \") in buffer \" << i;\n> +\t\t\treturn false;\n> +\t\t}\n> +\n> +\t\tconstexpr int kNativeHandleMaxInts = 1024;\n> +\t\tif (handle->numInts < 0 || handle->numInts > kNativeHandleMaxInts) {\n> +\t\t\tLOG(HAL, Error)\n> +\t\t\t\t<< \"Invalid number of ints (\" << handle->numInts\n> +\t\t\t\t<< \") in buffer \" << i;\n> +\t\t\treturn false;\n> +\t\t}\n> +\n> +\t\tconst camera3_stream *camera3Stream = outputBuffer.stream;\n> +\t\tif (!camera3Stream)\n> +\t\t\treturn false;\n> +\n> +\t\tconst CameraStream *cameraStream =\n> +\t\t\tstatic_cast(camera3Stream->priv);\n> +\n> +\t\tbool found = false;\n> +\t\tfor (const CameraStream &stream : streams_) {\n> +\t\t\tif (&stream == cameraStream) {\n> +\t\t\t\tfound = true;\n> +\t\t\t\tbreak;\n> +\t\t\t}\n> +\t\t}\n\nAnother option could be\n\n auto found = std::find_if(streams_.begin(), streams_.end(),\n [&](const CameraStream &stream) {\n return &stream == cameraStream;\n });\n if (found == streams_.end()) {\n\t\t\tLOG(HAL, Error)\n\t\t\t\t<< \"No corresponding configured stream found\";\n\t\t\treturn false;\n\t\t};\n\n(with a new #include ). Up to you.\n\nReviewed-by: Laurent Pinchart \n\n> +\n> +\t\tif (!found) {\n> +\t\t\tLOG(HAL, Error)\n> +\t\t\t\t<< \"No corresponding configured stream found\";\n> +\t\t\treturn false;\n> +\t\t}\n> +\t}\n> +\n> +\treturn true;\n> +}\n> +\n> int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)\n> {\n> \tif (!isValidRequest(camera3Request))\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 4aadb27c..4d9c904d 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -109,6 +109,7 @@ private:\n> \n> \tlibcamera::FrameBuffer *createFrameBuffer(const buffer_handle_t camera3buffer);\n> \tvoid abortRequest(camera3_capture_request_t *request);\n> +\tbool isValidRequest(camera3_capture_request_t *request) const;\n> \tvoid notifyShutter(uint32_t frameNumber, uint64_t timestamp);\n> \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream,\n> \t\t\t camera3_error_msg_code code);","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 0EEFBBD78E\n\tfor ;\n\tTue, 15 Jun 2021 00:17:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7F75D68931;\n\tTue, 15 Jun 2021 02:17:26 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3B7A7687EF\n\tfor ;\n\tTue, 15 Jun 2021 02:17:25 +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 B56FF45E;\n\tTue, 15 Jun 2021 02:17:24 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"MW7WxF+o\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1623716244;\n\tbh=bvWu6CdQhcCKfPOCxo+1d+12XV7mNcgn7hOkdIscDZQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=MW7WxF+o0Bie4uqE7LtfnfJNnnf3CBpehOJJKYf3ckbvJOxbBZVsveuS3TsFc5YnX\n\t9sbvjYwyQLjezpEfq9L2ZedydyH8k9sdG0kP0iNfBpGLr+qt7rGIS5/5s4IGVWkqmX\n\tzAdkYqoYWJO5pypWr4OcuNF9WRehevjzhp1EpOjg=","Date":"Tue, 15 Jun 2021 03:17:04 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210614060303.2405391-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210614060303.2405391-1-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH] android: camera_device: Check if a\n\trequest is configured on processCaptureRequest()","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]