{"id":657,"url":"https://patchwork.libcamera.org/api/patches/657/?format=json","web_url":"https://patchwork.libcamera.org/patch/657/","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":"<20190228162913.6508-5-laurent.pinchart@ideasonboard.com>","date":"2019-02-28T16:29:07","name":"[libcamera-devel,04/10] libcamera: pipeline_handler: Pass a non-const Camera to methods","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1140595b18a9fc18140960836a1bd2b8791f27ba","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/657/mbox/","series":[{"id":196,"url":"https://patchwork.libcamera.org/api/series/196/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=196","date":"2019-02-28T16:29:03","name":"Rework request completion handling","version":1,"mbox":"https://patchwork.libcamera.org/series/196/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/657/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/657/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3A8F4610BF\n\tfor ;\n\tThu, 28 Feb 2019 17:29:26 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D1DD749\n\tfor ;\n\tThu, 28 Feb 2019 17:29:25 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1551371366;\n\tbh=KhL0VPGAZ282yG7zRGCD4VmASgKPaOaRe223Y9+kyO8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=mHypCLESj4dDsOIQLUIcklRk4onavSrOdnZb/gTFrlX+LOOeaFNOVFGeLGAx661K1\n\tnRV0NfmzfZfjsjPMWb1iKWswRCJkYXKOjCkpSFNxrk7cOdPIqqDUW/ysnGsj8pqs9p\n\ttKUQh+VrWVa2BBzOBdDVpge+jpgSWovB0bhgSaFE=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 28 Feb 2019 18:29:07 +0200","Message-Id":"<20190228162913.6508-5-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","In-Reply-To":"<20190228162913.6508-1-laurent.pinchart@ideasonboard.com>","References":"<20190228162913.6508-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 04/10] libcamera: pipeline_handler: Pass a\n\tnon-const Camera to methods","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 28 Feb 2019 16:29:27 -0000"},"content":"The start(), stop() and queueRequest() methods receive a const pointer\nto the related Camera object. The stop() request will need to modify the\nstate of the camera, in order to report completion of pending requests.\nUn-constify the Camera pointer to that method, and update the start()\nand queueRequest() methods similarly for coherency.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/include/pipeline_handler.h | 6 +++---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 12 ++++++------\n src/libcamera/pipeline/uvcvideo.cpp | 12 ++++++------\n src/libcamera/pipeline/vimc.cpp | 12 ++++++------\n 4 files changed, 21 insertions(+), 21 deletions(-)","diff":"diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex 4363dcd8ed8e..45e1f07ffca9 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -52,10 +52,10 @@ public:\n \tvirtual int allocateBuffers(Camera *camera, Stream *stream) = 0;\n \tvirtual int freeBuffers(Camera *camera, Stream *stream) = 0;\n \n-\tvirtual int start(const Camera *camera) = 0;\n-\tvirtual void stop(const Camera *camera) = 0;\n+\tvirtual int start(Camera *camera) = 0;\n+\tvirtual void stop(Camera *camera) = 0;\n \n-\tvirtual int queueRequest(const Camera *camera, Request *request) = 0;\n+\tvirtual int queueRequest(Camera *camera, Request *request) = 0;\n \n protected:\n \tvoid registerCamera(std::shared_ptr camera);\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex cf5c28577393..248e921117f4 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -39,10 +39,10 @@ public:\n \tint allocateBuffers(Camera *camera, Stream *stream) override;\n \tint freeBuffers(Camera *camera, Stream *stream) override;\n \n-\tint start(const Camera *camera) override;\n-\tvoid stop(const Camera *camera) override;\n+\tint start(Camera *camera) override;\n+\tvoid stop(Camera *camera) override;\n \n-\tint queueRequest(const Camera *camera, Request *request) override;\n+\tint queueRequest(Camera *camera, Request *request) override;\n \n \tbool match(DeviceEnumerator *enumerator);\n \n@@ -213,7 +213,7 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera, Stream *stream)\n \treturn 0;\n }\n \n-int PipelineHandlerIPU3::start(const Camera *camera)\n+int PipelineHandlerIPU3::start(Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \tint ret;\n@@ -227,7 +227,7 @@ int PipelineHandlerIPU3::start(const Camera *camera)\n \treturn 0;\n }\n \n-void PipelineHandlerIPU3::stop(const Camera *camera)\n+void PipelineHandlerIPU3::stop(Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \n@@ -235,7 +235,7 @@ void PipelineHandlerIPU3::stop(const Camera *camera)\n \t\tLOG(IPU3, Info) << \"Failed to stop camera \" << camera->name();\n }\n \n-int PipelineHandlerIPU3::queueRequest(const Camera *camera, Request *request)\n+int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \tStream *stream = &data->stream_;\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 4ad311163a95..cc513513cb34 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -35,10 +35,10 @@ public:\n \tint allocateBuffers(Camera *camera, Stream *stream) override;\n \tint freeBuffers(Camera *camera, Stream *stream) override;\n \n-\tint start(const Camera *camera) override;\n-\tvoid stop(const Camera *camera) override;\n+\tint start(Camera *camera) override;\n+\tvoid stop(Camera *camera) override;\n \n-\tint queueRequest(const Camera *camera, Request *request) override;\n+\tint queueRequest(Camera *camera, Request *request) override;\n \n \tbool match(DeviceEnumerator *enumerator);\n \n@@ -142,19 +142,19 @@ int PipelineHandlerUVC::freeBuffers(Camera *camera, Stream *stream)\n \treturn data->video_->releaseBuffers();\n }\n \n-int PipelineHandlerUVC::start(const Camera *camera)\n+int PipelineHandlerUVC::start(Camera *camera)\n {\n \tUVCCameraData *data = cameraData(camera);\n \treturn data->video_->streamOn();\n }\n \n-void PipelineHandlerUVC::stop(const Camera *camera)\n+void PipelineHandlerUVC::stop(Camera *camera)\n {\n \tUVCCameraData *data = cameraData(camera);\n \tdata->video_->streamOff();\n }\n \n-int PipelineHandlerUVC::queueRequest(const Camera *camera, Request *request)\n+int PipelineHandlerUVC::queueRequest(Camera *camera, Request *request)\n {\n \tUVCCameraData *data = cameraData(camera);\n \tBuffer *buffer = request->findBuffer(&data->stream_);\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex ef47e7f96436..1d01fa80f8d5 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -35,10 +35,10 @@ public:\n \tint allocateBuffers(Camera *camera, Stream *stream) override;\n \tint freeBuffers(Camera *camera, Stream *stream) override;\n \n-\tint start(const Camera *camera) override;\n-\tvoid stop(const Camera *camera) override;\n+\tint start(Camera *camera) override;\n+\tvoid stop(Camera *camera) override;\n \n-\tint queueRequest(const Camera *camera, Request *request) override;\n+\tint queueRequest(Camera *camera, Request *request) override;\n \n \tbool match(DeviceEnumerator *enumerator);\n \n@@ -142,19 +142,19 @@ int PipelineHandlerVimc::freeBuffers(Camera *camera, Stream *stream)\n \treturn data->video_->releaseBuffers();\n }\n \n-int PipelineHandlerVimc::start(const Camera *camera)\n+int PipelineHandlerVimc::start(Camera *camera)\n {\n \tVimcCameraData *data = cameraData(camera);\n \treturn data->video_->streamOn();\n }\n \n-void PipelineHandlerVimc::stop(const Camera *camera)\n+void PipelineHandlerVimc::stop(Camera *camera)\n {\n \tVimcCameraData *data = cameraData(camera);\n \tdata->video_->streamOff();\n }\n \n-int PipelineHandlerVimc::queueRequest(const Camera *camera, Request *request)\n+int PipelineHandlerVimc::queueRequest(Camera *camera, Request *request)\n {\n \tVimcCameraData *data = cameraData(camera);\n \tBuffer *buffer = request->findBuffer(&data->stream_);\n","prefixes":["libcamera-devel","04/10"]}