[{"id":1032,"web_url":"https://patchwork.libcamera.org/comment/1032/","msgid":"<20190310133721.GH4814@pendragon.ideasonboard.com>","date":"2019-03-10T13:37:21","subject":"Re: [libcamera-devel] [PATCH 4/5] test: camera: Add capture test","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Wed, Mar 06, 2019 at 03:47:54AM +0100, Niklas Söderlund wrote:\n> Add positive capture test. Correctly configure the camera using the\n\nWhat's a positive test ?\n\n> default format and run a capture session for 100 milliseconds, which is\n> plenty of time, in tests over 600 requests completed using the vimc\n> pipeline.\n> \n> The test passes if at least one requests completes.\n\nHow about making that 2, or better, the number of buffers * 2, to make\nsure we can cycle through all buffers ?\n\n> Signed-off-by: Niklas Söderlund \n> ---\n> test/camera/capture.cpp | 130 ++++++++++++++++++++++++++++++++++++++++\n> test/camera/meson.build | 1 +\n> 2 files changed, 131 insertions(+)\n> create mode 100644 test/camera/capture.cpp\n> \n> diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\n> new file mode 100644\n> index 0000000000000000..133b38318e471f3f\n> --- /dev/null\n> +++ b/test/camera/capture.cpp\n> @@ -0,0 +1,130 @@\n> +/* SPDX-License-Identifier: GPL-2.0-or-later */\n> +/*\n> + * Copyright (C) 2019, Google Inc.\n> + *\n> + * libcamera Camera API tests\n> + */\n> +\n> +#include \n> +\n> +#include \"camera_test.h\"\n> +\n> +using namespace std;\n> +\n> +namespace {\n> +\n> +class Capture : public CameraTest\n> +{\n> +protected:\n> +\tunsigned int count_buffers_;\n> +\tunsigned int count_requests_;\n\ncountBuffers_, countRequests_. Or possible better buffersCount_,\nrequestsCount_, or numBuffers_, numRequests_. Or to show this counts the\nnumber of completed buffers and requests, completeBuffersCount_ and\ncompleteRequestsCount_ ?\n\n> +\n> +\tvoid bufferComplete(Request *request, Buffer *buffer)\n> +\t{\n> +\t\tcount_buffers_++;\n> +\t}\n> +\n> +\tvoid requestComplete(Request *request, const std::map &buffers)\n> +\t{\n> +\t\tif (request->status() == Request::RequestCancelled)\n> +\t\t\treturn;\n> +\n> +\t\tcount_requests_++;\n> +\n> +\t\t/* Reuse the buffers for a new request. */\n> +\t\trequest = camera_->createRequest();\n> +\t\trequest->setBuffers(buffers);\n> +\t\tcamera_->queueRequest(request);\n> +\t}\n> +\n> +\tint run()\n> +\t{\n> +\t\tif (camera_->acquire()) {\n> +\t\t\tcout << \"Acquiring the camera failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tStream *stream = *camera_->streams().begin();\n> +\t\tstd::set streams = { stream };\n> +\t\tstd::map conf =\n> +\t\t\tcamera_->streamConfiguration(streams);\n> +\t\tif (conf.size() != 1) {\n> +\t\t\tcout << \"Reading default format failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n\nUsing the base method from patch 2/5 here too ?\n\n> +\n> +\t\tif (camera_->configureStreams(conf)) {\n> +\t\t\tcout << \"Setting valid format failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (camera_->allocateBuffers()) {\n> +\t\t\tcout << \"Allocating buffers failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tBufferPool &pool = stream->bufferPool();\n> +\t\tstd::vector requests;\n> +\t\tfor (Buffer &buffer : pool.buffers()) {\n> +\t\t\tRequest *request = camera_->createRequest();\n> +\t\t\tif (!request) {\n> +\t\t\t\tcout << \"Creating request failed\" << endl;\n> +\t\t\t\treturn TestFail;\n> +\t\t\t}\n> +\n> +\t\t\tstd::map map = { { stream, &buffer } };\n> +\t\t\tif (request->setBuffers(map)) {\n> +\t\t\t\tcout << \"Associating buffer with request failed\" << endl;\n> +\t\t\t\treturn TestFail;\n> +\t\t\t}\n> +\n> +\t\t\trequests.push_back(request);\n> +\t\t}\n> +\n> +\t\tif (camera_->start()) {\n> +\t\t\tcout << \"Starting camera failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tfor (Request *request : requests) {\n> +\t\t\tif (camera_->queueRequest(request)) {\n> +\t\t\t\tcout << \"Queueing request failed\" << endl;\n> +\t\t\t\treturn TestFail;\n> +\t\t\t}\n> +\t\t}\n> +\n> +\t\tcamera_->bufferCompleted.connect(this, &Capture::bufferComplete);\n> +\t\tcamera_->requestCompleted.connect(this, &Capture::requestComplete);\n\nYou should connect the slots before starting the camera. We're\nsingle-threaded at the moment so it shouldn't make a big different, but\nlet's be prepared.\n\n> +\n> +\t\tcount_requests_ = 0;\n> +\t\tcount_buffers_ = 0;\n\nThis should also be initialized before starting the camera.\n\n> +\n> +\t\tEventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher();\n> +\n> +\t\tTimer timer;\n> +\t\ttimer.start(100);\n> +\t\twhile (timer.isRunning())\n> +\t\t\tdispatcher->processEvents();\n> +\n> +\t\tif (!count_requests_ || !count_buffers_) {\n> +\t\t\tcout << \"Capture failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n\nShould you also test that the two counters are identical ? You may then\nneed to skip increasing the buffers counter if the buffer status reports\nan error.\n\n> +\n> +\t\tif (camera_->stop()) {\n> +\t\t\tcout << \"Stopping camera failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (camera_->freeBuffers()) {\n> +\t\t\tcout << \"Freeing buffers failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\treturn TestPass;\n> +\t}\n> +};\n> +\n> +} /* namespace */\n> +\n> +TEST_REGISTER(Capture);\n> diff --git a/test/camera/meson.build b/test/camera/meson.build\n> index f5f27c4229ac307f..6da297714f34a4e3 100644\n> --- a/test/camera/meson.build\n> +++ b/test/camera/meson.build\n> @@ -3,6 +3,7 @@\n> camera_tests = [\n> [ 'format_default', 'format_default.cpp' ],\n> [ 'format_set', 'format_set.cpp' ],\n> + [ 'capture', 'capture.cpp' ],\n> ]\n> \n> foreach t : camera_tests","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 96C88600CB\n\tfor ;\n\tSun, 10 Mar 2019 14:37:27 +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 03C11255;\n\tSun, 10 Mar 2019 14:37:26 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1552225047;\n\tbh=GRNvWr+GEAbNFyamZZv+J2gx7iYYL1GLIwEovGRXwI0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=dM8UIPNL178ISYB92L6IL6GruXmmVpvfvICaQ16e2fgOYPf5Jv5ISGuLyUHXv4evA\n\tfnjcpII/GorRonOPUQk5vaxWSUBJFy9E2VbTTtBBjGxKq4jQS70ppgdOK7VhD/IrBI\n\tiESy9plaJsaS4kQcSNJW2r1YU9k/hsIF1bUxvaNY=","Date":"Sun, 10 Mar 2019 15:37:21 +0200","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190310133721.GH4814@pendragon.ideasonboard.com>","References":"<20190306024755.28726-1-niklas.soderlund@ragnatech.se>\n\t<20190306024755.28726-5-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190306024755.28726-5-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 4/5] test: camera: Add capture test","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":"Sun, 10 Mar 2019 13:37:27 -0000"}},{"id":1038,"web_url":"https://patchwork.libcamera.org/comment/1038/","msgid":"<20190311015732.GG5281@bigcity.dyn.berto.se>","date":"2019-03-11T01:57:33","subject":"Re: [libcamera-devel] [PATCH 4/5] test: camera: Add capture test","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 feedback.\n\nOn 2019-03-10 15:37:21 +0200, Laurent Pinchart wrote:\n> Hi Niklas,\n> \n> Thank you for the patch.\n> \n> On Wed, Mar 06, 2019 at 03:47:54AM +0100, Niklas Söderlund wrote:\n> > Add positive capture test. Correctly configure the camera using the\n> \n> What's a positive test ?\n\nA test that don't try to provoke and error but tests that the intended \nfunction works :-) I will drop 'positive' for v2.\n\n> \n> > default format and run a capture session for 100 milliseconds, which is\n> > plenty of time, in tests over 600 requests completed using the vimc\n> > pipeline.\n> > \n> > The test passes if at least one requests completes.\n> \n> How about making that 2, or better, the number of buffers * 2, to make\n> sure we can cycle through all buffers ?\n\nGood idea, will make it so for v2.\n\n> \n> > Signed-off-by: Niklas Söderlund \n> > ---\n> > test/camera/capture.cpp | 130 ++++++++++++++++++++++++++++++++++++++++\n> > test/camera/meson.build | 1 +\n> > 2 files changed, 131 insertions(+)\n> > create mode 100644 test/camera/capture.cpp\n> > \n> > diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\n> > new file mode 100644\n> > index 0000000000000000..133b38318e471f3f\n> > --- /dev/null\n> > +++ b/test/camera/capture.cpp\n> > @@ -0,0 +1,130 @@\n> > +/* SPDX-License-Identifier: GPL-2.0-or-later */\n> > +/*\n> > + * Copyright (C) 2019, Google Inc.\n> > + *\n> > + * libcamera Camera API tests\n> > + */\n> > +\n> > +#include \n> > +\n> > +#include \"camera_test.h\"\n> > +\n> > +using namespace std;\n> > +\n> > +namespace {\n> > +\n> > +class Capture : public CameraTest\n> > +{\n> > +protected:\n> > +\tunsigned int count_buffers_;\n> > +\tunsigned int count_requests_;\n> \n> countBuffers_, countRequests_. Or possible better buffersCount_,\n> requestsCount_, or numBuffers_, numRequests_. Or to show this counts the\n> number of completed buffers and requests, completeBuffersCount_ and\n> completeRequestsCount_ ?\n\nI will go for completeBuffersCount_ and completeRequestsCount_.\n\n> \n> > +\n> > +\tvoid bufferComplete(Request *request, Buffer *buffer)\n> > +\t{\n> > +\t\tcount_buffers_++;\n> > +\t}\n> > +\n> > +\tvoid requestComplete(Request *request, const std::map &buffers)\n> > +\t{\n> > +\t\tif (request->status() == Request::RequestCancelled)\n> > +\t\t\treturn;\n> > +\n> > +\t\tcount_requests_++;\n> > +\n> > +\t\t/* Reuse the buffers for a new request. */\n> > +\t\trequest = camera_->createRequest();\n> > +\t\trequest->setBuffers(buffers);\n> > +\t\tcamera_->queueRequest(request);\n> > +\t}\n> > +\n> > +\tint run()\n> > +\t{\n> > +\t\tif (camera_->acquire()) {\n> > +\t\t\tcout << \"Acquiring the camera failed\" << endl;\n> > +\t\t\treturn TestFail;\n> > +\t\t}\n> > +\n> > +\t\tStream *stream = *camera_->streams().begin();\n> > +\t\tstd::set streams = { stream };\n> > +\t\tstd::map conf =\n> > +\t\t\tcamera_->streamConfiguration(streams);\n> > +\t\tif (conf.size() != 1) {\n> > +\t\t\tcout << \"Reading default format failed\" << endl;\n> > +\t\t\treturn TestFail;\n> > +\t\t}\n> \n> Using the base method from patch 2/5 here too ?\n\nYes :-)\n\n> \n> > +\n> > +\t\tif (camera_->configureStreams(conf)) {\n> > +\t\t\tcout << \"Setting valid format failed\" << endl;\n> > +\t\t\treturn TestFail;\n> > +\t\t}\n> > +\n> > +\t\tif (camera_->allocateBuffers()) {\n> > +\t\t\tcout << \"Allocating buffers failed\" << endl;\n> > +\t\t\treturn TestFail;\n> > +\t\t}\n> > +\n> > +\t\tBufferPool &pool = stream->bufferPool();\n> > +\t\tstd::vector requests;\n> > +\t\tfor (Buffer &buffer : pool.buffers()) {\n> > +\t\t\tRequest *request = camera_->createRequest();\n> > +\t\t\tif (!request) {\n> > +\t\t\t\tcout << \"Creating request failed\" << endl;\n> > +\t\t\t\treturn TestFail;\n> > +\t\t\t}\n> > +\n> > +\t\t\tstd::map map = { { stream, &buffer } };\n> > +\t\t\tif (request->setBuffers(map)) {\n> > +\t\t\t\tcout << \"Associating buffer with request failed\" << endl;\n> > +\t\t\t\treturn TestFail;\n> > +\t\t\t}\n> > +\n> > +\t\t\trequests.push_back(request);\n> > +\t\t}\n> > +\n> > +\t\tif (camera_->start()) {\n> > +\t\t\tcout << \"Starting camera failed\" << endl;\n> > +\t\t\treturn TestFail;\n> > +\t\t}\n> > +\n> > +\t\tfor (Request *request : requests) {\n> > +\t\t\tif (camera_->queueRequest(request)) {\n> > +\t\t\t\tcout << \"Queueing request failed\" << endl;\n> > +\t\t\t\treturn TestFail;\n> > +\t\t\t}\n> > +\t\t}\n> > +\n> > +\t\tcamera_->bufferCompleted.connect(this, &Capture::bufferComplete);\n> > +\t\tcamera_->requestCompleted.connect(this, &Capture::requestComplete);\n> \n> You should connect the slots before starting the camera. We're\n> single-threaded at the moment so it shouldn't make a big different, but\n> let's be prepared.\n\nGood point.\n\n> \n> > +\n> > +\t\tcount_requests_ = 0;\n> > +\t\tcount_buffers_ = 0;\n> \n> This should also be initialized before starting the camera.\n\nDone.\n\n> \n> > +\n> > +\t\tEventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher();\n> > +\n> > +\t\tTimer timer;\n> > +\t\ttimer.start(100);\n> > +\t\twhile (timer.isRunning())\n> > +\t\t\tdispatcher->processEvents();\n> > +\n> > +\t\tif (!count_requests_ || !count_buffers_) {\n> > +\t\t\tcout << \"Capture failed\" << endl;\n> > +\t\t\treturn TestFail;\n> > +\t\t}\n> \n> Should you also test that the two counters are identical ? You may then\n> need to skip increasing the buffers counter if the buffer status reports\n> an error.\n\nWill do so for v2.\n\n> \n> > +\n> > +\t\tif (camera_->stop()) {\n> > +\t\t\tcout << \"Stopping camera failed\" << endl;\n> > +\t\t\treturn TestFail;\n> > +\t\t}\n> > +\n> > +\t\tif (camera_->freeBuffers()) {\n> > +\t\t\tcout << \"Freeing buffers failed\" << endl;\n> > +\t\t\treturn TestFail;\n> > +\t\t}\n> > +\n> > +\t\treturn TestPass;\n> > +\t}\n> > +};\n> > +\n> > +} /* namespace */\n> > +\n> > +TEST_REGISTER(Capture);\n> > diff --git a/test/camera/meson.build b/test/camera/meson.build\n> > index f5f27c4229ac307f..6da297714f34a4e3 100644\n> > --- a/test/camera/meson.build\n> > +++ b/test/camera/meson.build\n> > @@ -3,6 +3,7 @@\n> > camera_tests = [\n> > [ 'format_default', 'format_default.cpp' ],\n> > [ 'format_set', 'format_set.cpp' ],\n> > + [ 'capture', 'capture.cpp' ],\n> > ]\n> > \n> > foreach t : camera_tests\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart","headers":{"Return-Path":"","Received":["from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com\n\t[IPv6:2a00:1450:4864:20::22f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E76B6600F9\n\tfor ;\n\tMon, 11 Mar 2019 02:57:34 +0100 (CET)","by mail-lj1-x22f.google.com with SMTP id z7so2600299lji.0\n\tfor ;\n\tSun, 10 Mar 2019 18:57:34 -0700 (PDT)","from localhost (89-233-230-99.cust.bredband2.com. [89.233.230.99])\n\tby smtp.gmail.com with ESMTPSA id\n\tq2sm756921ljq.19.2019.03.10.18.57.33\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tSun, 10 Mar 2019 18:57:33 -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=W+ZeC0kd7Be43Wy07ykfFB6tyv4cS200NHWpAYL8RJ0=;\n\tb=boZtEal7zNNjA8eAv5GKyZyio8Yfk9dboWGmbY/c9FYalUURbQ/E2hPM97z2eRKC3R\n\ttt1I25sTLBsqFZqbJGEezMDBhMMW6mYr4m/dwe4+cbxqpwFMsow5XgJA9YuNQALTJWud\n\t9CaJ1l+JQMo5JIgaQrHwCN7wwhW1em8fXq9+Kl67vPvRXF5gpGkjG/E4HIgfbLlago0z\n\tL6NGuy7WdeAc+cfeHisgqDWLFex4GdzwbI+RmEuf61iUMTAuYeWXEjJ4sGn9hYS2jctJ\n\tBAmlIncYDsduvI+8/uiK+QN9N66zlZoOq8oaV76hWEAEAkwPT42EN4RApqj+f15ECPv3\n\tQlXA==","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=W+ZeC0kd7Be43Wy07ykfFB6tyv4cS200NHWpAYL8RJ0=;\n\tb=JEoFMj6eIQc0TWZ3m6q0JIsasjXrd8zOQS3uFRJpYcesKFElcRtx2S/B2MngL8Sd9Q\n\tJZiqmskem8MftGkrDBgJ8y4+iBPAGMaVhq4o/m86EDl9kIv1YmfsTtE8X9fFo+834b9u\n\tLWrtPEqyFVe3V6j/xeFSYNOHWL0MPxG/89o3VDxkkpTPYlx4AJxbCI5aD2Cp0swE+lvg\n\tbkmaRgECh09yxrC+z4NiqTBHjrUqzPE1aDLUshAgCIupeH4tH1/ho6OiylzKCBAdJ+tV\n\tIzpBmB9ktF1tTR0UlreYoVOfrxtiv+bksyFw9K/4K9PxL29+YWiC9i7j/LnDePFTyBO9\n\tuB0w==","X-Gm-Message-State":"APjAAAWjhc2Fav+c5/DrJnHjH5gH6n8C1yzt0uaGLXSiQebdZjv6S2nX\n\tR5yjMG/9Ix4hTHXudfBTcICIuHkeVHE=","X-Google-Smtp-Source":"APXvYqwNI88Off6LzW3yT+q2oGtrbjyvbyFVa6PNQO7sWHIIycAj5TP1ll8lbkMHKnupZPd85Z0kMw==","X-Received":"by 2002:a2e:99c9:: with SMTP id l9mr15338755ljj.60.1552269454110;\n\tSun, 10 Mar 2019 18:57:34 -0700 (PDT)","Date":"Mon, 11 Mar 2019 02:57:33 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190311015732.GG5281@bigcity.dyn.berto.se>","References":"<20190306024755.28726-1-niklas.soderlund@ragnatech.se>\n\t<20190306024755.28726-5-niklas.soderlund@ragnatech.se>\n\t<20190310133721.GH4814@pendragon.ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190310133721.GH4814@pendragon.ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 4/5] test: camera: Add capture test","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":"Mon, 11 Mar 2019 01:57:35 -0000"}}]