{"id":14182,"url":"https://patchwork.libcamera.org/api/patches/14182/?format=json","web_url":"https://patchwork.libcamera.org/patch/14182/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20211019114802.665980-9-umang.jain@ideasonboard.com>","date":"2021-10-19T11:47:58","name":"[libcamera-devel,v2,08/12] android: camera_device: Use abortRequest() instead of open-coding it","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d6c6844c3254d1f61cc2b45f33ef0df4655d46f9","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/14182/mbox/","series":[{"id":2638,"url":"https://patchwork.libcamera.org/api/series/2638/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2638","date":"2021-10-19T11:47:50","name":"android: Overhaul request handling","version":2,"mbox":"https://patchwork.libcamera.org/series/2638/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14182/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14182/checks/","tags":{},"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 C3558C324C\n\tfor ;\n\tTue, 19 Oct 2021 11:48:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 724A468F5A;\n\tTue, 19 Oct 2021 13:48:30 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6BABC68F55\n\tfor ;\n\tTue, 19 Oct 2021 13:48:28 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.251.226.98])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 22D3712A;\n\tTue, 19 Oct 2021 13:48:26 +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=\"VflYM/mQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634644108;\n\tbh=03ro7zyMD+rFVRW+23gsfLgxSj27kpdVUQo5A34z7s4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=VflYM/mQdXDESSt/z2A5m2hnf8nP2d4hclAT8BwWJHx+2nRiZQWqJJoQBDANb2u7m\n\tOFTjDMwN573cc8MX8Z57KxW0IXIdvfRkHqntWDWJNyBDaj6DX66jgs2OUm12Bx+2GJ\n\tD8hBhz7j0LB0LQzjloUIMXeFS2FjKgD5pYgTqlc4=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 19 Oct 2021 17:17:58 +0530","Message-Id":"<20211019114802.665980-9-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20211019114802.665980-1-umang.jain@ideasonboard.com>","References":"<20211019114802.665980-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 08/12] android: camera_device: Use\n\tabortRequest() instead of open-coding it","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\" "},"content":"From: Laurent Pinchart \n\nCall abortRequest() in CameraDevice::requestComplete() instead of\nopen-coding it.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Jacopo Mondi \nReviewed-by: Umang Jain\n---\n src/android/camera_device.cpp | 21 ++++++---------------\n 1 file changed, 6 insertions(+), 15 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 80e11d4b..0bb547ae 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -802,6 +802,11 @@ void CameraDevice::abortRequest(Camera3RequestDescriptor *descriptor) const\n \tnotifyError(descriptor->frameNumber_, nullptr, CAMERA3_MSG_ERROR_REQUEST);\n \n \tfor (auto &buffer : descriptor->buffers_) {\n+\t\t/*\n+\t\t * Signal to the framework it has to handle fences that have not\n+\t\t * been waited on by setting the release fence to the acquire\n+\t\t * fence value.\n+\t\t */\n \t\tbuffer.buffer.release_fence = buffer.buffer.acquire_fence;\n \t\tbuffer.buffer.acquire_fence = -1;\n \t\tbuffer.buffer.status = CAMERA3_BUFFER_STATUS_ERROR;\n@@ -1083,21 +1088,7 @@ void CameraDevice::requestComplete(Request *request)\n \t\t\t\t<< \" not successfully completed: \"\n \t\t\t\t<< request->status();\n \n-\t\tnotifyError(descriptor->frameNumber_, nullptr,\n-\t\t\t CAMERA3_MSG_ERROR_REQUEST);\n-\n-\t\tfor (auto &buffer : descriptor->buffers_) {\n-\t\t\t/*\n-\t\t\t * Signal to the framework it has to handle fences that\n-\t\t\t * have not been waited on by setting the release fence\n-\t\t\t * to the acquire fence value.\n-\t\t\t */\n-\t\t\tbuffer.buffer.release_fence = buffer.buffer.acquire_fence;\n-\t\t\tbuffer.buffer.acquire_fence = -1;\n-\t\t\tbuffer.buffer.status = CAMERA3_BUFFER_STATUS_ERROR;\n-\t\t}\n-\n-\t\tdescriptor->status_ = Camera3RequestDescriptor::Status::Error;\n+\t\tabortRequest(descriptor);\n \t\tsendCaptureResults();\n \n \t\treturn;\n","prefixes":["libcamera-devel","v2","08/12"]}