[{"id":26378,"web_url":"https://patchwork.libcamera.org/comment/26378/","msgid":"<167508743847.1881490.7183341484540758512@Monstersaurus>","date":"2023-01-30T14:03:58","subject":"Re: [libcamera-devel] [PATCH v6 15/15] libcamera: apps: lcc: Add\n\tstream hints test","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Naushir Patuck via libcamera-devel (2023-01-27 15:43:22)\n> Add a new test class, MultiCaptureHints. This tests the MandatoryStream\n> hint flag and ensures that requests are cancelled correctly if the flag\n> is set and no buffer is provided.\n\nI was going to say that as this is validated in core, it could be\nhandled by the main unit tests under test/ however I do think this is\nappropriate here - as more hints will likely certainly require pipeline\nvalidation.\n\n\nReviewed-by: Kieran Bingham \n\n> \n> Signed-off-by: Naushir Patuck \n> ---\n> src/apps/lc-compliance/capture_test.cpp | 21 +++++++++++\n> src/apps/lc-compliance/multi_capture.cpp | 48 ++++++++++++++++++++++++\n> src/apps/lc-compliance/multi_capture.h | 17 +++++++++\n> 3 files changed, 86 insertions(+)\n> \n> diff --git a/src/apps/lc-compliance/capture_test.cpp b/src/apps/lc-compliance/capture_test.cpp\n> index c6a09a63248a..9239e8b5fc8a 100644\n> --- a/src/apps/lc-compliance/capture_test.cpp\n> +++ b/src/apps/lc-compliance/capture_test.cpp\n> @@ -229,6 +229,27 @@ TEST_P(MultiStream, CaptureOptional)\n> capture.capture(numRequests, NumStreams, 1);\n> }\n> \n> +/*\n> + * Test mandatory stream hints\n> + *\n> + * Mark a single stream as mandatory, and don't provide a buffer for it in the\n> + * request. This should case the queueRequest call to fail.\n> + */\n> +TEST_P(MultiStream, CaptureHints)\n> +{\n> + constexpr unsigned int NumStreams = 2;\n> +\n> + auto [roles, numRequests] = GetParam();\n> +\n> + MultiCaptureHints capture0(camera_, 0);\n> + capture0.configure({ roles.first, roles.second });\n> + capture0.capture(NumStreams);\n> +\n> + MultiCaptureHints capture1(camera_, 1);\n> + capture1.configure({ roles.first, roles.second });\n> + capture1.capture(NumStreams);\n> +}\n> +\n> INSTANTIATE_TEST_SUITE_P(MultiCaptureTests,\n> MultiStream,\n> testing::Combine(testing::ValuesIn(MULTIROLES),\n> diff --git a/src/apps/lc-compliance/multi_capture.cpp b/src/apps/lc-compliance/multi_capture.cpp\n> index a011dfb285c8..6aa39b7e281f 100644\n> --- a/src/apps/lc-compliance/multi_capture.cpp\n> +++ b/src/apps/lc-compliance/multi_capture.cpp\n> @@ -238,3 +238,51 @@ void MultiCaptureOptional::capture(unsigned int numRequests, unsigned int numStr\n> \n> ASSERT_EQ(captureCount_, captureLimit_);\n> }\n> +\n> +/* MultiCaptureHints */\n> +\n> +MultiCaptureHints::MultiCaptureHints(std::shared_ptr camera,\n> + unsigned int mandatoryStream)\n> + : MultiCaptureBase(camera), mandatoryStream_(mandatoryStream)\n> +{\n> +}\n> +\n> +void MultiCaptureHints::capture(unsigned int numStreams)\n> +{\n> + start();\n> +\n> + std::vector\n> + buffers = prepareBuffers(config_->at(0).bufferCount, numStreams);\n> +\n> + if (!buffers.size())\n> + GTEST_SKIP();\n> +\n> + /* Queue a single request */\n> + std::unique_ptr request = camera_->createRequest();\n> + ASSERT_TRUE(request) << \"Can't create request\";\n> +\n> + for (unsigned int j = 0; j < numStreams; j++) {\n> + const FrameBufferList *bufferList = buffers[j];\n> + Stream *stream = config_->at(j).stream();\n> +\n> + /*\n> + * Do not add a buffer for the mandatory stream to cause a\n> + * deliberate failure.\n> + */\n> + if (j == mandatoryStream_)\n> + continue;\n> +\n> + ASSERT_EQ(request->addBuffer(stream, (*bufferList)[0].get()), 0)\n> + << \"Can't set buffer for request\";\n> + }\n> +\n> + ASSERT_EQ(camera_->queueRequest(request.get()), -ENOMEM)\n> + << \"queueRequest did not fail!\";\n> +\n> + stop();\n> +}\n> +\n> +void MultiCaptureHints::updateConfig()\n> +{\n> + config_.get()->at(mandatoryStream_).hints = StreamConfiguration::Hint::MandatoryStream;\n> +}\n> diff --git a/src/apps/lc-compliance/multi_capture.h b/src/apps/lc-compliance/multi_capture.h\n> index 3d92ba3d4c10..c48c16e7565d 100644\n> --- a/src/apps/lc-compliance/multi_capture.h\n> +++ b/src/apps/lc-compliance/multi_capture.h\n> @@ -68,3 +68,20 @@ public:\n> void capture(unsigned int numRequests, unsigned int numStreams,\n> unsigned int optionalStream);\n> };\n> +\n> +class MultiCaptureHints : public MultiCaptureBase\n> +{\n> +public:\n> + MultiCaptureHints(std::shared_ptr camera,\n> + unsigned int mandatoryStream);\n> +\n> + void capture(unsigned int numStreams);\n> +\n> +private:\n> + void updateConfig() override;\n> + void requestComplete([[maybe_unused]] libcamera::Request *request) override\n> + {\n> + }\n> +\n> + unsigned int mandatoryStream_;\n> +};\n> -- \n> 2.25.1\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 95E59BDC71\n\tfor ;\n\tMon, 30 Jan 2023 14:04:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DD5F3625D8;\n\tMon, 30 Jan 2023 15:04:02 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E8D0E60482\n\tfor ;\n\tMon, 30 Jan 2023 15:04:00 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 67ED98B8;\n\tMon, 30 Jan 2023 15:04:00 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1675087442;\n\tbh=32MpLz7+G9hqYUg9QdC8IH35WXqgKkJ548UHW82ujqw=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=rKfUo9WB9zePbii2oARw1Ft5MXiXFloURH3kce8nfCX+0A5BpWKg26KySuATaJD4P\n\teMAeqVeeTyXLsGS/nXwahWgTbDRt+b9EiDwyOFBFnr3mrOXq+gGF+iJWRvp5q/qSQl\n\tLkhZmxktE++FDf/pd0poajaoQ7qrqSwwF5PVrkVvJPDYaIUco+SUv6sdfFQUTxRjvj\n\tAQctD5ldbIJ/7Zqb8e1tWJY01I/CqhOAlL/qtno4CLokwTJBS+aGxsOZx/gkHwLBEF\n\tQiEKp4i8DyRx7LKuSG1GAlPChviamHUHvUk/TMtPgpmIHN26Zdrp2UFwtR5xEYiLBb\n\tOW0REDorfFfSA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1675087440;\n\tbh=32MpLz7+G9hqYUg9QdC8IH35WXqgKkJ548UHW82ujqw=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=qNaq7djBnmbX9N7I0JVxw1PB7K+aPq7DNdU4Zq3OnqwGFp0cD6tLKcgFLoemkoo/W\n\tTzI6Wmu+c9AN4UsheWQKPHwSmTqDp+MmqjCjMRC94xEPoBvi4Jmdw015hfXHR2d6tp\n\tzsrYoQKYQdzHMj4yLRtI+yRhh4PrHWvb0CEb8mt0="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"qNaq7djB\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20230127154322.29019-16-naush@raspberrypi.com>","References":"<20230127154322.29019-1-naush@raspberrypi.com>\n\t<20230127154322.29019-16-naush@raspberrypi.com>","To":"Naushir Patuck ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 30 Jan 2023 14:03:58 +0000","Message-ID":"<167508743847.1881490.7183341484540758512@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH v6 15/15] libcamera: apps: lcc: Add\n\tstream hints test","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]