{"id":16901,"url":"https://patchwork.libcamera.org/api/patches/16901/?format=json","web_url":"https://patchwork.libcamera.org/patch/16901/","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":"<20220802102943.3221109-3-chenghaoyang@google.com>","date":"2022-08-02T10:29:36","name":"[libcamera-devel,v4,2/9] ipu3: Allow only one camera being started","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"940fe45d7b89cd2e65893df3dd61598444329797","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16901/mbox/","series":[{"id":3357,"url":"https://patchwork.libcamera.org/api/series/3357/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3357","date":"2022-08-02T10:29:34","name":"Use two imgus in ipu3 pipeline handler","version":4,"mbox":"https://patchwork.libcamera.org/series/3357/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16901/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16901/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 557FBC3276\n\tfor ;\n\tTue, 2 Aug 2022 10:29:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B7C316330E;\n\tTue, 2 Aug 2022 12:29:54 +0200 (CEST)","from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com\n\t[IPv6:2607:f8b0:4864:20::52b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BD22F603E7\n\tfor ;\n\tTue, 2 Aug 2022 12:29:53 +0200 (CEST)","by mail-pg1-x52b.google.com with SMTP id bh13so11996132pgb.4\n\tfor ;\n\tTue, 02 Aug 2022 03:29:53 -0700 (PDT)","from chenghaoyang-low.c.googlers.com.com\n\t(231.137.80.34.bc.googleusercontent.com. [34.80.137.231])\n\tby smtp.gmail.com with ESMTPSA id\n\tt15-20020a170902e84f00b0016db88f69a2sm1955128plg.141.2022.08.02.03.29.50\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 02 Aug 2022 03:29:51 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659436194;\n\tbh=K+d5Jo6cNsZjUngIlCIyJUfRNsIoGQk31HD1Z6KeIJ0=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=TIiPR2MF6bz+mk1Mt2dBIpyY7i3q4cQjQNtSuLzDAiPWFO69dgxrDlfm+pLpg0570\n\tHwOSlHYFzDsDrUODZ/nZ1HTTYohdTR6/3PzmKRQWbkAaCF6tQUxf8M7Htp+O0bsHJ9\n\tm4ckG6BhV/BKkTWA9Vd0aLcwj3w5XjIzLJZnKUlQ5T+BlZcCeCcJAfm9otgb7G8EJ8\n\taysq9AdHXInJrWgRmeesPsToQ0CTMliguxDXKljujwlasYNe4wbHWzCy7apmkYVmki\n\tQyZLlQ6gyNFCh2d8Q5kY15wIoXt1Wy9NvVlnFGGG+K3GdHmV/qdl930sNknOaSF1kW\n\t8YQhrwDF9ytpw==","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=AEuPodY8SqK4FTOvnbJG9NYQfsr6wvmyDvFxGw5IoUs=;\n\tb=Yu1+A24UVJvubefo9indYLi9H/wJrHrRHHetheIwJyb1i58MlOHpujAe1/j2Ik6Yhr\n\t4g0FPYPLjOhfhDpnF3O5iCAaQqykJEbQWOj9bah13rfF58m/5SA8NNJU0wH3V5wNQxZF\n\t2/NQ1UofnWoR1tlPXtrmRrCoQWpF/ztCftF2s="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"Yu1+A24U\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\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=AEuPodY8SqK4FTOvnbJG9NYQfsr6wvmyDvFxGw5IoUs=;\n\tb=UInPYUeSBjR1ztttwudzBDi9Oxsy2Aewj0Zh1zG8fmqtOl9VJoIAn7F3znvSft63sl\n\tAcg7uAdDxQxsIhOGtvHVoAdOg5p76p+Bdtjn8DILOI1rQUAU4nMO/BGWvn4EVc+xK4iL\n\tYdfLihN/eeqe1XXk2Gtyy6QkP3OhQqfFh4awCAwN7WsB2cZItHbv7s+cJCodBGVgLZ08\n\t1sxtYDL/EEo/fFj+0aisjLd5n6eAlZNXg7+TM5G3rcgst81rPM2heTD6huGIH1H9oEAK\n\tahfRV+jzRq1hmImWfM8bkyn+zMUCSThYZFgYbdnBVqI/Q3FxjhMEtJHs5KBuyLa+Q/f/\n\tO7IA==","X-Gm-Message-State":"AJIora/O5ZJt9rLG5VPMX6Nb5hx48CGdSqzwZ6MDKnOctJrp1bZ1CH6D\n\tqoJMr8d45YBhsek/qkZSiDKUApfUoihE+w==","X-Google-Smtp-Source":"AGRyM1sY0reyi3e5V+naC6d9rQ0vJiNdr5F6VyTLQBNLiiIYfdSLCjL9pQmDWRg4xzEaOU2HL7tjhw==","X-Received":"by 2002:a63:4847:0:b0:419:c8f4:4f88 with SMTP id\n\tx7-20020a634847000000b00419c8f44f88mr16081361pgk.603.1659436191773; \n\tTue, 02 Aug 2022 03:29:51 -0700 (PDT)","X-Google-Original-From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 2 Aug 2022 10:29:36 +0000","Message-Id":"<20220802102943.3221109-3-chenghaoyang@google.com>","X-Mailer":"git-send-email 2.37.1.455.g008518b4e5-goog","In-Reply-To":"<20220802102943.3221109-1-chenghaoyang@google.com>","References":"<20220802102943.3221109-1-chenghaoyang@google.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 2/9] ipu3: Allow only one camera being\n\tstarted","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","From":"Harvey Yang via libcamera-devel ","Reply-To":"Harvey Yang ","Cc":"Harvey Yang ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Harvey Yang \n\nAs we hardly have use cases/applications that need both cameras at the\nsame time, this patch adds a rule that only one camera can be started\none time. This also allows the following patches that use both imgus to\nprocess frames from one single camera.\n\nSigned-off-by: Harvey Yang \n---\n include/libcamera/internal/pipeline_handler.h | 5 ++++\n src/libcamera/camera.cpp | 11 ++++++++\n src/libcamera/pipeline/ipu3/ipu3.cpp | 18 +++++++++++++\n src/libcamera/pipeline_handler.cpp | 26 +++++++++++++++++++\n 4 files changed, 60 insertions(+)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex c3e4c258..8277ceda 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -55,6 +55,9 @@ public:\n \tvirtual int exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t\t std::vector> *buffers) = 0;\n \n+\tvirtual bool acquire(Camera *camera);\n+\tvirtual void release(Camera *camera);\n+\n \tvirtual int start(Camera *camera, const ControlList *controls) = 0;\n \tvoid stop(Camera *camera);\n \tbool hasPendingRequests(const Camera *camera) const;\n@@ -76,6 +79,8 @@ protected:\n \n \tCameraManager *manager_;\n \n+\tstd::set acquiredCameras_;\n+\n private:\n \tvoid mediaDeviceDisconnected(MediaDevice *media);\n \tvirtual void disconnect();\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 713543fd..a31f8769 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -826,6 +826,8 @@ int Camera::exportFrameBuffers(Stream *stream,\n * \\return 0 on success or a negative error code otherwise\n * \\retval -ENODEV The camera has been disconnected from the system\n * \\retval -EBUSY The camera is not free and can't be acquired by the caller\n+ * \\retval -EUSERS The maximum number of cameras that can be opened concurrently\n+ * were opened already\n */\n int Camera::acquire()\n {\n@@ -845,6 +847,14 @@ int Camera::acquire()\n \t\treturn -EBUSY;\n \t}\n \n+\tif (!d->pipe_->acquire(this)) {\n+\t\tLOG(Camera, Info)\n+\t\t\t<< \"The maximum number of cameras that can be opened\"\n+\t\t\t \"concurrently were opened already\";\n+\t\td->pipe_->unlock();\n+\t\treturn -EUSERS;\n+\t}\n+\n \td->setState(Private::CameraAcquired);\n \n \treturn 0;\n@@ -873,6 +883,7 @@ int Camera::release()\n \tif (ret < 0)\n \t\treturn ret == -EACCES ? -EBUSY : ret;\n \n+\td->pipe_->release(this);\n \td->pipe_->unlock();\n \n \td->setState(Private::CameraAvailable);\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex fd989e61..091a40e1 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -141,6 +141,8 @@ public:\n \tint exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t std::vector> *buffers) override;\n \n+\tbool acquire(Camera *camera) override;\n+\n \tint start(Camera *camera, const ControlList *controls) override;\n \tvoid stopDevice(Camera *camera) override;\n \n@@ -763,8 +765,24 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)\n \treturn 0;\n }\n \n+bool PipelineHandlerIPU3::acquire(Camera *camera) {\n+\t/*\n+\t * Enforce that only a single camera can be used at a time to use both\n+\t * ImgUs on the camera, so that StillCapture stream can adopt another\n+\t * set of configuration.\n+\t */\n+\tif (!acquiredCameras_.empty())\n+\t\treturn false;\n+\n+\treturn PipelineHandler::acquire(camera);\n+\n+}\n+\n int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] const ControlList *controls)\n {\n+\tif (acquiredCameras_.empty() || *acquiredCameras_.begin() != camera)\n+\t\treturn -EUSERS;\n+\n \tIPU3CameraData *data = cameraData(camera);\n \tCIO2Device *cio2 = &data->cio2_;\n \tImgUDevice *imgu = data->imgu_;\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 7ebd76ad..fff9ee59 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -270,6 +270,32 @@ void PipelineHandler::unlock()\n * otherwise\n */\n \n+/**\n+ * \\fn PipelineHandler::acquire()\n+ * \\brief Check if \\a camera can be acquired and supported with the current\n+ * pipeline handler usage. If \\a camera has already been acquired (by the same\n+ * or another process), return false.\n+ * \\param[in] camera The camera\n+ */\n+bool PipelineHandler::acquire(Camera *camera)\n+{\n+\tif (acquiredCameras_.find(camera) != acquiredCameras_.end())\n+\t\treturn false;\n+\n+\tacquiredCameras_.emplace(camera);\n+\treturn true;\n+}\n+\n+/**\n+ * \\fn PipelineHandler::release()\n+ * \\brief Release exclusive access to \\a camera\n+ * \\param[in] camera The camera\n+ */\n+void PipelineHandler::release(Camera *camera)\n+{\n+\tacquiredCameras_.erase(camera);\n+}\n+\n /**\n * \\fn PipelineHandler::start()\n * \\brief Start capturing from a group of streams\n","prefixes":["libcamera-devel","v4","2/9"]}