{"id":531,"url":"https://patchwork.libcamera.org/api/patches/531/?format=json","web_url":"https://patchwork.libcamera.org/patch/531/","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":"<20190206060818.13907-18-laurent.pinchart@ideasonboard.com>","date":"2019-02-06T06:08:08","name":"[libcamera-devel,17/27] libcamera: camera: Add helper to check for exclusive access","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"eb6d9b3021df2f98234aa3288eaa3fdf7b336605","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/531/mbox/","series":[{"id":170,"url":"https://patchwork.libcamera.org/api/series/170/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=170","date":"2019-02-06T06:07:51","name":"Capture frames throught requests","version":1,"mbox":"https://patchwork.libcamera.org/series/170/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/531/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/531/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AA7B56101F\n\tfor ;\n\tWed, 6 Feb 2019 07:08:27 +0100 (CET)","from pendragon.ideasonboard.com (d51A4137F.access.telenet.be\n\t[81.164.19.127])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4DA5B2D7\n\tfor ;\n\tWed, 6 Feb 2019 07:08:27 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1549433307;\n\tbh=Ae3SwmEM8GyAopNtp+dAlcyU3evcdUf6DpcGsF2unv8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=HuEZMh1ORf4aeUc3F3/Wk9tFOvS2tcIhTcMEQ5h0nCcLtaB68z1hNmGEMGmNKpMyY\n\t9ava9FWx/7LxRDEO2fcY3uIDVUsILPsVHu6/BBH7uj2v8ZsroCbua5Gc8IFYcF1vNH\n\tsbC14R8+6JWyS5eRqakBZsqK32p/qDu2le0fu1UQ=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 6 Feb 2019 08:08:08 +0200","Message-Id":"<20190206060818.13907-18-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","In-Reply-To":"<20190206060818.13907-1-laurent.pinchart@ideasonboard.com>","References":"<20190206060818.13907-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 17/27] libcamera: camera: Add helper to\n\tcheck for exclusive access","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 06 Feb 2019 06:08:29 -0000"},"content":"From: Niklas Söderlund \n\nSome operations on the camera requires the application to have exclusive\naccess to the camera. To help check for this in these operations add a\nhelper.\n\nSigned-off-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \nSigned-off-by: Kieran Bingham \nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/camera.h | 1 +\n src/libcamera/camera.cpp | 22 ++++++++++++++++++----\n 2 files changed, 19 insertions(+), 4 deletions(-)","diff":"diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h\nindex bbe2696e837b..36bf1cbb215b 100644\n--- a/include/libcamera/camera.h\n+++ b/include/libcamera/camera.h\n@@ -50,6 +50,7 @@ private:\n \n \tfriend class PipelineHandler;\n \tvoid disconnect();\n+\tint exclusiveAccess();\n \n \tstd::shared_ptr pipe_;\n \tstd::string name_;\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex e8dab6f0bab2..62291d2c9e6c 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -240,6 +240,23 @@ Camera::streamConfiguration(std::vector &streams)\n * \\retval -EINVAL The configuration is not valid\n */\n int Camera::configureStreams(std::map &config)\n+{\n+\tint ret;\n+\n+\tret = exclusiveAccess();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tif (!config.size()) {\n+\t\tLOG(Camera, Error)\n+\t\t\t<< \"Can't configure streams without a configuration\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn pipe_->configureStreams(this, config);\n+}\n+\n+int Camera::exclusiveAccess()\n {\n \tif (disconnected_)\n \t\treturn -ENODEV;\n@@ -247,10 +264,7 @@ int Camera::configureStreams(std::map &config)\n \tif (!acquired_)\n \t\treturn -EACCES;\n \n-\tif (!config.size())\n-\t\treturn -EINVAL;\n-\n-\treturn pipe_->configureStreams(this, config);\n+\treturn 0;\n }\n \n } /* namespace libcamera */\n","prefixes":["libcamera-devel","17/27"]}