{"id":21658,"url":"https://patchwork.libcamera.org/api/1.1/patches/21658/?format=json","web_url":"https://patchwork.libcamera.org/patch/21658/","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":"<20241017125220.60567-5-jacopo.mondi@ideasonboard.com>","date":"2024-10-17T12:52:19","name":"[RFC,v2,4/4] libcamera: pipeline_handler: Use YamlEmitter","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b82805c294b67727d63461dc9796044f99ef893a","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/1.1/people/143/?format=json","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21658/mbox/","series":[{"id":4711,"url":"https://patchwork.libcamera.org/api/1.1/series/4711/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4711","date":"2024-10-17T12:52:15","name":"libcamera: Implement YamlEmitter","version":2,"mbox":"https://patchwork.libcamera.org/series/4711/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21658/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21658/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 62A4CC326C\n\tfor ;\n\tThu, 17 Oct 2024 12:52:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 53B9D6538A;\n\tThu, 17 Oct 2024 14:52:42 +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 9C3786538C\n\tfor ;\n\tThu, 17 Oct 2024 14:52:34 +0200 (CEST)","from ideasonboard.com (unknown [5.77.64.27])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F062C6DC;\n\tThu, 17 Oct 2024 14:50:50 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"SrlWD+nU\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1729169451;\n\tbh=p0lwCGrwbm63cvKfCrEcu3tKK5/Lq8nEjhETfACwRfg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=SrlWD+nUoR1Hg4YiqTfJOXkOG0ksOO4r+yGYCZdI9NZ+bFvSl0ZVwaCXZEc9AaKX9\n\tJv1BMs0c5GsoEJSJSwaFsD5rG7452h5Km+p5S+nUv43IoENdSF8hmj88oK/KXPfFPF\n\tvZPMcnZRp8fKt4RcZ4nc2jLI6BdaWQKLYbLnlk+c=","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Cc":"Jacopo Mondi ","Subject":"[RFC v2 4/4] libcamera: pipeline_handler: Use YamlEmitter","Date":"Thu, 17 Oct 2024 14:52:19 +0200","Message-ID":"<20241017125220.60567-5-jacopo.mondi@ideasonboard.com>","X-Mailer":"git-send-email 2.47.0","In-Reply-To":"<20241017125220.60567-1-jacopo.mondi@ideasonboard.com>","References":"<20241017125220.60567-1-jacopo.mondi@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"Replace raw output usage with YamlEmitter.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/internal/pipeline_handler.h | 11 +-\n src/libcamera/pipeline_handler.cpp | 102 +++++++++---------\n 2 files changed, 61 insertions(+), 52 deletions(-)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex fb3914185a01..a10d7b1fab8c 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -19,6 +19,8 @@\n #include \n #include \n \n+#include \"libcamera/internal/yaml_emitter.h\"\n+\n namespace libcamera {\n \n enum class Orientation;\n@@ -110,8 +112,13 @@ private:\n \tconst char *name_;\n \tunsigned int useCount_;\n \n-\tstd::ostream *dumpCaptureScript_;\n-\tstd::ostream *dumpMetadata_;\n+\tstd::unique_ptr controlsEmitter_;\n+\tstd::unique_ptr controlsDict_;\n+\tstd::unique_ptr controlsList_;\n+\n+\tstd::unique_ptr metadataEmitter_;\n+\tstd::unique_ptr metadataDict_;\n+\tstd::unique_ptr metadataList_;\n \n \tfriend class PipelineHandlerFactoryBase;\n };\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 7002b4323bdd..533d0f8fc132 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -69,36 +69,31 @@ LOG_DEFINE_CATEGORY(Pipeline)\n * through the PipelineHandlerFactoryBase::create() function.\n */\n PipelineHandler::PipelineHandler(CameraManager *manager)\n-\t: manager_(manager), useCount_(0),\n-\t dumpCaptureScript_(nullptr), dumpMetadata_(nullptr)\n+\t: manager_(manager), useCount_(0)\n {\n \t/* TODO Print notification that we're dumping capture script */\n \tconst char *file = utils::secure_getenv(\"LIBCAMERA_DUMP_CAPTURE_SCRIPT\");\n \tif (!file)\n \t\treturn;\n \n-\tdumpCaptureScript_ = new std::ofstream(file);\n+\tstd::string filePath(file);\n+\tcontrolsEmitter_ = YamlEmitter::root(filePath);\n+\tcontrolsDict_ = controlsEmitter_->dict();\n \n \t/*\n \t * Metadata needs to go into a separate file because otherwise it'll\n \t * flood the capture script\n \t */\n-\tdumpMetadata_ = new std::ofstream(std::string(file) + \".metadata\");\n-\tstd::string str = \"frames:\\n\";\n-\tdumpMetadata_->write(str.c_str(), str.size());\n-\tdumpMetadata_->flush();\n+\tstd::string metadataFilePath = filePath + \".metadata\";\n+\tmetadataEmitter_ = YamlEmitter::root(metadataFilePath);\n+\tmetadataDict_ = metadataEmitter_->dict();\n+\tmetadataList_ = metadataDict_->list(\"frames\");\n }\n \n PipelineHandler::~PipelineHandler()\n {\n \tfor (std::shared_ptr media : mediaDevices_)\n \t\tmedia->release();\n-\n-\tif (dumpCaptureScript_)\n-\t\tdelete dumpCaptureScript_;\n-\n-\tif (dumpMetadata_)\n-\t\tdelete dumpMetadata_;\n }\n \n /**\n@@ -788,65 +783,72 @@ void PipelineHandler::disconnect()\n void PipelineHandler::dumpConfiguration(const std::set &streams,\n \t\t\t\t\tconst Orientation &orientation)\n {\n-\tif (!dumpCaptureScript_)\n+\tif (!controlsEmitter_)\n \t\treturn;\n \n-\tstd::stringstream ss;\n-\tss << \"configuration:\" << std::endl;\n-\tss << \" orientation: \" << orientation << std::endl;\n+\tauto configurationDict = controlsDict_->dict(\"configuration\");\n+\n+\tstd::stringstream o;\n+\to << orientation;\n+\t(*configurationDict)[\"orientation\"] = o.str();\n \n \t/* TODO Dump Sensor configuration */\n \n-\tss << \" streams:\" << std::endl;\n+\tauto streamsList = configurationDict->list(\"streams\");\n+\n \tfor (const auto &stream : streams) {\n \t\tconst StreamConfiguration &streamConfig = stream->configuration();\n-\t\tss << \" - pixelFormat: \" << streamConfig.pixelFormat << std::endl;\n-\t\tss << \" size: \" << streamConfig.size << std::endl;\n-\t\tss << \" stride: \" << streamConfig.stride << std::endl;\n-\t\tss << \" frameSize: \" << streamConfig.frameSize << std::endl;\n-\t\tss << \" bufferCount: \" << streamConfig.bufferCount << std::endl;\n-\t\tif (streamConfig.colorSpace)\n-\t\t\tss << \" colorSpace: \" << streamConfig.colorSpace->toString() << std::endl;\n-\t}\n+\t\tauto yamlStream = streamsList->dict();\n \n-\tdumpCaptureScript_->write(ss.str().c_str(), ss.str().size());\n+\t\t(*yamlStream)[\"pixelformat\"] = streamConfig.pixelFormat.toString();\n+\t\t(*yamlStream)[\"size\"] = streamConfig.size.toString();\n+\t\t(*yamlStream)[\"stride\"] = std::to_string(streamConfig.stride);\n+\t\t(*yamlStream)[\"frameSize\"] = std::to_string(streamConfig.frameSize);\n+\t\t(*yamlStream)[\"bufferCount\"] = std::to_string(streamConfig.bufferCount);\n \n-\tstd::string str = \"frames:\\n\";\n-\tdumpCaptureScript_->write(str.c_str(), str.size());\n-\tdumpCaptureScript_->flush();\n+\t\tif (streamConfig.colorSpace)\n+\t\t\t(*yamlStream)[\"colorSpace\"] =\n+\t\t\t\tstreamConfig.colorSpace->toString();\n+\t}\n }\n \n void PipelineHandler::dumpRequest(Request *request, DumpMode mode)\n {\n-\tControlList &controls =\n-\t\tmode == DumpMode::Controls ? request->controls()\n-\t\t\t\t\t : request->metadata();\n-\tstd::ostream *output =\n-\t\tmode == DumpMode::Controls ? dumpCaptureScript_\n-\t\t\t\t\t : dumpMetadata_;\n-\n-\tif (!output || controls.empty())\n+\tif (!controlsEmitter_)\n \t\treturn;\n \n-\tstd::stringstream ss;\n+\tControlList &controls = mode == DumpMode::Controls ? request->controls()\n+\t\t\t\t\t\t\t : request->metadata();\n+\tif (controls.empty())\n+\t\treturn;\n+\n+\tstd::unique_ptr yamlFrame;\n+\tif (mode == DumpMode::Controls) {\n+\t\tif (!controlsEmitter_)\n+\t\t\treturn;\n+\n+\t\tif (!controlsList_)\n+\t\t\tcontrolsList_ = controlsDict_->list(\"frames\");\n+\n+\t\tyamlFrame = controlsList_->dict();\n+\t} else {\n+\t\tif (!metadataEmitter_)\n+\t\t\treturn;\n+\n+\t\tyamlFrame = metadataList_->dict();\n+\t}\n+\n+\tauto yamlCtrls = yamlFrame->dict(std::to_string(request->sequence()));\n+\n \t/* TODO Figure out PFC */\n-\tss << \" - \" << request->sequence() << \":\" << std::endl;\n \n \tconst ControlIdMap *idMap = controls.idMap();\n \tfor (const auto &pair : controls) {\n \t\tconst ControlId *ctrlId = idMap->at(pair.first);\n+\n \t\t/* TODO Prettify enums (probably by upgrading ControlValue::toString()) */\n-\t\tss << \" \" << ctrlId->name() << \": \" << pair.second.toString() << std::endl;\n+\t\t(*yamlCtrls)[ctrlId->name()] = pair.second.toString();\n \t}\n-\n-\t/*\n-\t * TODO Investigate the overhead of flushing this frequently\n-\t * Controls aren't going to be queued too frequently so it should be\n-\t * fine to dump controls every frame. Metadata on the other hand needs\n-\t * to be investigated.\n-\t */\n-\toutput->write(ss.str().c_str(), ss.str().size());\n-\toutput->flush();\n }\n \n /**\n","prefixes":["RFC","v2","4/4"]}