{"id":14169,"url":"https://patchwork.libcamera.org/api/patches/14169/?format=json","web_url":"https://patchwork.libcamera.org/patch/14169/","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":"<20211018132923.476242-9-umang.jain@ideasonboard.com>","date":"2021-10-18T13:29:20","name":"[libcamera-devel,08/11] android: camera_device: Use abortRequest() instead of open-coding it","commit_ref":null,"pull_url":null,"state":"superseded","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/14169/mbox/","series":[{"id":2636,"url":"https://patchwork.libcamera.org/api/series/2636/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2636","date":"2021-10-18T13:29:12","name":"android: Overhaul request handling","version":1,"mbox":"https://patchwork.libcamera.org/series/2636/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14169/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14169/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 AE3A5C323E\n\tfor ;\n\tMon, 18 Oct 2021 13:29:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4837D68F5D;\n\tMon, 18 Oct 2021 15:29:47 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 56EF568F58\n\tfor ;\n\tMon, 18 Oct 2021 15:29:45 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.238.109.14])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6A6E11C15;\n\tMon, 18 Oct 2021 15:29:44 +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=\"viEW46Lr\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634563785;\n\tbh=AcD+9yLKYUS53pk5mqhL69DvZzcXSQtmyGNQIKFQlDA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=viEW46Lr7hnHtakgBlAUrzFYeWr2K/fZW0O8fIxCIsz5KzrI+edt2SlAwKj6NiPWD\n\tcrZPX1gICagrih04ZnYC7QskDNytxSjruARKRfuzjEU8PBPHyMpXSBcfyKTtWBIaVV\n\tS+8wuo1mquXAekZQ/ZWxft0R8Vb1fk5iuWpT9AkM=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 18 Oct 2021 18:59:20 +0530","Message-Id":"<20211018132923.476242-9-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20211018132923.476242-1-umang.jain@ideasonboard.com>","References":"<20211018132923.476242-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 08/11] 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 \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 cd9e9fe2..216f29c2 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -831,6 +831,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@@ -1111,21 +1116,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","08/11"]}