{"id":871,"url":"https://patchwork.libcamera.org/api/1.1/patches/871/?format=json","web_url":"https://patchwork.libcamera.org/patch/871/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20190403011221.12711-2-niklas.soderlund@ragnatech.se>","date":"2019-04-03T01:12:17","name":"[libcamera-devel,1/5] cam: Rework how streams configuration is prepared","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"f59a6af8489613910923833bf6dca98b327a6500","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/871/mbox/","series":[{"id":232,"url":"https://patchwork.libcamera.org/api/1.1/series/232/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=232","date":"2019-04-03T01:12:16","name":"libcamera: camera: Add support for stream roles","version":1,"mbox":"https://patchwork.libcamera.org/series/232/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/871/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/871/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F3155610BF\n\tfor ;\n\tWed, 3 Apr 2019 03:12:27 +0200 (CEST)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 89dc2878-55ad-11e9-8144-0050569116f7;\n\tWed, 03 Apr 2019 03:12:24 +0200 (CEST)"],"X-Halon-ID":"89dc2878-55ad-11e9-8144-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 3 Apr 2019 03:12:17 +0200","Message-Id":"<20190403011221.12711-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190403011221.12711-1-niklas.soderlund@ragnatech.se>","References":"<20190403011221.12711-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/5] cam: Rework how streams configuration\n\tis prepared","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, 03 Apr 2019 01:12:28 -0000"},"content":"In preparation of reworking how a default configuration is retrieved\nfrom a camera separate preparation of stream configuration and\napplication into two different functions. Reason for this is that\npreparation of camera configuration will become more complex.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \n---\n src/cam/main.cpp | 35 ++++++++++++++++++++---------------\n 1 file changed, 20 insertions(+), 15 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex e7490c32f99a01ad..b5895fae85699b26 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -78,27 +78,27 @@ static int parseOptions(int argc, char *argv[])\n \treturn 0;\n }\n \n-static int configureStreams(Camera *camera, std::set &streams)\n+static int prepareCameraConfig(std::map *config)\n {\n-\tKeyValueParser::Options format = options[OptFormat];\n-\tStream *id = *streams.begin();\n-\n-\tstd::map config =\n-\t\tcamera->streamConfiguration(streams);\n+\tstd::set streams = camera->streams();\n+\t*config = camera->streamConfiguration(streams);\n+\tStream *stream = config->begin()->first;\n \n \tif (options.isSet(OptFormat)) {\n+\t\tKeyValueParser::Options format = options[OptFormat];\n+\n \t\tif (format.isSet(\"width\"))\n-\t\t\tconfig[id].width = format[\"width\"];\n+\t\t\t(*config)[stream].width = format[\"width\"];\n \n \t\tif (format.isSet(\"height\"))\n-\t\t\tconfig[id].height = format[\"height\"];\n+\t\t\t(*config)[stream].height = format[\"height\"];\n \n \t\t/* TODO: Translate 4CC string to ID. */\n \t\tif (format.isSet(\"pixelformat\"))\n-\t\t\tconfig[id].pixelFormat = format[\"pixelformat\"];\n+\t\t\t(*config)[stream].pixelFormat = format[\"pixelformat\"];\n \t}\n \n-\treturn camera->configureStreams(config);\n+\treturn 0;\n }\n \n static void requestComplete(Request *request, const std::map &buffers)\n@@ -136,18 +136,23 @@ static void requestComplete(Request *request, const std::map\n \n static int capture()\n {\n-\tint ret;\n-\n-\tstd::set streams = camera->streams();\n+\tstd::map config;\n \tstd::vector requests;\n+\tint ret;\n \n-\tret = configureStreams(camera.get(), streams);\n+\tret = prepareCameraConfig(&config);\n+\tif (ret) {\n+\t\tstd::cout << \"Failed to prepare camera configuration\" << std::endl;\n+\t\treturn ret;\n+\t}\n+\n+\tret = camera->configureStreams(config);\n \tif (ret < 0) {\n \t\tstd::cout << \"Failed to configure camera\" << std::endl;\n \t\treturn ret;\n \t}\n \n-\tStream *stream = *streams.begin();\n+\tStream *stream = config.begin()->first;\n \n \tret = camera->allocateBuffers();\n \tif (ret) {\n","prefixes":["libcamera-devel","1/5"]}