{"id":1115,"url":"https://patchwork.libcamera.org/api/1.1/patches/1115/?format=json","web_url":"https://patchwork.libcamera.org/patch/1115/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20190426150537.18848-1-laurent.pinchart@ideasonboard.com>","date":"2019-04-26T15:05:37","name":"[libcamera-devel] libcamera: camera: Log proposed configuration in streamConfiguration()","commit_ref":"432b14013c4be73894d6931923a58563201589a1","pull_url":null,"state":"accepted","archived":false,"hash":"d6e3312720d0b2c102b2e735b1e8cd7a9cb6fab3","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1115/mbox/","series":[{"id":272,"url":"https://patchwork.libcamera.org/api/1.1/series/272/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=272","date":"2019-04-26T15:05:37","name":"[libcamera-devel] libcamera: camera: Log proposed configuration in streamConfiguration()","version":1,"mbox":"https://patchwork.libcamera.org/series/272/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1115/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1115/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 271D060E9A\n\tfor ;\n\tFri, 26 Apr 2019 17:05:51 +0200 (CEST)","from pendragon.station (net-37-182-44-227.cust.vodafonedsl.it\n\t[37.182.44.227])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 948A85F\n\tfor ;\n\tFri, 26 Apr 2019 17:05:50 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1556291150;\n\tbh=PctbUfsEfBJfOBfOjz1CREI1S7cA/BDTA3HkrBBtfJU=;\n\th=From:To:Subject:Date:From;\n\tb=YDxNJrZ5t8m44BIq9vyfzok5ZOlUy6SeJgruhSr8+cnOGax5+iCMg7gfvdyxNnlxT\n\t25Imk5N0It71oTRZpM04HvMsi4TMHjQoPz5ag/bl13ePftOr6t3y7gop2fdaJKumDM\n\t5QjAK/VNE0RApEVh+vxQvz88LFOz/IirMN0t0FSo=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 26 Apr 2019 18:05:37 +0300","Message-Id":"<20190426150537.18848-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: camera: Log proposed\n\tconfiguration in streamConfiguration()","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":"Fri, 26 Apr 2019 15:05:51 -0000"},"content":"The IPU3 and RKISP1 pipeline handlers log the camera configuration they\npropose in their streamConfiguration() methods. Other pipeline handlers\nare expected to log similar information, move it to the Camera class.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/camera.cpp | 15 ++++++++++++++-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 4 ----\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 --\n 3 files changed, 14 insertions(+), 7 deletions(-)","diff":"diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 655996f26224..a3c3945cf62d 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -546,7 +546,20 @@ Camera::streamConfiguration(const std::vector &usages)\n \tif (disconnected_ || !usages.size() || usages.size() > streams_.size())\n \t\treturn CameraConfiguration();\n \n-\treturn pipe_->streamConfiguration(this, usages);\n+\tCameraConfiguration config = pipe_->streamConfiguration(this, usages);\n+\n+\tstd::ostringstream msg(\"streams configuration:\");\n+\tunsigned int index = 0;\n+\n+\tfor (Stream *stream : config) {\n+\t\tconst StreamConfiguration &cfg = config[stream];\n+\t\tmsg << \" (\" << index << \") \" << cfg.toString();\n+\t\tindex++;\n+\t}\n+\n+\tLOG(Camera, Debug) << msg.str();\n+\n+\treturn config;\n }\n \n /**\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 97a309207621..fbb37498ca8a 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -316,10 +316,6 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,\n \t\tstreamConfig.bufferCount = IPU3_BUFFER_COUNT;\n \n \t\tcameraConfig[stream] = streamConfig;\n-\n-\t\tLOG(IPU3, Debug)\n-\t\t\t<< \"Stream '\" << stream->name_ << \"' format set to \"\n-\t\t\t<< streamConfig.toString();\n \t}\n \n \treturn cameraConfig;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex d21c6266c6ba..9a63a68b81dd 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -124,8 +124,6 @@ CameraConfiguration PipelineHandlerRkISP1::streamConfiguration(Camera *camera,\n \n \tconfigs[&data->stream_] = config;\n \n-\tLOG(RkISP1, Debug) << \"Stream format set to \" << config.toString();\n-\n \treturn configs;\n }\n \n","prefixes":["libcamera-devel"]}