{"id":984,"url":"https://patchwork.libcamera.org/api/patches/984/?format=json","web_url":"https://patchwork.libcamera.org/patch/984/","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":"<20190415165700.22970-4-laurent.pinchart@ideasonboard.com>","date":"2019-04-15T16:56:52","name":"[libcamera-devel,03/11] libcamera: camera: Log requested configuration in configureStreams()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"85c6b8ad5d0ff32e6af6e781b61bea82feb333b6","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/984/mbox/","series":[{"id":250,"url":"https://patchwork.libcamera.org/api/series/250/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=250","date":"2019-04-15T16:56:49","name":"Rockchip ISP pipeline handler","version":1,"mbox":"https://patchwork.libcamera.org/series/250/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/984/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/984/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 3287760DBF\n\tfor ;\n\tMon, 15 Apr 2019 18:57:15 +0200 (CEST)","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 BACA0B81\n\tfor ;\n\tMon, 15 Apr 2019 18:57:14 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1555347434;\n\tbh=gk+2Z40UM/TXch3cDOWs9HuvY8eoi8m5fC3GTHxIld0=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Btg9B1nAAnDBog3IToivJC4EIoBu1JNu9e11hImXgqgGxzSVoV7SEqE+uzi69edo3\n\tqvwNUJ2UGRMsrmv/lvMPhmZG8T8yh2UyEUWn8MjqwDnQEJbXwp7VDOoO+ZlckyjJSQ\n\trIVq4eYrZQ/bvrOo6reEZXIDtgdLtCfIKOtqQa6U=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 15 Apr 2019 19:56:52 +0300","Message-Id":"<20190415165700.22970-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190415165700.22970-1-laurent.pinchart@ideasonboard.com>","References":"<20190415165700.22970-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 03/11] libcamera: camera: Log requested\n\tconfiguration in configureStreams()","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":"Mon, 15 Apr 2019 16:57:17 -0000"},"content":"The IPU3 pipeline handler logs the requested configuration in its\nconfigureStreams() handler. This is useful for other pipeline handlers\nas well, move it to the Camera class.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/camera.cpp | 14 ++++++++++++++\n src/libcamera/pipeline/ipu3/ipu3.cpp | 6 ------\n 2 files changed, 14 insertions(+), 6 deletions(-)","diff":"diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex bdf14b31d8ee..55f724a8db17 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -5,6 +5,8 @@\n * camera.cpp - Camera device\n */\n \n+#include \n+\n #include \n #include \n #include \n@@ -595,11 +597,23 @@ int Camera::configureStreams(const CameraConfiguration &config)\n \t\treturn -EINVAL;\n \t}\n \n+\tstd::ostringstream msg(\"configuring streams:\");\n+\tunsigned int index = 0;\n+\n \tfor (Stream *stream : config) {\n \t\tif (streams_.find(stream) == streams_.end())\n \t\t\treturn -EINVAL;\n+\n+\t\tconst StreamConfiguration &cfg = config[stream];\n+\t\tmsg << \" (\" << index << \") \" << cfg.width << \"x\"\n+\t\t << cfg.height << \"-0x\" << std::hex << std::setfill('0')\n+\t\t << std::setw(8) << cfg.pixelFormat;\n+\n+\t\tindex++;\n \t}\n \n+\tLOG(Camera, Info) << msg.str();\n+\n \tret = pipe_->configureStreams(this, config);\n \tif (ret)\n \t\treturn ret;\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex ca09da753b90..ff72be14d696 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -242,12 +242,6 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,\n \tImgUDevice *imgu = data->imgu_;\n \tint ret;\n \n-\tLOG(IPU3, Info)\n-\t\t<< \"Requested image format \" << cfg.width << \"x\"\n-\t\t<< cfg.height << \"-0x\" << std::hex << std::setfill('0')\n-\t\t<< std::setw(8) << cfg.pixelFormat << \" on camera '\"\n-\t\t<< camera->name() << \"'\";\n-\n \t/*\n \t * Verify that the requested size respects the IPU3 alignement\n \t * requirements (the image width shall be a multiple of 8 pixels and\n","prefixes":["libcamera-devel","03/11"]}