[{"id":1546,"web_url":"https://patchwork.libcamera.org/comment/1546/","msgid":"<20190430185823.GS16573@bigcity.dyn.berto.se>","date":"2019-04-30T18:58:23","subject":"Re: [libcamera-devel] [PATCH 4/5] test: Unify naming of\n\tconfigurations in tests","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 patch.\n\nOn 2019-04-30 21:37:45 +0300, Laurent Pinchart wrote:\n> Name all instances of CameraConfiguration \"config\", and all instances of\n> StreamConfiguration \"cfg\" accross all tests.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> test/camera/capture.cpp | 14 +++++++-------\n> test/camera/configuration_default.cpp | 10 +++++-----\n> test/camera/configuration_set.cpp | 20 ++++++++++----------\n> 3 files changed, 22 insertions(+), 22 deletions(-)\n> \n> diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\n> index 4e75a75c5b71..0101cc94e665 100644\n> --- a/test/camera/capture.cpp\n> +++ b/test/camera/capture.cpp\n> @@ -42,12 +42,12 @@ protected:\n> \n> \tint run()\n> \t{\n> -\t\tCameraConfiguration conf =\n> +\t\tCameraConfiguration config =\n> \t\t\tcamera_->streamConfiguration({ Stream::VideoRecording() });\n> -\t\tStream *stream = conf.front();\n> -\t\tStreamConfiguration *sconf = &conf[stream];\n> +\t\tStream *stream = config.front();\n> +\t\tStreamConfiguration *cfg = &config[stream];\n> \n> -\t\tif (!conf.isValid()) {\n> +\t\tif (!config.isValid()) {\n> \t\t\tcout << \"Failed to read default configuration\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> @@ -57,7 +57,7 @@ protected:\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> -\t\tif (camera_->configureStreams(conf)) {\n> +\t\tif (camera_->configureStreams(config)) {\n> \t\t\tcout << \"Failed to set default configuration\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> @@ -110,10 +110,10 @@ protected:\n> \t\twhile (timer.isRunning())\n> \t\t\tdispatcher->processEvents();\n> \n> -\t\tif (completeRequestsCount_ <= sconf->bufferCount * 2) {\n> +\t\tif (completeRequestsCount_ <= cfg->bufferCount * 2) {\n> \t\t\tcout << \"Failed to capture enough frames (got \"\n> \t\t\t << completeRequestsCount_ << \" expected at least \"\n> -\t\t\t << sconf->bufferCount * 2 << \")\" << endl;\n> +\t\t\t << cfg->bufferCount * 2 << \")\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> diff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp\n> index dd5106689f09..2a10ea507a67 100644\n> --- a/test/camera/configuration_default.cpp\n> +++ b/test/camera/configuration_default.cpp\n> @@ -18,11 +18,11 @@ class ConfigurationDefault : public CameraTest\n> protected:\n> \tint run()\n> \t{\n> -\t\tCameraConfiguration conf;\n> +\t\tCameraConfiguration config;\n> \n> \t\t/* Test asking for configuration for a video stream. */\n> -\t\tconf = camera_->streamConfiguration({ Stream::VideoRecording() });\n> -\t\tif (!conf.isValid()) {\n> +\t\tconfig = camera_->streamConfiguration({ Stream::VideoRecording() });\n> +\t\tif (!config.isValid()) {\n> \t\t\tcout << \"Default configuration invalid\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> @@ -31,8 +31,8 @@ protected:\n> \t\t * Test that asking for configuration for an empty array of\n> \t\t * stream usages returns an empty list of configurations.\n> \t\t */\n> -\t\tconf = camera_->streamConfiguration({});\n> -\t\tif (conf.isValid()) {\n> +\t\tconfig = camera_->streamConfiguration({});\n> +\t\tif (config.isValid()) {\n> \t\t\tcout << \"Failed to retrieve configuration for empty usage list\"\n> \t\t\t << endl;\n> \t\t\treturn TestFail;\n> diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp\n> index 0c932bc1de18..ca41ed689511 100644\n> --- a/test/camera/configuration_set.cpp\n> +++ b/test/camera/configuration_set.cpp\n> @@ -18,11 +18,11 @@ class ConfigurationSet : public CameraTest\n> protected:\n> \tint run()\n> \t{\n> -\t\tCameraConfiguration conf =\n> +\t\tCameraConfiguration config =\n> \t\t\tcamera_->streamConfiguration({ Stream::VideoRecording() });\n> -\t\tStreamConfiguration *sconf = &conf[conf.front()];\n> +\t\tStreamConfiguration *cfg = &config[config.front()];\n> \n> -\t\tif (!conf.isValid()) {\n> +\t\tif (!config.isValid()) {\n> \t\t\tcout << \"Failed to read default configuration\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> @@ -33,7 +33,7 @@ protected:\n> \t\t}\n> \n> \t\t/* Test that setting the default configuration works. */\n> -\t\tif (camera_->configureStreams(conf)) {\n> +\t\tif (camera_->configureStreams(config)) {\n> \t\t\tcout << \"Failed to set default configuration\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> @@ -48,7 +48,7 @@ protected:\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> -\t\tif (!camera_->configureStreams(conf)) {\n> +\t\tif (!camera_->configureStreams(config)) {\n> \t\t\tcout << \"Setting configuration on a camera not acquired succeeded when it should have failed\"\n> \t\t\t << endl;\n> \t\t\treturn TestFail;\n> @@ -64,9 +64,9 @@ protected:\n> \t\t * the default configuration of the VIMC camera is known to\n> \t\t * work.\n> \t\t */\n> -\t\tsconf->size.width *= 2;\n> -\t\tsconf->size.height *= 2;\n> -\t\tif (camera_->configureStreams(conf)) {\n> +\t\tcfg->size.width *= 2;\n> +\t\tcfg->size.height *= 2;\n> +\t\tif (camera_->configureStreams(config)) {\n> \t\t\tcout << \"Failed to set modified configuration\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\n> @@ -74,8 +74,8 @@ protected:\n> \t\t/*\n> \t\t * Test that setting an invalid configuration fails.\n> \t\t */\n> -\t\tsconf->size = { 0, 0 };\n> -\t\tif (!camera_->configureStreams(conf)) {\n> +\t\tcfg->size = { 0, 0 };\n> +\t\tif (!camera_->configureStreams(config)) {\n> \t\t\tcout << \"Invalid configuration incorrectly accepted\" << endl;\n> \t\t\treturn TestFail;\n> \t\t}\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-lf1-x12d.google.com (mail-lf1-x12d.google.com\n\t[IPv6:2a00:1450:4864:20::12d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4955260E5B\n\tfor ;\n\tTue, 30 Apr 2019 20:58:25 +0200 (CEST)","by mail-lf1-x12d.google.com with SMTP id r30so775807lfn.1\n\tfor ;\n\tTue, 30 Apr 2019 11:58:25 -0700 (PDT)","from localhost (89-233-230-99.cust.bredband2.com. [89.233.230.99])\n\tby smtp.gmail.com with ESMTPSA id\n\tw8sm8138009lfn.95.2019.04.30.11.58.24\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 30 Apr 2019 11:58:24 -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=HUBMNBw4snvk40V40wJMMU6A2dDl0pKKjY5SB5UQedk=;\n\tb=cIBddCXNz/j3Bx0W8ygWRuXUPrcGHImeGPresiMjycGaeaKj3oJew1bLfZKHn0xpPV\n\t8UWRfju5zdt/Cb/X2DnfUreQkQHmCBG2a0Ufdt1zHwmkBAGarbkBupD4iH17I7gP/JAO\n\tG18X0JqSwPTep5P1Au5x2fvxlBlEW/UFatugaB0BqSAujpWMZ/7nc1qYjYvfwpFudbZd\n\tMS9QQdAHxuix3LwzXyW6WpYGLtBjKzNrbV6Zx9KlQhXGbLc1WP+TUBJIL32zVzwnE061\n\tTBRcl1Usx10zwJT9S9WWMqLzdG8A4/RsYhtDslQGy8S1UDIYfYke8izKZ6s4Sow1sNGF\n\tf7qQ==","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=HUBMNBw4snvk40V40wJMMU6A2dDl0pKKjY5SB5UQedk=;\n\tb=HoeuecYVUobSQOE6gv1hV2gqL2708c4qWLhA/VxXRKpe4dXXm+cdrb9st4/auZOJON\n\tjTpwD32+cZbQ5gVkgIQULao/HUHA85GetyGZlnSoQcbgtwKnfnMtdzWk430gKYA1AGUC\n\tkj1Lf37d+FQ+cPgS8YfoA7MQnZ6UTrQr9LnL9dgZ7OFN/s2e9NKXmnolzPgLtgXQzH7C\n\toh5JxX0hxWhDhNeykd3SgcrV6E71iEAKd5JobRtd9WQTb4ERveV9lH1fID0wFOsYBhXH\n\t45Xv8AP+x0RkNqnVpYMGMvcK7wMz6wlyiod502WvnHvwLIotK5Bk8gBY0YlO1s0mxRpQ\n\tkWeA==","X-Gm-Message-State":"APjAAAUvykhf7PfufxIWeaIp+VWE0J266e48QSPQrSedJ0I98EbTcJB2\n\t2xoe13yqDZlmK0S2mOZU1wSoTt7ESm4=","X-Google-Smtp-Source":"APXvYqwqtNER9TARjLuDfEXcEYTShsX+bA0afAQwIhNQpcstTslaE+ILfQFkoO4W0DJxhh7dc6OpRw==","X-Received":"by 2002:a19:6b0d:: with SMTP id\n\td13mr36060611lfa.79.1556650704716; \n\tTue, 30 Apr 2019 11:58:24 -0700 (PDT)","Date":"Tue, 30 Apr 2019 20:58:23 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190430185823.GS16573@bigcity.dyn.berto.se>","References":"<20190430183746.28518-1-laurent.pinchart@ideasonboard.com>\n\t<20190430183746.28518-5-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":"<20190430183746.28518-5-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.11.3 (2019-02-01)","Subject":"Re: [libcamera-devel] [PATCH 4/5] test: Unify naming of\n\tconfigurations in tests","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, 30 Apr 2019 18:58:25 -0000"}}]