[{"id":2110,"web_url":"https://patchwork.libcamera.org/comment/2110/","msgid":"<20190702002428.GK9228@bigcity.dyn.berto.se>","date":"2019-07-02T00:24:28","subject":"Re: [libcamera-devel] [PATCH v4 09/13] libcamera: pipeline: vimc:\n\tAdd controls support","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2019-07-01 23:15:00 +0300, Laurent Pinchart wrote:\n> Implement control support in the VIMC pipeline handler by dynamically\n> querying the V4L2 device for the supported V4L2 controls and populating\n> the list of camera controls accordingly.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> Changes since v3:\n> \n> - Fixed error checking when setting controls\n> ---\n> src/libcamera/pipeline/vimc.cpp | 107 ++++++++++++++++++++++++++++++--\n> 1 file changed, 102 insertions(+), 5 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index 6833213650dc..f8a58be060bb 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -7,19 +7,24 @@\n> \n> #include \n> #include \n> +#include \n> +#include \n> \n> #include \n> +#include \n> #include \n> #include \n> #include \n> #include \n> \n> +#include \"camera_sensor.h\"\n> #include \"device_enumerator.h\"\n> #include \"ipa_manager.h\"\n> #include \"log.h\"\n> #include \"media_device.h\"\n> #include \"pipeline_handler.h\"\n> #include \"utils.h\"\n> +#include \"v4l2_controls.h\"\n> #include \"v4l2_videodevice.h\"\n> \n> namespace libcamera {\n> @@ -36,12 +41,15 @@ public:\n> \n> \t~VimcCameraData()\n> \t{\n> +\t\tdelete sensor_;\n> \t\tdelete video_;\n> \t}\n> \n> +\tint init(MediaDevice *media);\n> \tvoid bufferReady(Buffer *buffer);\n> \n> \tV4L2VideoDevice *video_;\n> +\tCameraSensor *sensor_;\n> \tStream stream_;\n> };\n> \n> @@ -75,6 +83,8 @@ public:\n> \tbool match(DeviceEnumerator *enumerator) override;\n> \n> private:\n> +\tint processControls(VimcCameraData *data, Request *request);\n> +\n> \tVimcCameraData *cameraData(const Camera *camera)\n> \t{\n> \t\treturn static_cast(\n> @@ -215,6 +225,47 @@ void PipelineHandlerVimc::stop(Camera *camera)\n> \tPipelineHandler::stop(camera);\n> }\n> \n> +int PipelineHandlerVimc::processControls(VimcCameraData *data, Request *request)\n> +{\n> +\tV4L2ControlList controls;\n> +\n> +\tfor (auto it : request->controls()) {\n> +\t\tconst ControlInfo *ci = it.first;\n> +\t\tControlValue &value = it.second;\n> +\n> +\t\tswitch (ci->id()) {\n> +\t\tcase Brightness:\n> +\t\t\tcontrols.add(V4L2_CID_BRIGHTNESS, value.getInt());\n> +\t\t\tbreak;\n> +\n> +\t\tcase Contrast:\n> +\t\t\tcontrols.add(V4L2_CID_CONTRAST, value.getInt());\n> +\t\t\tbreak;\n> +\n> +\t\tcase Saturation:\n> +\t\t\tcontrols.add(V4L2_CID_SATURATION, value.getInt());\n> +\t\t\tbreak;\n> +\n> +\t\tdefault:\n> +\t\t\tbreak;\n> +\t\t}\n> +\t}\n> +\n> +\tfor (const V4L2Control &ctrl : controls)\n> +\t\tLOG(VIMC, Debug)\n> +\t\t\t<< \"Setting control 0x\"\n> +\t\t\t<< std::hex << std::setw(8) << ctrl.id() << std::dec\n> +\t\t\t<< \" to \" << ctrl.value();\n> +\n> +\tint ret = data->sensor_->setControls(&controls);\n> +\tif (ret) {\n> +\t\tLOG(VIMC, Error) << \"Failed to set controls: \" << ret;\n> +\t\treturn ret < 0 ? ret : -EINVAL;\n> +\t}\n> +\n> +\treturn ret;\n> +}\n> +\n> int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n> {\n> \tVimcCameraData *data = cameraData(camera);\n> @@ -226,7 +277,11 @@ int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n> \t\treturn -ENOENT;\n> \t}\n> \n> -\tint ret = data->video_->queueBuffer(buffer);\n> +\tint ret = processControls(data, request);\n> +\tif (ret < 0)\n> +\t\treturn ret;\n> +\n> +\tret = data->video_->queueBuffer(buffer);\n> \tif (ret < 0)\n> \t\treturn ret;\n> \n> @@ -262,12 +317,9 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \tstd::unique_ptr data = utils::make_unique(this);\n> \n> \t/* Locate and open the capture video node. */\n> -\tdata->video_ = new V4L2VideoDevice(media->getEntityByName(\"Raw Capture 1\"));\n> -\tif (data->video_->open())\n> +\tif (data->init(media))\n> \t\treturn false;\n> \n> -\tdata->video_->bufferReady.connect(data.get(), &VimcCameraData::bufferReady);\n> -\n> \t/* Create and register the camera. */\n> \tstd::set streams{ &data->stream_ };\n> \tstd::shared_ptr camera = Camera::create(this, \"VIMC Sensor B\",\n> @@ -277,6 +329,51 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \treturn true;\n> }\n> \n> +int VimcCameraData::init(MediaDevice *media)\n> +{\n> +\tint ret;\n> +\n> +\t/* Create and open the video device and the camera sensor. */\n> +\tvideo_ = new V4L2VideoDevice(media->getEntityByName(\"Raw Capture 1\"));\n> +\tif (video_->open())\n> +\t\treturn -ENODEV;\n> +\n> +\tvideo_->bufferReady.connect(this, &VimcCameraData::bufferReady);\n> +\n> +\tsensor_ = new CameraSensor(media->getEntityByName(\"Sensor B\"));\n> +\tret = sensor_->init();\n> +\tif (ret)\n> +\t\treturn ret;\n> +\n> +\t/* Initialise the supported controls. */\n> +\tconst V4L2ControlInfoMap &controls = sensor_->controls();\n> +\tfor (const auto &ctrl : controls) {\n> +\t\tunsigned int v4l2Id = ctrl.first;\n> +\t\tconst V4L2ControlInfo &info = ctrl.second;\n> +\t\tControlId id;\n> +\n> +\t\tswitch (v4l2Id) {\n> +\t\tcase V4L2_CID_BRIGHTNESS:\n> +\t\t\tid = Brightness;\n> +\t\t\tbreak;\n> +\t\tcase V4L2_CID_CONTRAST:\n> +\t\t\tid = Contrast;\n> +\t\t\tbreak;\n> +\t\tcase V4L2_CID_SATURATION:\n> +\t\t\tid = Saturation;\n> +\t\t\tbreak;\n> +\t\tdefault:\n> +\t\t\tcontinue;\n> +\t\t}\n> +\n> +\t\tcontrolInfo_.emplace(std::piecewise_construct,\n> +\t\t\t\t std::forward_as_tuple(id),\n> +\t\t\t\t std::forward_as_tuple(id, info.min(), info.max()));\n> +\t}\n> +\n> +\treturn 0;\n> +}\n> +\n> void VimcCameraData::bufferReady(Buffer *buffer)\n> {\n> \tRequest *request = queuedRequests_.front();\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lj1-x242.google.com (mail-lj1-x242.google.com\n\t[IPv6:2a00:1450:4864:20::242])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8EDC860C2B\n\tfor ;\n\tTue, 2 Jul 2019 02:24:29 +0200 (CEST)","by mail-lj1-x242.google.com with SMTP id r9so15056150ljg.5\n\tfor ;\n\tMon, 01 Jul 2019 17:24:29 -0700 (PDT)","from localhost (customer-145-14-112-32.stosn.net. [145.14.112.32])\n\tby smtp.gmail.com with ESMTPSA id\n\ty127sm2637625lff.34.2019.07.01.17.24.28\n\t(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);\n\tMon, 01 Jul 2019 17:24:28 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=T4+ZbxEhVZ6nUH6z3W8ceO/1TtNb2EVSUr4IufpGJoY=;\n\tb=BNGfbaCGcPBMIVrx5IaXChzhKFUfK6kyQEMS2gZ3/cQH7zcANl6H9ebK+dpr9ijOrb\n\tUSDPL3wFPsI06bDKLZWqiMYzbPM+xgJPa2SR0zVOdoeu2Wit9CicpBq58QtqBHGvp4fO\n\tBHs5c7u95/lo4bUlEYcCVyBMMsShPJi85YhbW/dPXp3QtJI6j3Vz581Gr+ZDBwfcDpv/\n\tq/Ck29Qp5Yot8SJ1iRh7oXOQALQ7bwHMPPgSNZE4RNVC3FPSZ+G0KpTbh6BYoI5GtPcP\n\tVyMOooPV9QVBsaudkHlcHF5So6Q8yM/TQlp6MitjrrWsIH3FBfAYVw1H5gYyEpedARGH\n\toLmg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=T4+ZbxEhVZ6nUH6z3W8ceO/1TtNb2EVSUr4IufpGJoY=;\n\tb=gljnFvCe7sJMwo06KGZKvDxTeKiFTy3rkpbNJn6UV9gz21sMZFWHFLyC4kRwowgIsp\n\tt/qR/qgr6mURraNVuuW8eT+Oq9obuTW12VdyfSm0rBLxRcgSVBRwceLI8s6VNIUTO9jl\n\tzl8O16q4ouVznWngCyHf9JcFeRJEEcpDVUYPPanK3Zx00/yw3nMfLTZ+7KuMYnp9KSRe\n\t8YGEQm7FjHwO+QIW3K8GsPtd5Swq8fqhjM9zF755H5Pt5KWclNnuAvbwVrm1kTO+kFy8\n\tXgAOU8Frhny4l9KkrH2gywvU6UTnrMTUE6Bc964XulgW5TwAl5P7nBG8exAlMtABJB4k\n\t9ImA==","X-Gm-Message-State":"APjAAAW8A0P0m8huKhA8jfI7y70ocksO4dDHc5KdLpFA6MrNgANFplKi\n\tUqwgnOjvlni5MSsHbCHRbg6WyLjCIjs=","X-Google-Smtp-Source":"APXvYqz089wUK1zKsMCFXaDc4odTCtuGX3oyzIX0ORxWzS3tIQ05MFoh6TOZcW+KaKwwY9mBpSvltA==","X-Received":"by 2002:a2e:81c1:: with SMTP id\n\ts1mr15275940ljg.103.1562027069103; \n\tMon, 01 Jul 2019 17:24:29 -0700 (PDT)","Date":"Tue, 2 Jul 2019 02:24:28 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190702002428.GK9228@bigcity.dyn.berto.se>","References":"<20190701201504.28487-1-laurent.pinchart@ideasonboard.com>\n\t<20190701201504.28487-10-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190701201504.28487-10-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH v4 09/13] libcamera: pipeline: vimc:\n\tAdd controls support","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":"Tue, 02 Jul 2019 00:24:29 -0000"}},{"id":2115,"web_url":"https://patchwork.libcamera.org/comment/2115/","msgid":"<20190702071136.iyx2hgzwltoleuy2@uno.localdomain>","date":"2019-07-02T07:11:36","subject":"Re: [libcamera-devel] [PATCH v4 09/13] libcamera: pipeline: vimc:\n\tAdd controls support","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Mon, Jul 01, 2019 at 11:15:00PM +0300, Laurent Pinchart wrote:\n> Implement control support in the VIMC pipeline handler by dynamically\n> querying the V4L2 device for the supported V4L2 controls and populating\n> the list of camera controls accordingly.\n>\n> Signed-off-by: Laurent Pinchart \n\nThanks\nReviewed-by: Jacopo Mondi \n\n> ---\n> Changes since v3:\n>\n> - Fixed error checking when setting controls\n> ---\n> src/libcamera/pipeline/vimc.cpp | 107 ++++++++++++++++++++++++++++++--\n> 1 file changed, 102 insertions(+), 5 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index 6833213650dc..f8a58be060bb 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -7,19 +7,24 @@\n>\n> #include \n> #include \n> +#include \n> +#include \n>\n> #include \n> +#include \n> #include \n> #include \n> #include \n> #include \n>\n> +#include \"camera_sensor.h\"\n> #include \"device_enumerator.h\"\n> #include \"ipa_manager.h\"\n> #include \"log.h\"\n> #include \"media_device.h\"\n> #include \"pipeline_handler.h\"\n> #include \"utils.h\"\n> +#include \"v4l2_controls.h\"\n> #include \"v4l2_videodevice.h\"\n>\n> namespace libcamera {\n> @@ -36,12 +41,15 @@ public:\n>\n> \t~VimcCameraData()\n> \t{\n> +\t\tdelete sensor_;\n> \t\tdelete video_;\n> \t}\n>\n> +\tint init(MediaDevice *media);\n> \tvoid bufferReady(Buffer *buffer);\n>\n> \tV4L2VideoDevice *video_;\n> +\tCameraSensor *sensor_;\n> \tStream stream_;\n> };\n>\n> @@ -75,6 +83,8 @@ public:\n> \tbool match(DeviceEnumerator *enumerator) override;\n>\n> private:\n> +\tint processControls(VimcCameraData *data, Request *request);\n> +\n> \tVimcCameraData *cameraData(const Camera *camera)\n> \t{\n> \t\treturn static_cast(\n> @@ -215,6 +225,47 @@ void PipelineHandlerVimc::stop(Camera *camera)\n> \tPipelineHandler::stop(camera);\n> }\n>\n> +int PipelineHandlerVimc::processControls(VimcCameraData *data, Request *request)\n> +{\n> +\tV4L2ControlList controls;\n> +\n> +\tfor (auto it : request->controls()) {\n> +\t\tconst ControlInfo *ci = it.first;\n> +\t\tControlValue &value = it.second;\n> +\n> +\t\tswitch (ci->id()) {\n> +\t\tcase Brightness:\n> +\t\t\tcontrols.add(V4L2_CID_BRIGHTNESS, value.getInt());\n> +\t\t\tbreak;\n> +\n> +\t\tcase Contrast:\n> +\t\t\tcontrols.add(V4L2_CID_CONTRAST, value.getInt());\n> +\t\t\tbreak;\n> +\n> +\t\tcase Saturation:\n> +\t\t\tcontrols.add(V4L2_CID_SATURATION, value.getInt());\n> +\t\t\tbreak;\n> +\n> +\t\tdefault:\n> +\t\t\tbreak;\n> +\t\t}\n> +\t}\n> +\n> +\tfor (const V4L2Control &ctrl : controls)\n> +\t\tLOG(VIMC, Debug)\n> +\t\t\t<< \"Setting control 0x\"\n> +\t\t\t<< std::hex << std::setw(8) << ctrl.id() << std::dec\n> +\t\t\t<< \" to \" << ctrl.value();\n> +\n> +\tint ret = data->sensor_->setControls(&controls);\n> +\tif (ret) {\n> +\t\tLOG(VIMC, Error) << \"Failed to set controls: \" << ret;\n> +\t\treturn ret < 0 ? ret : -EINVAL;\n> +\t}\n> +\n> +\treturn ret;\n> +}\n> +\n> int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n> {\n> \tVimcCameraData *data = cameraData(camera);\n> @@ -226,7 +277,11 @@ int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n> \t\treturn -ENOENT;\n> \t}\n>\n> -\tint ret = data->video_->queueBuffer(buffer);\n> +\tint ret = processControls(data, request);\n> +\tif (ret < 0)\n> +\t\treturn ret;\n> +\n> +\tret = data->video_->queueBuffer(buffer);\n> \tif (ret < 0)\n> \t\treturn ret;\n>\n> @@ -262,12 +317,9 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \tstd::unique_ptr data = utils::make_unique(this);\n>\n> \t/* Locate and open the capture video node. */\n> -\tdata->video_ = new V4L2VideoDevice(media->getEntityByName(\"Raw Capture 1\"));\n> -\tif (data->video_->open())\n> +\tif (data->init(media))\n> \t\treturn false;\n>\n> -\tdata->video_->bufferReady.connect(data.get(), &VimcCameraData::bufferReady);\n> -\n> \t/* Create and register the camera. */\n> \tstd::set streams{ &data->stream_ };\n> \tstd::shared_ptr camera = Camera::create(this, \"VIMC Sensor B\",\n> @@ -277,6 +329,51 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \treturn true;\n> }\n>\n> +int VimcCameraData::init(MediaDevice *media)\n> +{\n> +\tint ret;\n> +\n> +\t/* Create and open the video device and the camera sensor. */\n> +\tvideo_ = new V4L2VideoDevice(media->getEntityByName(\"Raw Capture 1\"));\n> +\tif (video_->open())\n> +\t\treturn -ENODEV;\n> +\n> +\tvideo_->bufferReady.connect(this, &VimcCameraData::bufferReady);\n> +\n> +\tsensor_ = new CameraSensor(media->getEntityByName(\"Sensor B\"));\n> +\tret = sensor_->init();\n> +\tif (ret)\n> +\t\treturn ret;\n> +\n> +\t/* Initialise the supported controls. */\n> +\tconst V4L2ControlInfoMap &controls = sensor_->controls();\n> +\tfor (const auto &ctrl : controls) {\n> +\t\tunsigned int v4l2Id = ctrl.first;\n> +\t\tconst V4L2ControlInfo &info = ctrl.second;\n> +\t\tControlId id;\n> +\n> +\t\tswitch (v4l2Id) {\n> +\t\tcase V4L2_CID_BRIGHTNESS:\n> +\t\t\tid = Brightness;\n> +\t\t\tbreak;\n> +\t\tcase V4L2_CID_CONTRAST:\n> +\t\t\tid = Contrast;\n> +\t\t\tbreak;\n> +\t\tcase V4L2_CID_SATURATION:\n> +\t\t\tid = Saturation;\n> +\t\t\tbreak;\n> +\t\tdefault:\n> +\t\t\tcontinue;\n> +\t\t}\n> +\n> +\t\tcontrolInfo_.emplace(std::piecewise_construct,\n> +\t\t\t\t std::forward_as_tuple(id),\n> +\t\t\t\t std::forward_as_tuple(id, info.min(), info.max()));\n> +\t}\n> +\n> +\treturn 0;\n> +}\n> +\n> void VimcCameraData::bufferReady(Buffer *buffer)\n> {\n> \tRequest *request = queuedRequests_.front();\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 436BD60C01\n\tfor ;\n\tTue, 2 Jul 2019 09:10:21 +0200 (CEST)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id C0ABF20018;\n\tTue, 2 Jul 2019 07:10:20 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Tue, 2 Jul 2019 09:11:36 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190702071136.iyx2hgzwltoleuy2@uno.localdomain>","References":"<20190701201504.28487-1-laurent.pinchart@ideasonboard.com>\n\t<20190701201504.28487-10-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"zpiawgmkffbnixnf\"","Content-Disposition":"inline","In-Reply-To":"<20190701201504.28487-10-laurent.pinchart@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH v4 09/13] libcamera: pipeline: vimc:\n\tAdd controls support","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":"Tue, 02 Jul 2019 07:10:21 -0000"}},{"id":2122,"web_url":"https://patchwork.libcamera.org/comment/2122/","msgid":"<32c920a8-3a08-a40f-3659-205e2e421932@ideasonboard.com>","date":"2019-07-02T09:05:14","subject":"Re: [libcamera-devel] [PATCH v4 09/13] libcamera: pipeline: vimc:\n\tAdd controls support","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 01/07/2019 21:15, Laurent Pinchart wrote:\n> Implement control support in the VIMC pipeline handler by dynamically\n> querying the V4L2 device for the supported V4L2 controls and populating\n> the list of camera controls accordingly.\n\nAccepting the duplication of code from other pipeline handlers for now;\n\nReviewed-by: Kieran Bingham \n\n\n> Signed-off-by: Laurent Pinchart \n> ---\n> Changes since v3:\n> \n> - Fixed error checking when setting controls\n> ---\n> src/libcamera/pipeline/vimc.cpp | 107 ++++++++++++++++++++++++++++++--\n> 1 file changed, 102 insertions(+), 5 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index 6833213650dc..f8a58be060bb 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -7,19 +7,24 @@\n> \n> #include \n> #include \n> +#include \n> +#include \n> \n> #include \n> +#include \n> #include \n> #include \n> #include \n> #include \n> \n> +#include \"camera_sensor.h\"\n> #include \"device_enumerator.h\"\n> #include \"ipa_manager.h\"\n> #include \"log.h\"\n> #include \"media_device.h\"\n> #include \"pipeline_handler.h\"\n> #include \"utils.h\"\n> +#include \"v4l2_controls.h\"\n> #include \"v4l2_videodevice.h\"\n> \n> namespace libcamera {\n> @@ -36,12 +41,15 @@ public:\n> \n> \t~VimcCameraData()\n> \t{\n> +\t\tdelete sensor_;\n> \t\tdelete video_;\n> \t}\n> \n> +\tint init(MediaDevice *media);\n> \tvoid bufferReady(Buffer *buffer);\n> \n> \tV4L2VideoDevice *video_;\n> +\tCameraSensor *sensor_;\n> \tStream stream_;\n> };\n> \n> @@ -75,6 +83,8 @@ public:\n> \tbool match(DeviceEnumerator *enumerator) override;\n> \n> private:\n> +\tint processControls(VimcCameraData *data, Request *request);\n> +\n> \tVimcCameraData *cameraData(const Camera *camera)\n> \t{\n> \t\treturn static_cast(\n> @@ -215,6 +225,47 @@ void PipelineHandlerVimc::stop(Camera *camera)\n> \tPipelineHandler::stop(camera);\n> }\n> \n> +int PipelineHandlerVimc::processControls(VimcCameraData *data, Request *request)\n> +{\n> +\tV4L2ControlList controls;\n> +\n> +\tfor (auto it : request->controls()) {\n> +\t\tconst ControlInfo *ci = it.first;\n> +\t\tControlValue &value = it.second;\n> +\n> +\t\tswitch (ci->id()) {\n> +\t\tcase Brightness:\n> +\t\t\tcontrols.add(V4L2_CID_BRIGHTNESS, value.getInt());\n> +\t\t\tbreak;\n> +\n> +\t\tcase Contrast:\n> +\t\t\tcontrols.add(V4L2_CID_CONTRAST, value.getInt());\n> +\t\t\tbreak;\n> +\n> +\t\tcase Saturation:\n> +\t\t\tcontrols.add(V4L2_CID_SATURATION, value.getInt());\n> +\t\t\tbreak;\n> +\n> +\t\tdefault:\n> +\t\t\tbreak;\n> +\t\t}\n> +\t}\n> +\n> +\tfor (const V4L2Control &ctrl : controls)\n> +\t\tLOG(VIMC, Debug)\n> +\t\t\t<< \"Setting control 0x\"\n> +\t\t\t<< std::hex << std::setw(8) << ctrl.id() << std::dec\n> +\t\t\t<< \" to \" << ctrl.value();\n> +\n> +\tint ret = data->sensor_->setControls(&controls);\n> +\tif (ret) {\n> +\t\tLOG(VIMC, Error) << \"Failed to set controls: \" << ret;\n> +\t\treturn ret < 0 ? ret : -EINVAL;\n> +\t}\n> +\n> +\treturn ret;\n> +}\n> +\n> int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n> {\n> \tVimcCameraData *data = cameraData(camera);\n> @@ -226,7 +277,11 @@ int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n> \t\treturn -ENOENT;\n> \t}\n> \n> -\tint ret = data->video_->queueBuffer(buffer);\n> +\tint ret = processControls(data, request);\n> +\tif (ret < 0)\n> +\t\treturn ret;\n> +\n> +\tret = data->video_->queueBuffer(buffer);\n> \tif (ret < 0)\n> \t\treturn ret;\n> \n> @@ -262,12 +317,9 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \tstd::unique_ptr data = utils::make_unique(this);\n> \n> \t/* Locate and open the capture video node. */\n> -\tdata->video_ = new V4L2VideoDevice(media->getEntityByName(\"Raw Capture 1\"));\n> -\tif (data->video_->open())\n> +\tif (data->init(media))\n> \t\treturn false;\n> \n> -\tdata->video_->bufferReady.connect(data.get(), &VimcCameraData::bufferReady);\n> -\n> \t/* Create and register the camera. */\n> \tstd::set streams{ &data->stream_ };\n> \tstd::shared_ptr camera = Camera::create(this, \"VIMC Sensor B\",\n> @@ -277,6 +329,51 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \treturn true;\n> }\n> \n> +int VimcCameraData::init(MediaDevice *media)\n> +{\n> +\tint ret;\n> +\n> +\t/* Create and open the video device and the camera sensor. */\n> +\tvideo_ = new V4L2VideoDevice(media->getEntityByName(\"Raw Capture 1\"));\n> +\tif (video_->open())\n> +\t\treturn -ENODEV;\n> +\n> +\tvideo_->bufferReady.connect(this, &VimcCameraData::bufferReady);\n> +\n> +\tsensor_ = new CameraSensor(media->getEntityByName(\"Sensor B\"));\n> +\tret = sensor_->init();\n> +\tif (ret)\n> +\t\treturn ret;\n> +\n> +\t/* Initialise the supported controls. */\n> +\tconst V4L2ControlInfoMap &controls = sensor_->controls();\n> +\tfor (const auto &ctrl : controls) {\n> +\t\tunsigned int v4l2Id = ctrl.first;\n> +\t\tconst V4L2ControlInfo &info = ctrl.second;\n> +\t\tControlId id;\n> +\n> +\t\tswitch (v4l2Id) {\n> +\t\tcase V4L2_CID_BRIGHTNESS:\n> +\t\t\tid = Brightness;\n> +\t\t\tbreak;\n> +\t\tcase V4L2_CID_CONTRAST:\n> +\t\t\tid = Contrast;\n> +\t\t\tbreak;\n> +\t\tcase V4L2_CID_SATURATION:\n> +\t\t\tid = Saturation;\n> +\t\t\tbreak;\n> +\t\tdefault:\n> +\t\t\tcontinue;\n> +\t\t}\n> +\n> +\t\tcontrolInfo_.emplace(std::piecewise_construct,\n> +\t\t\t\t std::forward_as_tuple(id),\n> +\t\t\t\t std::forward_as_tuple(id, info.min(), info.max()));\n> +\t}\n> +\n> +\treturn 0;\n> +}\n> +\n> void VimcCameraData::bufferReady(Buffer *buffer)\n> {\n> \tRequest *request = queuedRequests_.front();\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1279E61F4A\n\tfor ;\n\tTue, 2 Jul 2019 11:05:20 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 50BFA2C6;\n\tTue, 2 Jul 2019 11:05:19 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1562058319;\n\tbh=EvGONWdmM6LNpKBmzi6u9l2kSv6yvYeb+hkk9eTX3iU=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=hs2bfdGDZEV05+9+Y9pjmPexuqUr+uB7V9QZj41gmfL+Tm8VXb55Kii+9n05MhE5d\n\tsitAlFpH1G9UO/jACov3d2gFbC5mDOSNIywzOU7kYSgmUb275Hd89KrOeL0zRabzDM\n\tAS9zZA1+BZN6S5citeplXtJOhCzX7JIAZAodnmG4=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20190701201504.28487-1-laurent.pinchart@ideasonboard.com>\n\t<20190701201504.28487-10-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tsbsRB8KNNvVXBOVNwko86rQqF9drZuw=","Organization":"Ideas on Board","Message-ID":"<32c920a8-3a08-a40f-3659-205e2e421932@ideasonboard.com>","Date":"Tue, 2 Jul 2019 10:05:14 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.7.0","MIME-Version":"1.0","In-Reply-To":"<20190701201504.28487-10-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH v4 09/13] libcamera: pipeline: vimc:\n\tAdd controls support","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":"Tue, 02 Jul 2019 09:05:20 -0000"}}]