[{"id":1253,"web_url":"https://patchwork.libcamera.org/comment/1253/","msgid":"<20190403132041.w3krqzpuvx465v4q@uno.localdomain>","date":"2019-04-03T13:20:41","subject":"Re: [libcamera-devel] [PATCH 2/5] test: camera: Remove streams\n\targument from configurationValid()","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Niklas,\n\nOn Wed, Apr 03, 2019 at 03:12:18AM +0200, Niklas Söderlund wrote:\n> In preparation of reworking how a default configuration is retrieved\n> from a camera remove the streams and validation using the stream when\n> judging if a camera configuration is valid. This is needed as once\n> stream usage hints are added applications will no longer fetch default\n> configuration based on Stream IDs so using them to verify the returned\n> format is not useful.\n>\n> Signed-off-by: Niklas Söderlund \n\nReviewed-by: Jacopo Mondi \n\n> Reviewed-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(-)\n>\n> diff --git a/test/camera/camera_test.cpp b/test/camera/camera_test.cpp\n> index 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>\n> diff --git a/test/camera/camera_test.h b/test/camera/camera_test.h\n> index 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>\n> diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\n> index 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}\n> diff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp\n> index 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}\n> diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp\n> index 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> --\n> 2.21.0\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 relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 35FB4600FB\n\tfor ;\n\tWed, 3 Apr 2019 15:19:56 +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 relay1-d.mail.gandi.net (Postfix) with ESMTPSA id BDFE6240007;\n\tWed, 3 Apr 2019 13:19:55 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Wed, 3 Apr 2019 15:20:41 +0200","From":"Jacopo Mondi ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190403132041.w3krqzpuvx465v4q@uno.localdomain>","References":"<20190403011221.12711-1-niklas.soderlund@ragnatech.se>\n\t<20190403011221.12711-3-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"zqpdj7cw4vwmd2zo\"","Content-Disposition":"inline","In-Reply-To":"<20190403011221.12711-3-niklas.soderlund@ragnatech.se>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH 2/5] test: camera: Remove streams\n\targument from 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 13:19:56 -0000"}}]