{"id":12110,"url":"https://patchwork.libcamera.org/api/patches/12110/?format=json","web_url":"https://patchwork.libcamera.org/patch/12110/","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":"<20210426083830.2965095-2-hiroh@chromium.org>","date":"2021-04-26T08:38:28","name":"[libcamera-devel,v3,1/3] android: CameraDevice: Separate CaptureRequest from Camera3RequestDescriptor","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"13b7455ff4a335ff28dde2644e8d4a55cdf3c9b6","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12110/mbox/","series":[{"id":1976,"url":"https://patchwork.libcamera.org/api/series/1976/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1976","date":"2021-04-26T08:38:27","name":"Support HAL3 API flush","version":3,"mbox":"https://patchwork.libcamera.org/series/1976/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12110/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12110/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 EB437BDC99\n\tfor ;\n\tMon, 26 Apr 2021 08:38:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AE2B2688B6;\n\tMon, 26 Apr 2021 10:38:41 +0200 (CEST)","from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com\n\t[IPv6:2607:f8b0:4864:20::102c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 02614605BE\n\tfor ;\n\tMon, 26 Apr 2021 10:38:39 +0200 (CEST)","by mail-pj1-x102c.google.com with SMTP id\n\tj6-20020a17090adc86b02900cbfe6f2c96so4858657pjv.1\n\tfor ;\n\tMon, 26 Apr 2021 01:38:38 -0700 (PDT)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:2:a407:b8c2:d8b:a449])\n\tby smtp.gmail.com with ESMTPSA id\n\te18sm4873728pgr.8.2021.04.26.01.38.36\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 26 Apr 2021 01:38:37 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"iw/S7OvC\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=4zlrEa4ha9TdBM0OP0ylkX7d3YyewkL0ZRW5RuTbEl4=;\n\tb=iw/S7OvC0lVn6MD3L0B/Y57TT4dGYDGxq/EyCO9MpQQswgLAtaiT6Lj4ci4bcMZA/f\n\tr8zFt0kiWiTP+QJdxYR7relu9O9S6OlMCeIvZxerCXYEpFpROE4leneH1SIpes7sinpT\n\tjyhp2wAdxrSKLQPDFzfpbgIckeGVjdatiLw/g=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=4zlrEa4ha9TdBM0OP0ylkX7d3YyewkL0ZRW5RuTbEl4=;\n\tb=JUJKrLxU7QghJr1c7/MIiA7Z+XHzBpijTb9PGQ5BrsgY1RF9JiyTA7xqOBVAhQ7G3X\n\tONtE5gXYlfeL4+KZsC7njF+Pr/VfTPpUovVtSNafHwIDifyYoPGOYiiUW9Id1eI4XIEB\n\tea0vKI1Hq6weN4WaUDgX6C2kwd8bZh2eAoE9RHJbwK+UNKJPQWwZB7z/7Hjei69PHlWo\n\tfKLOfvtPOpukLDKG/i85eti3jOKKEgXXCCVwTciLnH6ezIvEIOD7cvVlg45NmhwExXSA\n\tzYKrXHP33emPdtY7VijRQpebnLbVqlWi2A86f7Lk8JzY0Bpd21I8um0V4yNMWRvzTNxu\n\tnyaw==","X-Gm-Message-State":"AOAM532mKN4QxRHq9FtppGambnasA7PoHJ+Chor5V7vjIjhcsKKlYzlC\n\t6MLVJ+BH9DEVMTsdEL0v5dhbWrAm+DZVmg==","X-Google-Smtp-Source":"ABdhPJxIFGC84LDul1+MTQdgLlhCPyYy9N2dFEofIKHGcasRHuo1VG+6OddqACwO1BgXuI4P1/10gQ==","X-Received":"by 2002:a17:90a:6585:: with SMTP id\n\tk5mr19612685pjj.40.1619426317458; \n\tMon, 26 Apr 2021 01:38:37 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 26 Apr 2021 17:38:28 +0900","Message-Id":"<20210426083830.2965095-2-hiroh@chromium.org>","X-Mailer":"git-send-email 2.31.1.498.g6c1eba8ee3d-goog","In-Reply-To":"<20210426083830.2965095-1-hiroh@chromium.org>","References":"<20210426083830.2965095-1-hiroh@chromium.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 1/3] android: CameraDevice: Separate\n\tCaptureRequest from Camera3RequestDescriptor","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Camera3RequestDescriptors can be destroyed in stop(). Since\nCamera3RequestDescriptor owns CaptureRequest, the CaptureRequest\nshould not be used anymore. But requestComplete() cannot check if\nthe associated descriptor with a request is valid without calling\nCaptureRequest::cookie().\nThis resolves the problem by separating CaptureRequest lifetime\nfrom Camera3RequestDescriptor. Thus CaptureRequest always is\ndestroyed in requestComplete(). This guarantees that a request is\nvalid until requestComplete() is called.\n\nSigned-off-by: Hirokazu Honda \n---\n src/android/camera_device.cpp | 27 +++++++++++++++------------\n src/android/camera_device.h | 9 +++++----\n 2 files changed, 20 insertions(+), 16 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex a71aee2f..b3def04b 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -361,7 +361,8 @@ bool validateCropRotate(const camera3_stream_configuration_t &streamList)\n */\n \n CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n-\tCamera *camera, const camera3_capture_request_t *camera3Request)\n+\tconst camera3_capture_request_t *camera3Request, CaptureRequest *request)\n+\t: request_(request)\n {\n \tframeNumber_ = camera3Request->frame_number;\n \n@@ -379,12 +380,6 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n \n \t/* Clone the controls associated with the camera3 request. */\n \tsettings_ = CameraMetadata(camera3Request->settings);\n-\n-\t/*\n-\t * Create the CaptureRequest, stored as a unique_ptr<> to tie its\n-\t * lifetime to the descriptor.\n-\t */\n-\trequest_ = std::make_unique(camera);\n }\n \n /*\n@@ -1930,7 +1925,8 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t * The descriptor and the associated memory reserved here are freed\n \t * at request complete time.\n \t */\n-\tCamera3RequestDescriptor descriptor(camera_.get(), camera3Request);\n+\tauto request = std::make_unique(camera_.get());\n+\tCamera3RequestDescriptor descriptor(camera3Request, request.get());\n \n \t/*\n \t * \\todo The Android request model is incremental, settings passed in\n@@ -2013,11 +2009,12 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \tif (ret)\n \t\treturn ret;\n \n-\tworker_.queueRequest(descriptor.request_.get());\n+\tworker_.queueRequest(descriptor.request_);\n \n \t{\n \t\tstd::scoped_lock lock(mutex_);\n \t\tdescriptors_[descriptor.request_->cookie()] = std::move(descriptor);\n+\t\trequests_[request->cookie()] = std::move(request);\n \t}\n \n \treturn 0;\n@@ -2030,15 +2027,21 @@ void CameraDevice::requestComplete(Request *request)\n \tstd::unique_ptr resultMetadata;\n \n \tdecltype(descriptors_)::node_type node;\n+\tstd::unique_ptr captureRequest;\n \t{\n \t\tstd::scoped_lock lock(mutex_);\n-\t\tauto it = descriptors_.find(request->cookie());\n-\t\tif (it == descriptors_.end()) {\n+\t\tauto requestIt = requests_.find(request->cookie());\n+\t\tif (requestIt == requests_.end()) {\n \t\t\tLOG(HAL, Fatal)\n \t\t\t\t<< \"Unknown request: \" << request->cookie();\n-\t\t\tstatus = CAMERA3_BUFFER_STATUS_ERROR;\n \t\t\treturn;\n \t\t}\n+\t\tcaptureRequest = std::move(requestIt->second);\n+\t\trequests_.erase(requestIt);\n+\n+\t\tauto it = descriptors_.find(request->cookie());\n+\t\tif (it == descriptors_.end())\n+\t\t\treturn;\n \n \t\tnode = descriptors_.extract(it);\n \t}\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex c63e8e21..95d77890 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -72,15 +72,15 @@ private:\n \tstruct Camera3RequestDescriptor {\n \t\tCamera3RequestDescriptor() = default;\n \t\t~Camera3RequestDescriptor() = default;\n-\t\tCamera3RequestDescriptor(libcamera::Camera *camera,\n-\t\t\t\t\t const camera3_capture_request_t *camera3Request);\n+\t\tCamera3RequestDescriptor(const camera3_capture_request_t *camera3Request,\n+\t\t\t\t\t CaptureRequest *request);\n \t\tCamera3RequestDescriptor &operator=(Camera3RequestDescriptor &&) = default;\n \n \t\tuint32_t frameNumber_ = 0;\n \t\tstd::vector buffers_;\n \t\tstd::vector> frameBuffers_;\n \t\tCameraMetadata settings_;\n-\t\tstd::unique_ptr request_;\n+\t\tCaptureRequest *request_ = nullptr;\n \t};\n \n \tstruct Camera3StreamConfiguration {\n@@ -127,8 +127,9 @@ private:\n \tstd::map formatsMap_;\n \tstd::vector streams_;\n \n-\tstd::mutex mutex_; /* Protect descriptors_ */\n+\tstd::mutex mutex_; /* Protect descriptors_ and requests_. */\n \tstd::map descriptors_;\n+\tstd::map> requests_;\n \n \tstd::string maker_;\n \tstd::string model_;\n","prefixes":["libcamera-devel","v3","1/3"]}