{"id":11329,"url":"https://patchwork.libcamera.org/api/patches/11329/?format=json","web_url":"https://patchwork.libcamera.org/patch/11329/","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":"<20210218065329.29317-1-laurent.pinchart@ideasonboard.com>","date":"2021-02-18T06:53:29","name":"[libcamera-devel] libcamera: camera: Constify controls argument to start()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"924682a8f94b6b05de25385ed9fbf6a67fa02967","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11329/mbox/","series":[{"id":1705,"url":"https://patchwork.libcamera.org/api/series/1705/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1705","date":"2021-02-18T06:53:29","name":"[libcamera-devel] libcamera: camera: Constify controls argument to start()","version":1,"mbox":"https://patchwork.libcamera.org/series/1705/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11329/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11329/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 CFE7DBD1F6\n\tfor ;\n\tThu, 18 Feb 2021 06:54:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 39EBB63824;\n\tThu, 18 Feb 2021 07:54:07 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 93316637DC\n\tfor ;\n\tThu, 18 Feb 2021 07:54:04 +0100 (CET)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 218432FE\n\tfor ;\n\tThu, 18 Feb 2021 07:54:04 +0100 (CET)"],"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=\"fJALff3M\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1613631244;\n\tbh=JOcFh/SnsVvUPMs+Z5IJfBbDSwDnyRfdguggTK77FXA=;\n\th=From:To:Subject:Date:From;\n\tb=fJALff3MR523bHWTRKu1SLJdqVE3f385WRiy2wSzW8YyJzehJS7qCADxlCf7rlJNC\n\tlmivdpsNikJWIyblQ+vk+C2ywGRqOWRpb/lGGifiuxeDhJwMrdfgbyBt/OLh9xw/PD\n\tOPbbduEYfy86pa0gtydGVCHINJKqzxMkJ+e5u60o=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 18 Feb 2021 08:53:29 +0200","Message-Id":"<20210218065329.29317-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.28.0","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH] libcamera: camera: Constify controls\n\targument to start()","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The ControlList passed to the Camera::start() function isn't modified.\nMake it const.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/camera.h | 2 +-\n include/libcamera/internal/pipeline_handler.h | 2 +-\n src/libcamera/camera.cpp | 2 +-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 4 ++--\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 4 ++--\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 ++--\n src/libcamera/pipeline/simple/simple.cpp | 4 ++--\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 4 ++--\n src/libcamera/pipeline/vimc/vimc.cpp | 4 ++--\n 9 files changed, 15 insertions(+), 15 deletions(-)","diff":"diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h\nindex bd81fb54502e..326b14d0ca01 100644\n--- a/include/libcamera/camera.h\n+++ b/include/libcamera/camera.h\n@@ -100,7 +100,7 @@ public:\n \tstd::unique_ptr createRequest(uint64_t cookie = 0);\n \tint queueRequest(Request *request);\n \n-\tint start(ControlList *controls = nullptr);\n+\tint start(const ControlList *controls = nullptr);\n \tint stop();\n \n private:\ndiff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex d455d3c9dc4f..6aca0b46f43d 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -76,7 +76,7 @@ public:\n \tvirtual int exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t\t std::vector> *buffers) = 0;\n \n-\tvirtual int start(Camera *camera, ControlList *controls) = 0;\n+\tvirtual int start(Camera *camera, const ControlList *controls) = 0;\n \tvirtual void stop(Camera *camera) = 0;\n \n \tint queueRequest(Request *request);\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex c9c79b91e3ae..84edbb8f494d 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -1018,7 +1018,7 @@ int Camera::queueRequest(Request *request)\n * \\retval -ENODEV The camera has been disconnected from the system\n * \\retval -EACCES The camera is not in a state where it can be started\n */\n-int Camera::start(ControlList *controls)\n+int Camera::start(const ControlList *controls)\n {\n \tPrivate *const d = LIBCAMERA_D_PTR();\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 3e6b88af4188..76fc7efd408b 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -126,7 +126,7 @@ public:\n \tint exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t std::vector> *buffers) override;\n \n-\tint start(Camera *camera, ControlList *controls) override;\n+\tint start(Camera *camera, const ControlList *controls) override;\n \tvoid stop(Camera *camera) override;\n \n \tint queueRequestDevice(Camera *camera, Request *request) override;\n@@ -646,7 +646,7 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)\n \treturn 0;\n }\n \n-int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] ControlList *controls)\n+int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] const ControlList *controls)\n {\n \tstd::map entityControls;\n \tIPU3CameraData *data = cameraData(camera);\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 15aa600ed581..46361bf3fa51 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -252,7 +252,7 @@ public:\n \tint exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t std::vector> *buffers) override;\n \n-\tint start(Camera *camera, ControlList *controls) override;\n+\tint start(Camera *camera, const ControlList *controls) override;\n \tvoid stop(Camera *camera) override;\n \n \tint queueRequestDevice(Camera *camera, Request *request) override;\n@@ -760,7 +760,7 @@ int PipelineHandlerRPi::exportFrameBuffers([[maybe_unused]] Camera *camera, Stre\n \treturn ret;\n }\n \n-int PipelineHandlerRPi::start(Camera *camera, ControlList *controls)\n+int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls)\n {\n \tRPiCameraData *data = cameraData(camera);\n \tint ret;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex a794501a9c8d..538c01392293 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -142,7 +142,7 @@ public:\n \tint exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t std::vector> *buffers) override;\n \n-\tint start(Camera *camera, ControlList *controls) override;\n+\tint start(Camera *camera, const ControlList *controls) override;\n \tvoid stop(Camera *camera) override;\n \n \tint queueRequestDevice(Camera *camera, Request *request) override;\n@@ -745,7 +745,7 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera)\n \treturn 0;\n }\n \n-int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] ControlList *controls)\n+int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlList *controls)\n {\n \tRkISP1CameraData *data = cameraData(camera);\n \tint ret;\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 23320d2687e1..35cd34ddbf54 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -125,7 +125,7 @@ public:\n \tint exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t std::vector> *buffers) override;\n \n-\tint start(Camera *camera, ControlList *controls) override;\n+\tint start(Camera *camera, const ControlList *controls) override;\n \tvoid stop(Camera *camera) override;\n \n \tbool match(DeviceEnumerator *enumerator) override;\n@@ -641,7 +641,7 @@ int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream,\n \t\treturn data->video_->exportBuffers(count, buffers);\n }\n \n-int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] ControlList *controls)\n+int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlList *controls)\n {\n \tSimpleCameraData *data = cameraData(camera);\n \tV4L2VideoDevice *video = data->video_;\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 08a594175091..031f96e28449 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -72,7 +72,7 @@ public:\n \tint exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t std::vector> *buffers) override;\n \n-\tint start(Camera *camera, ControlList *controls) override;\n+\tint start(Camera *camera, const ControlList *controls) override;\n \tvoid stop(Camera *camera) override;\n \n \tint queueRequestDevice(Camera *camera, Request *request) override;\n@@ -232,7 +232,7 @@ int PipelineHandlerUVC::exportFrameBuffers(Camera *camera, Stream *stream,\n \treturn data->video_->exportBuffers(count, buffers);\n }\n \n-int PipelineHandlerUVC::start(Camera *camera, [[maybe_unused]] ControlList *controls)\n+int PipelineHandlerUVC::start(Camera *camera, [[maybe_unused]] const ControlList *controls)\n {\n \tUVCCameraData *data = cameraData(camera);\n \tunsigned int count = data->stream_.configuration().bufferCount;\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 78b47916b4db..57c65b021c46 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -86,7 +86,7 @@ public:\n \tint exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t std::vector> *buffers) override;\n \n-\tint start(Camera *camera, ControlList *controls) override;\n+\tint start(Camera *camera, const ControlList *controls) override;\n \tvoid stop(Camera *camera) override;\n \n \tint queueRequestDevice(Camera *camera, Request *request) override;\n@@ -307,7 +307,7 @@ int PipelineHandlerVimc::exportFrameBuffers(Camera *camera, Stream *stream,\n \treturn data->video_->exportBuffers(count, buffers);\n }\n \n-int PipelineHandlerVimc::start(Camera *camera, [[maybe_unused]] ControlList *controls)\n+int PipelineHandlerVimc::start(Camera *camera, [[maybe_unused]] const ControlList *controls)\n {\n \tVimcCameraData *data = cameraData(camera);\n \tunsigned int count = data->stream_.configuration().bufferCount;\n","prefixes":["libcamera-devel"]}