[{"id":25955,"web_url":"https://patchwork.libcamera.org/comment/25955/","msgid":"","date":"2022-12-01T11:30:43","subject":"Re: [libcamera-devel] [PATCH v8 14/17] lc-compliance: Move role to\n\tstring conversion to its own function","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"On Tue, Aug 24, 2021 at 04:56:33PM -0300, Nícolas F. R. A. Prado wrote:\n> The functions that generate the test name based on the parameters need\n> to convert a StreamRole to a string. Move this to a separate function to\n> avoid redundancy.\n> \n> Signed-off-by: Nícolas F. R. A. Prado \n> Reviewed-by: Laurent Pinchart \n\nReviewed-by: Paul Elder \n\n> \n> ---\n> \n> Changes in v8:\n> - Made roleToString()'s map const and changed usage from [] operator to at()\n> \n> Changes in v5:\n> - New\n> \n> src/lc-compliance/capture_test.cpp | 23 ++++++++++++++---------\n> 1 file changed, 14 insertions(+), 9 deletions(-)\n> \n> diff --git a/src/lc-compliance/capture_test.cpp b/src/lc-compliance/capture_test.cpp\n> index 49012048729e..40242fbbc0ba 100644\n> --- a/src/lc-compliance/capture_test.cpp\n> +++ b/src/lc-compliance/capture_test.cpp\n> @@ -18,6 +18,18 @@ using namespace libcamera;\n> const std::vector NUMREQUESTS = { 1, 2, 3, 5, 8, 13, 21, 34, 55, 89 };\n> const std::vector ROLES = { Raw, StillCapture, VideoRecording, Viewfinder };\n> \n> +static const std::string &roleToString(const StreamRole &role)\n> +{\n> +\tstatic const std::map rolesMap = {\n> +\t\t{ Raw, \"Raw\" },\n> +\t\t{ StillCapture, \"StillCapture\" },\n> +\t\t{ VideoRecording, \"VideoRecording\" },\n> +\t\t{ Viewfinder, \"Viewfinder\" }\n> +\t};\n> +\n> +\treturn rolesMap.at(role);\n> +}\n> +\n> class SingleStream : public testing::TestWithParam>, public CameraHolder\n> {\n> public:\n> @@ -44,15 +56,8 @@ void SingleStream::TearDown()\n> \n> std::string SingleStream::nameParameters(const testing::TestParamInfo &info)\n> {\n> -\tstd::map rolesMap = { { Raw, \"Raw\" },\n> -\t\t\t\t\t\t { StillCapture, \"StillCapture\" },\n> -\t\t\t\t\t\t { VideoRecording, \"VideoRecording\" },\n> -\t\t\t\t\t\t { Viewfinder, \"Viewfinder\" } };\n> -\n> -\tstd::string roleName = rolesMap[std::get<0>(info.param)];\n> -\tstd::string numRequestsName = std::to_string(std::get<1>(info.param));\n> -\n> -\treturn roleName + \"_\" + numRequestsName;\n> +\treturn roleToString(std::get<0>(info.param)) + \"_\" +\n> +\t std::to_string(std::get<1>(info.param));\n> }\n> \n> /*\n> -- \n> 2.33.0\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 60046BE08B\n\tfor ;\n\tThu, 1 Dec 2022 11:30:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 193136333F;\n\tThu, 1 Dec 2022 12:30:51 +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 F35A863335\n\tfor ;\n\tThu, 1 Dec 2022 12:30:49 +0100 (CET)","from pyrite.rasen.tech (h175-177-042-159.catv02.itscom.jp\n\t[175.177.42.159])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4D85D33F;\n\tThu, 1 Dec 2022 12:30:48 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1669894251;\n\tbh=pm3eL2wwSq88O/cZMCRAgn1RhkcCwYJ1n/XjViLQJ9U=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=EL8meuaghvOnvOJSD69Hqi4jNPFzrdDOKz6kdfqX7zK34muhFDU2KJuzeqD+sI4y+\n\tMNAe9Y2iTnWy5lVT01CgPFF/9v/CEF+7Fj5nYCp+wzPHzKM3jZzlxrqtzClidblzaS\n\tVNQlznnjqzmmlng5Ik93XB5rur0ZXsegXF5G/+kv+o1J880wa71GGHTk9PIsl5kaFB\n\t3iAHha6eJjvHjCCgBUiqIcq4bQw7TLaeaI8UhLtHt81zK40gr0r+HfQYuvy1PVHs8T\n\tsdI8Fc6ld8eCab8AJARzxB335i3a4/CQDTIaWgtb4s0e+e+ZwOdmLN+hQjSqYjmaWU\n\ttHUNxAx/dVhhQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1669894249;\n\tbh=pm3eL2wwSq88O/cZMCRAgn1RhkcCwYJ1n/XjViLQJ9U=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=sdr986K36BOVscpg4j+M4cFxdINuJtf/gqzkTG+f+fd5V6QChUvdu5YECHaWaSKXk\n\t7YPVp9GvQQJdkDfElpAlUkrVOmQ+jd+UtsoI0iV7zoHzEML0DoFoCpgv6CsBkMDlCf\n\ty5v3iH8yRN8vK8qNPyTrP/Ko5G2f5xMTK25vTpiY="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"sdr986K3\"; dkim-atps=neutral","Date":"Thu, 1 Dec 2022 20:30:43 +0900","To":"=?iso-8859-1?q?N=EDcolas_F=2E_R=2E_A=2E?= Prado ","Message-ID":"","References":"<20210824195636.1110845-1-nfraprado@collabora.com>\n\t<20210824195636.1110845-15-nfraprado@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20210824195636.1110845-15-nfraprado@collabora.com>","Subject":"Re: [libcamera-devel] [PATCH v8 14/17] lc-compliance: Move role to\n\tstring conversion to its own function","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":"Paul Elder via libcamera-devel ","Reply-To":"Paul Elder ","Cc":"libcamera-devel@lists.libcamera.org, kernel@collabora.com,\n\t=?iso-8859-1?q?Andr=E9?= Almeida ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]