{"id":8765,"url":"https://patchwork.libcamera.org/api/patches/8765/?format=json","web_url":"https://patchwork.libcamera.org/patch/8765/","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":"<20200713132451.2944673-5-kieran.bingham@ideasonboard.com>","date":"2020-07-13T13:24:46","name":"[libcamera-devel,4/9] libcamera: pipeline: vivid: Generate and validate StreamConfigurations","commit_ref":null,"pull_url":null,"state":"awaiting-upstream","archived":false,"hash":"e692aec684678237fdce85abddca0bcd1fd3d456","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8765/mbox/","series":[{"id":1102,"url":"https://patchwork.libcamera.org/api/series/1102/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1102","date":"2020-07-13T13:24:42","name":"Introduce a new PipelineHandler","version":1,"mbox":"https://patchwork.libcamera.org/series/1102/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8765/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8765/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 CBC90BD792\n\tfor ;\n\tMon, 13 Jul 2020 13:25:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 995076073D;\n\tMon, 13 Jul 2020 15:25:01 +0200 (CEST)","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 E153C60732\n\tfor ;\n\tMon, 13 Jul 2020 15:24:57 +0200 (CEST)","from Q.local (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net\n\t[86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7375E57B;\n\tMon, 13 Jul 2020 15:24:57 +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=\"G/3YjD73\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594646697;\n\tbh=9BO1kp7ojxVgZbxt+BbRfsWqNgrLzgZOBW7rXWQ/ViY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=G/3YjD73spr+OlGfjz0ddDfHmQQLO2O6MwYnDEvlVqduPnlnTVcMGuOk9kKh+xHM6\n\tEl8nRhzg8oYFT1rsbmJfWKM7JzKfL+QgEEiLop5K72pRh+BGZ3605os5iOYkzyf2OZ\n\tyxVTHeWCW0m7gHMoVfBh+4Voac71+LDUnBE1cfKc=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Mon, 13 Jul 2020 14:24:46 +0100","Message-Id":"<20200713132451.2944673-5-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200713132451.2944673-1-kieran.bingham@ideasonboard.com>","References":"<20200713132451.2944673-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 4/9] libcamera: pipeline: vivid: Generate\n\tand validate StreamConfigurations","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","Cc":"Chris Ward ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Implement the support for Generating and Validating the streams the\nCamera can provide.\n\nVivid is a simple case with only a single stream.\n\nTest the configurations can be generated and reported with cam -I:\n\n\"\"\"\nLIBCAMERA_LOG_LEVELS=Pipeline,VIVID:0 ./src/cam/cam -c 1 -I\n[232:02:09.633067174] [2882911] INFO IPAManager ipa_manager.cpp:136 libcamera is not installed. Adding '/home//libcamera/build-vivid/src/ipa' to the IPA search path\n[232:02:09.633332451] [2882911] WARN IPAManager ipa_manager.cpp:147 No IPA found in '/usr/local/lib/x86_64-linux-gnu/libcamera'\n[232:02:09.633373414] [2882911] INFO Camera camera_manager.cpp:283 libcamera v0.0.11+714-d1ebd889-dirty\nUsing camera vivid\n0: 1280x720-BGR888\n * Pixelformat: NV21 (320x180)-(3840x2160)/(+0,+0)\n - 320x180\n - 640x360\n - 640x480\n - 1280x720\n - 1920x1080\n - 3840x2160\n * Pixelformat: NV12 (320x180)-(3840x2160)/(+0,+0)\n - 320x180\n - 640x360\n - 640x480\n - 1280x720\n - 1920x1080\n - 3840x2160\n * Pixelformat: BGRA8888 (320x180)-(3840x2160)/(+0,+0)\n - 320x180\n - 640x360\n - 640x480\n - 1280x720\n - 1920x1080\n - 3840x2160\n * Pixelformat: RGBA8888 (320x180)-(3840x2160)/(+0,+0)\n - 320x180\n - 640x360\n - 640x480\n - 1280x720\n - 1920x1080\n - 3840x2160\n\n\"\"\"\n\nSigned-off-by: Kieran Bingham \n---\n src/libcamera/pipeline/vivid/vivid.cpp | 74 +++++++++++++++++++++++++-\n 1 file changed, 73 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/pipeline/vivid/vivid.cpp b/src/libcamera/pipeline/vivid/vivid.cpp\nindex a8922ce70ed4..9e95bae8bc30 100644\n--- a/src/libcamera/pipeline/vivid/vivid.cpp\n+++ b/src/libcamera/pipeline/vivid/vivid.cpp\n@@ -6,6 +6,7 @@\n */\n \n #include \n+#include \n \n #include \"libcamera/internal/device_enumerator.h\"\n #include \"libcamera/internal/log.h\"\n@@ -63,8 +64,50 @@ public:\n \tint queueRequestDevice(Camera *camera, Request *request) override;\n \n \tbool match(DeviceEnumerator *enumerator) override;\n+\n+private:\n+\tint processControls(VividCameraData *data, Request *request);\n+\n+\tVividCameraData *cameraData(const Camera *camera)\n+\t{\n+\t\treturn static_cast(\n+\t\t\tPipelineHandler::cameraData(camera));\n+\t}\n };\n \n+VividCameraConfiguration::VividCameraConfiguration()\n+\t: CameraConfiguration()\n+{\n+}\n+\n+CameraConfiguration::Status VividCameraConfiguration::validate()\n+{\n+\tStatus status = Valid;\n+\n+\tif (config_.empty())\n+\t\treturn Invalid;\n+\n+\t/* Cap the number of entries to the available streams. */\n+\tif (config_.size() > 1) {\n+\t\tconfig_.resize(1);\n+\t\tstatus = Adjusted;\n+\t}\n+\n+\tStreamConfiguration &cfg = config_[0];\n+\n+\t/* Adjust the pixel format. */\n+\tconst std::vector formats = cfg.formats().pixelformats();\n+\tif (std::find(formats.begin(), formats.end(), cfg.pixelFormat) == formats.end()) {\n+\t\tcfg.pixelFormat = cfg.formats().pixelformats()[0];\n+\t\tLOG(VIVID, Debug) << \"Adjusting format to \" << cfg.pixelFormat.toString();\n+\t\tstatus = Adjusted;\n+\t}\n+\n+\tcfg.bufferCount = 4;\n+\n+\treturn status;\n+}\n+\n PipelineHandlerVivid::PipelineHandlerVivid(CameraManager *manager)\n \t: PipelineHandler(manager)\n {\n@@ -73,7 +116,36 @@ PipelineHandlerVivid::PipelineHandlerVivid(CameraManager *manager)\n CameraConfiguration *PipelineHandlerVivid::generateConfiguration(Camera *camera,\n \t\t\t\t\t\t\t\t const StreamRoles &roles)\n {\n-\treturn nullptr;\n+\tCameraConfiguration *config = new VividCameraConfiguration();\n+\tVividCameraData *data = cameraData(camera);\n+\n+\tif (roles.empty())\n+\t\treturn config;\n+\n+\tstd::map> v4l2Formats =\n+\t\tdata->video_->formats();\n+\tstd::map> deviceFormats;\n+\tstd::transform(v4l2Formats.begin(), v4l2Formats.end(),\n+\t\t std::inserter(deviceFormats, deviceFormats.begin()),\n+\t\t [&](const decltype(v4l2Formats)::value_type &format) {\n+\t\t\t return decltype(deviceFormats)::value_type{\n+\t\t\t\t format.first.toPixelFormat(),\n+\t\t\t\t format.second\n+\t\t\t };\n+\t\t });\n+\n+\tStreamFormats formats(deviceFormats);\n+\tStreamConfiguration cfg(formats);\n+\n+\tcfg.pixelFormat = formats::BGR888;\n+\tcfg.size = { 1280, 720 };\n+\tcfg.bufferCount = 4;\n+\n+\tconfig->addConfiguration(cfg);\n+\n+\tconfig->validate();\n+\n+\treturn config;\n }\n \n int PipelineHandlerVivid::configure(Camera *camera, CameraConfiguration *config)\n","prefixes":["libcamera-devel","4/9"]}