{"id":872,"url":"https://patchwork.libcamera.org/api/1.1/patches/872/?format=json","web_url":"https://patchwork.libcamera.org/patch/872/","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-3-niklas.soderlund@ragnatech.se>","date":"2019-04-03T01:12:18","name":"[libcamera-devel,2/5] test: camera: Remove streams argument from configurationValid()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"95e4d3437ec48c0fef2357940ca2a243399b8ceb","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/872/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/872/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/872/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 713B7610B3\n\tfor ;\n\tWed, 3 Apr 2019 03:12:28 +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 8a3a57cc-55ad-11e9-8144-0050569116f7;\n\tWed, 03 Apr 2019 03:12:25 +0200 (CEST)"],"X-Halon-ID":"8a3a57cc-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:18 +0200","Message-Id":"<20190403011221.12711-3-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 2/5] test: camera: Remove streams argument\n\tfrom configurationValid()","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 remove the streams and validation using the stream when\njudging if a camera configuration is valid. This is needed as once\nstream usage hints are added applications will no longer fetch default\nconfiguration based on Stream IDs so using them to verify the returned\nformat is not useful.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \n---\n test/camera/camera_test.cpp | 25 ++++++++-----------------\n test/camera/camera_test.h | 3 +--\n test/camera/capture.cpp | 2 +-\n test/camera/configuration_default.cpp | 2 +-\n test/camera/configuration_set.cpp | 2 +-\n 5 files changed, 12 insertions(+), 22 deletions(-)","diff":"diff --git a/test/camera/camera_test.cpp b/test/camera/camera_test.cpp\nindex a92f2165bf3a53c1..1609c4b02842186a 100644\n--- a/test/camera/camera_test.cpp\n+++ b/test/camera/camera_test.cpp\n@@ -46,27 +46,18 @@ void CameraTest::cleanup()\n \tcm_->stop();\n };\n \n-bool CameraTest::configurationValid(const std::set &streams,\n-\t\t\t\t const std::map &conf) const\n+bool CameraTest::configurationValid(const std::map &config) const\n {\n-\t/* Test that the numbers of streams matches that of configuration. */\n-\tif (streams.size() != conf.size())\n+\t/* Test that the configuration is not empty. */\n+\tif (config.empty())\n \t\treturn false;\n \n-\t/*\n-\t * Test that stream can be found in configuration and that the\n-\t * configuration is valid.\n-\t */\n-\tfor (Stream *stream : streams) {\n-\t\tstd::map::const_iterator it =\n-\t\t\tconf.find(stream);\n+\t/* Test that configuration is valid. */\n+\tfor (auto const &it : config) {\n+\t\tconst StreamConfiguration &conf = it.second;\n \n-\t\tif (it == conf.end())\n-\t\t\treturn false;\n-\n-\t\tconst StreamConfiguration *sconf = &it->second;\n-\t\tif (sconf->width == 0 || sconf->height == 0 ||\n-\t\t sconf->pixelFormat == 0 || sconf->bufferCount == 0)\n+\t\tif (conf.width == 0 || conf.height == 0 ||\n+\t\t conf.pixelFormat == 0 || conf.bufferCount == 0)\n \t\t\treturn false;\n \t}\n \ndiff --git a/test/camera/camera_test.h b/test/camera/camera_test.h\nindex 48fb47a23fe8f49c..5801fad3281e1653 100644\n--- a/test/camera/camera_test.h\n+++ b/test/camera/camera_test.h\n@@ -23,8 +23,7 @@ protected:\n \tint init();\n \tvoid cleanup();\n \n-\tbool configurationValid(const std::set &streams,\n-\t\t\t\tconst std::map &conf) const;\n+\tbool configurationValid(const std::map &config) const;\n \n \tstd::shared_ptr camera_;\n \ndiff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\nindex 28eb61405d90a4c7..f6932b7505571712 100644\n--- a/test/camera/capture.cpp\n+++ b/test/camera/capture.cpp\n@@ -48,7 +48,7 @@ protected:\n \t\t\tcamera_->streamConfiguration(streams);\n \t\tStreamConfiguration *sconf = &conf.begin()->second;\n \n-\t\tif (!configurationValid(streams, conf)) {\n+\t\tif (!configurationValid(conf)) {\n \t\t\tcout << \"Failed to read default configuration\" << endl;\n \t\t\treturn TestFail;\n \t\t}\ndiff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp\nindex 71e79844667591b2..53ee021d33ca39b1 100644\n--- a/test/camera/configuration_default.cpp\n+++ b/test/camera/configuration_default.cpp\n@@ -32,7 +32,7 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (!configurationValid(streams, conf)) {\n+\t\tif (!configurationValid(conf)) {\n \t\t\tcout << \"Default configuration invalid\" << endl;\n \t\t\treturn TestFail;\n \t\t}\ndiff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp\nindex dedb85009335aa46..cac1da959f241bc5 100644\n--- a/test/camera/configuration_set.cpp\n+++ b/test/camera/configuration_set.cpp\n@@ -23,7 +23,7 @@ protected:\n \t\t\tcamera_->streamConfiguration(streams);\n \t\tStreamConfiguration *sconf = &conf.begin()->second;\n \n-\t\tif (!configurationValid(streams, conf)) {\n+\t\tif (!configurationValid(conf)) {\n \t\t\tcout << \"Failed to read default configuration\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n","prefixes":["libcamera-devel","2/5"]}