[{"id":824,"web_url":"https://patchwork.libcamera.org/comment/824/","msgid":"<20190213172233.GQ5332@pendragon.ideasonboard.com>","date":"2019-02-13T17:22:33","subject":"Re: [libcamera-devel] [PATCH v3 1/3] test: v4l2_device: Rename dev_\n\tto capture_","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Wed, Feb 13, 2019 at 05:14:51PM +0000, Kieran Bingham wrote:\n> Change the variable name globally throughout the tests.\n> \n> Repair the V4L2DeviceTest constructor style, as checkstyle complained.\n> \n> Signed-off-by: Kieran Bingham \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> test/v4l2_device/capture_async.cpp | 12 ++++++------\n> test/v4l2_device/double_open.cpp | 4 ++--\n> test/v4l2_device/request_buffers.cpp | 2 +-\n> test/v4l2_device/stream_on_off.cpp | 6 +++---\n> test/v4l2_device/v4l2_device_test.cpp | 8 ++++----\n> test/v4l2_device/v4l2_device_test.h | 7 +++++--\n> 6 files changed, 21 insertions(+), 18 deletions(-)\n> \n> diff --git a/test/v4l2_device/capture_async.cpp b/test/v4l2_device/capture_async.cpp\n> index 511368d6b53d..2a41b11e95e7 100644\n> --- a/test/v4l2_device/capture_async.cpp\n> +++ b/test/v4l2_device/capture_async.cpp\n> @@ -26,7 +26,7 @@ public:\n> \t\tframes++;\n> \n> \t\t/* Requeue the buffer for further use. */\n> -\t\tdev_->queueBuffer(buffer);\n> +\t\tcapture_->queueBuffer(buffer);\n> \t}\n> \n> protected:\n> @@ -40,19 +40,19 @@ protected:\n> \n> \t\tpool_.createBuffers(bufferCount);\n> \n> -\t\tret = dev_->exportBuffers(&pool_);\n> +\t\tret = capture_->exportBuffers(&pool_);\n> \t\tif (ret)\n> \t\t\treturn TestFail;\n> \n> -\t\tdev_->bufferReady.connect(this, &CaptureAsyncTest::receiveBuffer);\n> +\t\tcapture_->bufferReady.connect(this, &CaptureAsyncTest::receiveBuffer);\n> \n> \t\t/* Queue all the buffers to the device. */\n> \t\tfor (Buffer &b : pool_.buffers()) {\n> -\t\t\tif (dev_->queueBuffer(&b))\n> +\t\t\tif (capture_->queueBuffer(&b))\n> \t\t\t\treturn TestFail;\n> \t\t}\n> \n> -\t\tret = dev_->streamOn();\n> +\t\tret = capture_->streamOn();\n> \t\tif (ret)\n> \t\t\treturn TestFail;\n> \n> @@ -75,7 +75,7 @@ protected:\n> \n> \t\tstd::cout << \"Processed \" << frames << \" frames\" << std::endl;\n> \n> -\t\tret = dev_->streamOff();\n> +\t\tret = capture_->streamOff();\n> \t\tif (ret)\n> \t\t\treturn TestFail;\n> \n> diff --git a/test/v4l2_device/double_open.cpp b/test/v4l2_device/double_open.cpp\n> index ca2b201454a4..7ec80a60f57e 100644\n> --- a/test/v4l2_device/double_open.cpp\n> +++ b/test/v4l2_device/double_open.cpp\n> @@ -22,10 +22,10 @@ protected:\n> \t\t * Expect failure: The device has already been opened by the\n> \t\t * V4L2DeviceTest base class\n> \t\t */\n> -\t\tret = dev_->open();\n> +\t\tret = capture_->open();\n> \t\tif (!ret) {\n> \t\t\tstd::cout << \"Double open erroneously succeeded\" << std::endl;\n> -\t\t\tdev_->close();\n> +\t\t\tcapture_->close();\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> diff --git a/test/v4l2_device/request_buffers.cpp b/test/v4l2_device/request_buffers.cpp\n> index 26d7d9528982..938d4f85d5a1 100644\n> --- a/test/v4l2_device/request_buffers.cpp\n> +++ b/test/v4l2_device/request_buffers.cpp\n> @@ -21,7 +21,7 @@ protected:\n> \n> \t\tpool_.createBuffers(bufferCount);\n> \n> -\t\tint ret = dev_->exportBuffers(&pool_);\n> +\t\tint ret = capture_->exportBuffers(&pool_);\n> \t\tif (ret)\n> \t\t\treturn TestFail;\n> \n> diff --git a/test/v4l2_device/stream_on_off.cpp b/test/v4l2_device/stream_on_off.cpp\n> index 861d8d695813..ea1b3f5bd5a4 100644\n> --- a/test/v4l2_device/stream_on_off.cpp\n> +++ b/test/v4l2_device/stream_on_off.cpp\n> @@ -16,15 +16,15 @@ protected:\n> \n> \t\tpool_.createBuffers(bufferCount);\n> \n> -\t\tint ret = dev_->exportBuffers(&pool_);\n> +\t\tint ret = capture_->exportBuffers(&pool_);\n> \t\tif (ret)\n> \t\t\treturn TestFail;\n> \n> -\t\tret = dev_->streamOn();\n> +\t\tret = capture_->streamOn();\n> \t\tif (ret)\n> \t\t\treturn TestFail;\n> \n> -\t\tret = dev_->streamOff();\n> +\t\tret = capture_->streamOff();\n> \t\tif (ret)\n> \t\t\treturn TestFail;\n> \n> diff --git a/test/v4l2_device/v4l2_device_test.cpp b/test/v4l2_device/v4l2_device_test.cpp\n> index a2a7ba82612d..2bdf8cfe983a 100644\n> --- a/test/v4l2_device/v4l2_device_test.cpp\n> +++ b/test/v4l2_device/v4l2_device_test.cpp\n> @@ -52,16 +52,16 @@ int V4L2DeviceTest::init()\n> \tif (!entity)\n> \t\treturn TestSkip;\n> \n> -\tdev_ = new V4L2Device(entity);\n> -\tif (!dev_)\n> +\tcapture_ = new V4L2Device(entity);\n> +\tif (!capture_)\n> \t\treturn TestFail;\n> \n> -\treturn dev_->open();\n> +\treturn capture_->open();\n> }\n> \n> void V4L2DeviceTest::cleanup()\n> {\n> \tmedia_->release();\n> \n> -\tdelete dev_;\n> +\tdelete capture_;\n> };\n> diff --git a/test/v4l2_device/v4l2_device_test.h b/test/v4l2_device/v4l2_device_test.h\n> index 43539655f85b..c476d3c05e79 100644\n> --- a/test/v4l2_device/v4l2_device_test.h\n> +++ b/test/v4l2_device/v4l2_device_test.h\n> @@ -22,7 +22,10 @@ using namespace libcamera;\n> class V4L2DeviceTest : public Test\n> {\n> public:\n> -\tV4L2DeviceTest() : dev_(nullptr){};\n> +\tV4L2DeviceTest()\n> +\t\t: capture_(nullptr)\n> +\t{\n> +\t}\n> \n> protected:\n> \tint init();\n> @@ -30,7 +33,7 @@ protected:\n> \n> \tstd::unique_ptr enumerator_;\n> \tstd::shared_ptr media_;\n> -\tV4L2Device *dev_;\n> +\tV4L2Device *capture_;\n> \tBufferPool pool_;\n> };\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C6F636101F\n\tfor ;\n\tWed, 13 Feb 2019 18:22:37 +0100 (CET)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 18030304;\n\tWed, 13 Feb 2019 18:22:37 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1550078557;\n\tbh=iqe1u9sf5AUmJ3jdf5ekqEpfvdVe+rzF4ODatiC7M4E=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=dC0xdqDDYeAKALE0KlZOltpoKfkIc+Y+gMM6umdHluwCIzawK7O0vZlrt2U68/o9f\n\tVIQoczIJXP7xTo3iUnb4f9qMgVCEbjMTNcC5EJQrr1m4XDzHq+qNJiYeYEnry1T6WV\n\tbfk2wHFAC1jdRQPaIkn0/+LS3DiPOobkMKDUk2+g=","Date":"Wed, 13 Feb 2019 19:22:33 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"LibCamera Devel ","Message-ID":"<20190213172233.GQ5332@pendragon.ideasonboard.com>","References":"<20190213171453.13852-1-kieran.bingham@ideasonboard.com>\n\t<20190213171453.13852-2-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20190213171453.13852-2-kieran.bingham@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v3 1/3] test: v4l2_device: Rename dev_\n\tto capture_","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, 13 Feb 2019 17:22:38 -0000"}}]