Patch Detail
Show a patch.
GET /api/patches/1277/?format=api
{ "id": 1277, "url": "https://patchwork.libcamera.org/api/patches/1277/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1277/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190523164210.2105-2-paul.elder@ideasonboard.com>", "date": "2019-05-23T16:42:06", "name": "[libcamera-devel,RFC,v2,1/5] libcamera: ipa_module_info: update struct to allow IPA matching", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "96396c2a23887fd1ce58581ca2a39e3945eefd79", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1277/mbox/", "series": [ { "id": 324, "url": "https://patchwork.libcamera.org/api/series/324/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=324", "date": "2019-05-23T16:42:05", "name": "Add IPAManager", "version": 2, "mbox": "https://patchwork.libcamera.org/series/324/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1277/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1277/checks/", "tags": {}, "headers": { "Return-Path": "<paul.elder@ideasonboard.com>", "Received": [ "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 E0DA160E9A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 23 May 2019 18:42:24 +0200 (CEST)", "from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3B7575A9;\n\tThu, 23 May 2019 18:42:24 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558629744;\n\tbh=tZVdugPfCLgYTJZz8CDhpV+BH1Fq5lIgcxRqgB5iNuk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=L06JEYi2ISrRET39YasxB1teWMs/4SsSPn/V8sWnp0Q40gkFW3i+2EfNTOIzPqfV3\n\tY8v3MUIwXkOIxATEBLyn2OWNsovS0fiYbgoJCgc6A/Or0DCgYB12LEFcgPhqLFV71O\n\tFDiKWH6H6kEw74jLaZs5pN0CnCizt3CqVUmpjerE=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 23 May 2019 12:42:06 -0400", "Message-Id": "<20190523164210.2105-2-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190523164210.2105-1-paul.elder@ideasonboard.com>", "References": "<20190523164210.2105-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC PATCH v2 1/5] libcamera: ipa_module_info:\n\tupdate struct to allow IPA matching", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Thu, 23 May 2019 16:42:25 -0000" }, "content": "We need a way to match pipelines with IPA modules, so add fields in\nIPAModuleInfo to hold the IPA API version number and the pipeline\nmatching string.\n\nAlso update IPA module tests and Doxygen accordingly.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\nChanges in v2:\n- make Doxygen stop complaining about undocumented __attribute__((packed))\n\n Documentation/Doxyfile.in | 7 +++--\n include/libcamera/ipa/ipa_module_info.h | 8 ++++--\n test/ipa/ipa_test.cpp | 37 +++++++++++++++++--------\n test/ipa/shared_test.c | 4 ++-\n test/ipa/shared_test.cpp | 6 ++--\n 5 files changed, 43 insertions(+), 19 deletions(-)", "diff": "diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in\nindex 67eaded..ac70efb 100644\n--- a/Documentation/Doxyfile.in\n+++ b/Documentation/Doxyfile.in\n@@ -2016,7 +2016,7 @@ ENABLE_PREPROCESSING = YES\n # The default value is: NO.\n # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.\n \n-MACRO_EXPANSION = NO\n+MACRO_EXPANSION = YES\n \n # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then\n # the macro expansion is limited to the macros specified with the PREDEFINED and\n@@ -2024,7 +2024,7 @@ MACRO_EXPANSION = NO\n # The default value is: NO.\n # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.\n \n-EXPAND_ONLY_PREDEF = NO\n+EXPAND_ONLY_PREDEF = YES\n \n # If the SEARCH_INCLUDES tag is set to YES, the include files in the\n # INCLUDE_PATH will be searched if a #include is found.\n@@ -2057,7 +2057,8 @@ INCLUDE_FILE_PATTERNS = *.h\n # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.\n \n PREDEFINED = __DOXYGEN__ \\\n- __cplusplus\n+ __cplusplus \\\n+ __attribute__(x)=\n \n # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this\n # tag can be used to specify a list of macro names that should be expanded. The\ndiff --git a/include/libcamera/ipa/ipa_module_info.h b/include/libcamera/ipa/ipa_module_info.h\nindex 4e0d668..f3ae97d 100644\n--- a/include/libcamera/ipa/ipa_module_info.h\n+++ b/include/libcamera/ipa/ipa_module_info.h\n@@ -7,14 +7,18 @@\n #ifndef __LIBCAMERA_IPA_MODULE_INFO_H__\n #define __LIBCAMERA_IPA_MODULE_INFO_H__\n \n+#include <stdint.h>\n+\n #ifdef __cplusplus\n namespace libcamera {\n #endif\n \n struct IPAModuleInfo {\n+\tuint32_t ipaAPIVersion;\n+\tuint32_t pipelineVersion;\n+\tchar pipelineName[256];\n \tchar name[256];\n-\tunsigned int version;\n-};\n+} __attribute__((packed));\n \n #ifdef __cplusplus\n extern \"C\" {\ndiff --git a/test/ipa/ipa_test.cpp b/test/ipa/ipa_test.cpp\nindex 9861ee2..ca15fbd 100644\n--- a/test/ipa/ipa_test.cpp\n+++ b/test/ipa/ipa_test.cpp\n@@ -33,6 +33,19 @@ protected:\n \n \t\tconst struct IPAModuleInfo &info = ll->info();\n \n+\t\tif (info.ipaAPIVersion != testInfo.ipaAPIVersion) {\n+\t\t\tcerr << \"test IPA module has incorrect ipaAPIVersion\" << endl;\n+\t\t\tcerr << \"expected \\\"\" << testInfo.ipaAPIVersion << \"\\\", got \\\"\"\n+\t\t\t << info.ipaAPIVersion << \"\\\"\" << endl;\n+\t\t\tret = -1;\n+\t\t}\n+\t\tif (info.pipelineVersion != testInfo.pipelineVersion) {\n+\t\t\tcerr << \"test IPA module has incorrect pipelineVersion\" << endl;\n+\t\t\tcerr << \"expected \\\"\" << testInfo.pipelineVersion << \"\\\", got \\\"\"\n+\t\t\t << info.pipelineVersion << \"\\\"\" << endl;\n+\t\t\tret = -1;\n+\t\t}\n+\n \t\tif (strcmp(info.name, testInfo.name)) {\n \t\t\tcerr << \"test IPA module has incorrect name\" << endl;\n \t\t\tcerr << \"expected \\\"\" << testInfo.name << \"\\\", got \\\"\"\n@@ -40,13 +53,6 @@ protected:\n \t\t\tret = -1;\n \t\t}\n \n-\t\tif (info.version != testInfo.version) {\n-\t\t\tcerr << \"test IPA module has incorrect version\" << endl;\n-\t\t\tcerr << \"expected \\\"\" << testInfo.version << \"\\\", got \\\"\"\n-\t\t\t << info.version << \"\\\"\" << endl;\n-\t\t\tret = -1;\n-\t\t}\n-\n \t\tdelete ll;\n \t\treturn ret;\n \t}\n@@ -55,14 +61,23 @@ protected:\n \t{\n \t\tint count = 0;\n \n-\t\tconst struct IPAModuleInfo testInfo = {\n-\t\t\t\"It's over nine thousand!\",\n+\t\tconst struct IPAModuleInfo testInfo1 = {\n+\t\t\t1,\n \t\t\t9001,\n+\t\t\t\"bloop\",\n+\t\t\t\"It's over nine thousand!\",\n+\t\t};\n+\n+\t\tconst struct IPAModuleInfo testInfo2 = {\n+\t\t\t1,\n+\t\t\t8999,\n+\t\t\t\"bleep\",\n+\t\t\t\"It's under nine thousand!\",\n \t\t};\n \n-\t\tcount += runTest(\"test/ipa/ipa-dummy-c.so\", testInfo);\n+\t\tcount += runTest(\"test/ipa/ipa-dummy-c.so\", testInfo1);\n \n-\t\tcount += runTest(\"test/ipa/ipa-dummy-cpp.so\", testInfo);\n+\t\tcount += runTest(\"test/ipa/ipa-dummy-cpp.so\", testInfo2);\n \n \t\tif (count < 0)\n \t\t\treturn TestFail;\ndiff --git a/test/ipa/shared_test.c b/test/ipa/shared_test.c\nindex 87d182b..0046ace 100644\n--- a/test/ipa/shared_test.c\n+++ b/test/ipa/shared_test.c\n@@ -1,6 +1,8 @@\n #include <libcamera/ipa/ipa_module_info.h>\n \n const struct IPAModuleInfo ipaModuleInfo = {\n+\t.ipaAPIVersion = 1,\n+\t.pipelineVersion = 9001,\n+\t.pipelineName = \"bloop\",\n \t.name = \"It's over nine thousand!\",\n-\t.version = 9001,\n };\ndiff --git a/test/ipa/shared_test.cpp b/test/ipa/shared_test.cpp\nindex 4e5c976..78405b1 100644\n--- a/test/ipa/shared_test.cpp\n+++ b/test/ipa/shared_test.cpp\n@@ -4,8 +4,10 @@ namespace libcamera {\n \n extern \"C\" {\n const struct libcamera::IPAModuleInfo ipaModuleInfo = {\n-\t\"It's over nine thousand!\",\n-\t9001,\n+\t1,\n+\t8999,\n+\t\"bleep\",\n+\t\"It's under nine thousand!\",\n };\n };\n \n", "prefixes": [ "libcamera-devel", "RFC", "v2", "1/5" ] }