{"id":13245,"url":"https://patchwork.libcamera.org/api/patches/13245/?format=json","web_url":"https://patchwork.libcamera.org/patch/13245/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210806101409.324645-3-umang.jain@ideasonboard.com>","date":"2021-08-06T10:14:07","name":"[libcamera-devel,2/4] ipa: vimc: Rename IPA trace enums","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0f357dbc1be3ce2f5c9a6217b6c953bf9a844e3e","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/13245/mbox/","series":[{"id":2316,"url":"https://patchwork.libcamera.org/api/series/2316/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2316","date":"2021-08-06T10:14:05","name":"Pass buffers to VIMC IPA","version":1,"mbox":"https://patchwork.libcamera.org/series/2316/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13245/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13245/checks/","tags":{},"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 69871C3239\n\tfor ;\n\tFri, 6 Aug 2021 10:14:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7A7916881B;\n\tFri, 6 Aug 2021 12:14:33 +0200 (CEST)","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 7FD4860266\n\tfor ;\n\tFri, 6 Aug 2021 12:14:32 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.251.226.40])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 55D3F4FB;\n\tFri, 6 Aug 2021 12:14:31 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"sZN8/z2w\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628244872;\n\tbh=5u1cOL82emyi+LHxG+VQn5VpjZKhwzSK2TY8pTTSc6s=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=sZN8/z2wLXm7sSTTznKVH2i1N4jEGe+0gx0lNiCCmTfgx4QTma2HdRw9QtYMwtO35\n\tLinhWi01rau02ufVm3AbIcpzk8sXnRbXQ+7bwDilD+TmEtvYUON7yZ0zb7ZYhW6PlR\n\tN2dIk1DSrDrMDov6Edacm/l49guKlLX1sasrdtbI=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 6 Aug 2021 15:44:07 +0530","Message-Id":"<20210806101409.324645-3-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210806101409.324645-1-umang.jain@ideasonboard.com>","References":"<20210806101409.324645-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/4] ipa: vimc: Rename IPA trace enums","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"To avoid the conflict of naming with IPAOperations in future,\nrename trace enum to IPATrace*.\n\nThis commit does not introduce any functional changes.\n\nSigned-off-by: Umang Jain \n---\n include/libcamera/ipa/vimc.mojom | 10 +++++-----\n src/ipa/vimc/vimc.cpp | 10 +++++-----\n test/ipa/ipa_interface_test.cpp | 18 +++++++++---------\n 3 files changed, 19 insertions(+), 19 deletions(-)","diff":"diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom\nindex ee66353d..99b6412b 100644\n--- a/include/libcamera/ipa/vimc.mojom\n+++ b/include/libcamera/ipa/vimc.mojom\n@@ -10,11 +10,11 @@ import \"include/libcamera/ipa/core.mojom\";\n \n const string VimcIPAFIFOPath = \"/tmp/libcamera_ipa_vimc_fifo\";\n \n-enum IPAOperationCode {\n-\tIPAOperationNone,\n-\tIPAOperationInit,\n-\tIPAOperationStart,\n-\tIPAOperationStop,\n+enum IPATraceCode {\n+\tIPATraceNone,\n+\tIPATraceInit,\n+\tIPATraceStart,\n+\tIPATraceStop,\n };\n \n interface IPAVimcInterface {\ndiff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\nindex fb134084..54d9086a 100644\n--- a/src/ipa/vimc/vimc.cpp\n+++ b/src/ipa/vimc/vimc.cpp\n@@ -40,7 +40,7 @@ public:\n \n private:\n \tvoid initTrace();\n-\tvoid trace(enum ipa::vimc::IPAOperationCode operation);\n+\tvoid trace(enum ipa::vimc::IPATraceCode operation);\n \n \tint fd_;\n };\n@@ -59,7 +59,7 @@ IPAVimc::~IPAVimc()\n \n int IPAVimc::init(const IPASettings &settings)\n {\n-\ttrace(ipa::vimc::IPAOperationInit);\n+\ttrace(ipa::vimc::IPATraceInit);\n \n \tLOG(IPAVimc, Debug)\n \t\t<< \"initializing vimc IPA with configuration file \"\n@@ -76,7 +76,7 @@ int IPAVimc::init(const IPASettings &settings)\n \n int IPAVimc::start()\n {\n-\ttrace(ipa::vimc::IPAOperationStart);\n+\ttrace(ipa::vimc::IPATraceStart);\n \n \tLOG(IPAVimc, Debug) << \"start vimc IPA!\";\n \n@@ -85,7 +85,7 @@ int IPAVimc::start()\n \n void IPAVimc::stop()\n {\n-\ttrace(ipa::vimc::IPAOperationStop);\n+\ttrace(ipa::vimc::IPATraceStop);\n \n \tLOG(IPAVimc, Debug) << \"stop vimc IPA!\";\n }\n@@ -117,7 +117,7 @@ void IPAVimc::initTrace()\n \tfd_ = ret;\n }\n \n-void IPAVimc::trace(enum ipa::vimc::IPAOperationCode operation)\n+void IPAVimc::trace(enum ipa::vimc::IPATraceCode operation)\n {\n \tif (fd_ < 0)\n \t\treturn;\ndiff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\nindex ee9f2651..2f30b26a 100644\n--- a/test/ipa/ipa_interface_test.cpp\n+++ b/test/ipa/ipa_interface_test.cpp\n@@ -34,7 +34,7 @@ class IPAInterfaceTest : public Test, public Object\n {\n public:\n \tIPAInterfaceTest()\n-\t\t: trace_(ipa::vimc::IPAOperationNone), notifier_(nullptr), fd_(-1)\n+\t\t: trace_(ipa::vimc::IPATraceNone), notifier_(nullptr), fd_(-1)\n \t{\n \t}\n \n@@ -112,10 +112,10 @@ protected:\n \t\t}\n \n \t\ttimer.start(1000);\n-\t\twhile (timer.isRunning() && trace_ != ipa::vimc::IPAOperationInit)\n+\t\twhile (timer.isRunning() && trace_ != ipa::vimc::IPATraceInit)\n \t\t\tdispatcher->processEvents();\n \n-\t\tif (trace_ != ipa::vimc::IPAOperationInit) {\n+\t\tif (trace_ != ipa::vimc::IPATraceInit) {\n \t\t\tcerr << \"Failed to test IPA initialization sequence\"\n \t\t\t << endl;\n \t\t\treturn TestFail;\n@@ -124,10 +124,10 @@ protected:\n \t\t/* Test start of IPA module. */\n \t\tipa_->start();\n \t\ttimer.start(1000);\n-\t\twhile (timer.isRunning() && trace_ != ipa::vimc::IPAOperationStart)\n+\t\twhile (timer.isRunning() && trace_ != ipa::vimc::IPATraceStart)\n \t\t\tdispatcher->processEvents();\n \n-\t\tif (trace_ != ipa::vimc::IPAOperationStart) {\n+\t\tif (trace_ != ipa::vimc::IPATraceStart) {\n \t\t\tcerr << \"Failed to test IPA start sequence\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -135,10 +135,10 @@ protected:\n \t\t/* Test stop of IPA module. */\n \t\tipa_->stop();\n \t\ttimer.start(1000);\n-\t\twhile (timer.isRunning() && trace_ != ipa::vimc::IPAOperationStop)\n+\t\twhile (timer.isRunning() && trace_ != ipa::vimc::IPATraceStop)\n \t\t\tdispatcher->processEvents();\n \n-\t\tif (trace_ != ipa::vimc::IPAOperationStop) {\n+\t\tif (trace_ != ipa::vimc::IPATraceStop) {\n \t\t\tcerr << \"Failed to test IPA stop sequence\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -161,7 +161,7 @@ private:\n \t\t\tcerr << \"Failed to read from IPA test FIFO at '\"\n \t\t\t << ipa::vimc::VimcIPAFIFOPath << \"': \" << strerror(ret)\n \t\t\t << endl;\n-\t\t\ttrace_ = ipa::vimc::IPAOperationNone;\n+\t\t\ttrace_ = ipa::vimc::IPATraceNone;\n \t\t}\n \t}\n \n@@ -170,7 +170,7 @@ private:\n \tstd::shared_ptr pipe_;\n \tstd::unique_ptr ipa_;\n \tstd::unique_ptr ipaManager_;\n-\tenum ipa::vimc::IPAOperationCode trace_;\n+\tenum ipa::vimc::IPATraceCode trace_;\n \tEventNotifier *notifier_;\n \tint fd_;\n };\n","prefixes":["libcamera-devel","2/4"]}