{"id":19311,"url":"https://patchwork.libcamera.org/api/patches/19311/?format=json","web_url":"https://patchwork.libcamera.org/patch/19311/","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":"<20231212115046.102726-7-andrey.konovalov@linaro.org>","date":"2023-12-12T11:50:45","name":"[libcamera-devel,RFC,v2,6/7] libcamera: pipeline: simple: rename converterBuffers_ and related vars","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"16642e803066030722896c4032f4efe90926f50a","submitter":{"id":25,"url":"https://patchwork.libcamera.org/api/people/25/?format=json","name":"Andrey Konovalov","email":"andrey.konovalov@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19311/mbox/","series":[{"id":4114,"url":"https://patchwork.libcamera.org/api/series/4114/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4114","date":"2023-12-12T11:50:39","name":"libcamera: introduce Software ISP and Software IPA","version":2,"mbox":"https://patchwork.libcamera.org/series/4114/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19311/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19311/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 750B7C32BC\n\tfor ;\n\tTue, 12 Dec 2023 11:51:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0BD7262B40;\n\tTue, 12 Dec 2023 12:51:30 +0100 (CET)","from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com\n\t[IPv6:2a00:1450:4864:20::62b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2A4EA62B5A\n\tfor ;\n\tTue, 12 Dec 2023 12:51:28 +0100 (CET)","by mail-ej1-x62b.google.com with SMTP id\n\ta640c23a62f3a-a1e7971db2aso633736966b.3\n\tfor ;\n\tTue, 12 Dec 2023 03:51:28 -0800 (PST)","from Lat-5310.. ([87.116.161.153]) by smtp.gmail.com with ESMTPSA\n\tid\n\ttx17-20020a1709078e9100b00a1b75e0e061sm6213188ejc.130.2023.12.12.03.51.26\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 12 Dec 2023 03:51:27 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1702381890;\n\tbh=fjl8sMSFfkzTBOcgHmEeNYc0wONBoMHUPlxMl7V61oA=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=txiHxC+jWVFfRbiII+OIJhvPZ/DYJVCdsQzTJbjRKQIQixmTebVrKXyzUVsq5MSal\n\tDK/gBHmBYc1s+MmYGmACQlR9Z8c6rU6Ivo24xVeDwsGglJHDPHBlYLZWO6f12feBE2\n\ten1x6TRXRz32dZyDG9eErukJwQy8+y0bTR89EHnHmnFbhAvtEIuoOSOSEnjJucKcCf\n\tjDAgRIM652DgmYpNtdK5vU+5aDYg49eWiewMCunbXFyDPsQio7WeQlvc3Xxuuuy3Kx\n\tuEoEI1VP+b4Od6LDGzBq0RA06pmXi9wq8IIspFXh6ychUklznoLZNeEoUWfDlKbYYh\n\tyGq0sCeZKxxDg==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1702381887; x=1702986687;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=Ul3YjVRAwDCJplrzfkmo/zpiwDH9NzQCnUUAZU0wH4I=;\n\tb=lZzsReAekcvS5huqzSj0D2Q2ygWy/ZHjqzJi1eHdF1znfuHLCgmjNLt+UzUSKSBVVR\n\twKsBm0BZxhwhiqYdur/50vy2NAyvy+hcxwfwfQc17O5VdennsGfnNqZ4AZ5mlOhLjluF\n\tj8yvhXJ0QanC8+eyWBPzU8mwV99L8gRNtzFY6Ptt6ZSP6jSxP37Bq44h8W0ZF7SIsolN\n\tES4AQhZDtyqN1WepGZ9PGUUxZqUie1nQozjiaBMLp2b5Du3YJRmukJ2TMjS6lRzkjrVV\n\t27G36aeGGMl7g8nVs1lxQt7vtIjv8fL/B14ZcmHvNNSgsk+m2dsEXQA76LxfjeOcs9vo\n\tOIxQ=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=linaro.org\n\theader.i=@linaro.org header.b=\"lZzsReAe\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1702381887; x=1702986687;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=Ul3YjVRAwDCJplrzfkmo/zpiwDH9NzQCnUUAZU0wH4I=;\n\tb=RA1E855LbZBxKWBi9GmpNxID5O6ynp9mbDD/Hsx9n2zNUKZp6dv5OFBVNZ5Rcx9LZj\n\tXtO+OEsRvuSRkyTQl/u1XqkJahdPOphY/vqD/1JX1TpaNK6azGxowCknsQonA9dwm/9p\n\tvaVVLaoNX6V7frxKUDchNxBbC54cTnnOIBMc46Re8VT1q2mXFPEhiOPnD2A4r9QI/Ewv\n\tahEA7n7wYOQfukSPJx9Rv8L6G9Fv7JUAVQFzFSjnGO/fsgKIKhJXdLZ6o7tEI1aXnWGZ\n\t4w2VzJv0of9YvaOKha5kyMredPxL7EzW0JlRUVeUq92KYQoocwy/Do5NvZ0mRNpNDkdN\n\t8z5A==","X-Gm-Message-State":"AOJu0YxET7XltRZLQWJH/NvRvQpBiOX9UXh/Znxx02AiBAnvBMkiDeMp\n\tCTI3q/zLuViQq5oU8sOmYrORGXef8WeCKIWfBJU=","X-Google-Smtp-Source":"AGHT+IHmQRBAp5lBCqIYWdgmNStRBhA3JMNlz+lz0Pha1070up+4Bf2aTmG3BQ9GJrx0Db1jS4uhWg==","X-Received":"by 2002:a17:907:3f10:b0:a1f:750e:a285 with SMTP id\n\thq16-20020a1709073f1000b00a1f750ea285mr3494293ejc.39.1702381887761; \n\tTue, 12 Dec 2023 03:51:27 -0800 (PST)","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 12 Dec 2023 14:50:45 +0300","Message-Id":"<20231212115046.102726-7-andrey.konovalov@linaro.org>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20231212115046.102726-1-andrey.konovalov@linaro.org>","References":"<20231212115046.102726-1-andrey.konovalov@linaro.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC PATCH v2 6/7] libcamera: pipeline: simple:\n\trename converterBuffers_ and related vars","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","From":"Andrey Konovalov via libcamera-devel\n\t","Reply-To":"Andrey Konovalov ","Cc":"mripard@redhat.com, g.martti@gmail.com, t.langendam@gmail.com,\n\tsrinivas.kandagatla@linaro.org, pavel@ucw.cz,\n\tbryan.odonoghue@linaro.org, admin@dennisbonke.com","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The converterBuffers_ and the converterQueue_ are not that specific\nto the Converter, and could be used by another entity doing the format\nconversion.\n\nRename converterBuffers_, converterQueue_, and useConverter_ to\nconversionBuffers_, conversionQueue_ and useConversion_ to\ndisassociate them from the Converter.\n\nSigned-off-by: Andrey Konovalov \n---\n src/libcamera/pipeline/simple/simple.cpp | 63 ++++++++++++------------\n 1 file changed, 32 insertions(+), 31 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 911051b2..878794f6 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -269,17 +269,18 @@ public:\n \tstd::vector configs_;\n \tstd::map> formats_;\n \n+\tstd::vector> conversionBuffers_;\n+\tstd::queue> conversionQueue_;\n+\tbool useConversion_;\n+\n \tstd::unique_ptr converter_;\n-\tstd::vector> converterBuffers_;\n-\tbool useConverter_;\n-\tstd::queue> converterQueue_;\n \n private:\n \tvoid tryPipeline(unsigned int code, const Size &size);\n \tstatic std::vector routedSourcePads(MediaPad *sink);\n \n-\tvoid converterInputDone(FrameBuffer *buffer);\n-\tvoid converterOutputDone(FrameBuffer *buffer);\n+\tvoid conversionInputDone(FrameBuffer *buffer);\n+\tvoid conversionOutputDone(FrameBuffer *buffer);\n };\n \n class SimpleCameraConfiguration : public CameraConfiguration\n@@ -503,8 +504,8 @@ int SimpleCameraData::init()\n \t\t\t\t<< \"Failed to create converter, disabling format conversion\";\n \t\t\tconverter_.reset();\n \t\t} else {\n-\t\t\tconverter_->inputBufferReady.connect(this, &SimpleCameraData::converterInputDone);\n-\t\t\tconverter_->outputBufferReady.connect(this, &SimpleCameraData::converterOutputDone);\n+\t\t\tconverter_->inputBufferReady.connect(this, &SimpleCameraData::conversionInputDone);\n+\t\t\tconverter_->outputBufferReady.connect(this, &SimpleCameraData::conversionOutputDone);\n \t\t}\n \t}\n \n@@ -740,7 +741,7 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \t * point converting an erroneous buffer.\n \t */\n \tif (buffer->metadata().status != FrameMetadata::FrameSuccess) {\n-\t\tif (!useConverter_) {\n+\t\tif (!useConversion_) {\n \t\t\t/* No conversion, just complete the request. */\n \t\t\tRequest *request = buffer->request();\n \t\t\tpipe->completeBuffer(request, buffer);\n@@ -756,16 +757,16 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \t\tif (buffer->metadata().status != FrameMetadata::FrameCancelled)\n \t\t\tvideo_->queueBuffer(buffer);\n \n-\t\tif (converterQueue_.empty())\n+\t\tif (conversionQueue_.empty())\n \t\t\treturn;\n \n \t\tRequest *request = nullptr;\n-\t\tfor (auto &item : converterQueue_.front()) {\n+\t\tfor (auto &item : conversionQueue_.front()) {\n \t\t\tFrameBuffer *outputBuffer = item.second;\n \t\t\trequest = outputBuffer->request();\n \t\t\tpipe->completeBuffer(request, outputBuffer);\n \t\t}\n-\t\tconverterQueue_.pop();\n+\t\tconversionQueue_.pop();\n \n \t\tif (request)\n \t\t\tpipe->completeRequest(request);\n@@ -782,9 +783,9 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \t */\n \tRequest *request = buffer->request();\n \n-\tif (useConverter_ && !converterQueue_.empty()) {\n+\tif (useConversion_ && !conversionQueue_.empty()) {\n \t\tconst std::map &outputs =\n-\t\t\tconverterQueue_.front();\n+\t\t\tconversionQueue_.front();\n \t\tif (!outputs.empty()) {\n \t\t\tFrameBuffer *outputBuffer = outputs.begin()->second;\n \t\t\tif (outputBuffer)\n@@ -801,14 +802,14 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \t * conversion is needed. If there's no queued request, just requeue the\n \t * captured buffer for capture.\n \t */\n-\tif (useConverter_) {\n-\t\tif (converterQueue_.empty()) {\n+\tif (useConversion_) {\n+\t\tif (conversionQueue_.empty()) {\n \t\t\tvideo_->queueBuffer(buffer);\n \t\t\treturn;\n \t\t}\n \n-\t\tconverter_->queueBuffers(buffer, converterQueue_.front());\n-\t\tconverterQueue_.pop();\n+\t\tconverter_->queueBuffers(buffer, conversionQueue_.front());\n+\t\tconversionQueue_.pop();\n \t\treturn;\n \t}\n \n@@ -817,13 +818,13 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)\n \tpipe->completeRequest(request);\n }\n \n-void SimpleCameraData::converterInputDone(FrameBuffer *buffer)\n+void SimpleCameraData::conversionInputDone(FrameBuffer *buffer)\n {\n \t/* Queue the input buffer back for capture. */\n \tvideo_->queueBuffer(buffer);\n }\n \n-void SimpleCameraData::converterOutputDone(FrameBuffer *buffer)\n+void SimpleCameraData::conversionOutputDone(FrameBuffer *buffer)\n {\n \tSimplePipelineHandler *pipe = SimpleCameraData::pipe();\n \n@@ -1156,14 +1157,14 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \n \t/* Configure the converter if needed. */\n \tstd::vector> outputCfgs;\n-\tdata->useConverter_ = config->needConversion();\n+\tdata->useConversion_ = config->needConversion();\n \n \tfor (unsigned int i = 0; i < config->size(); ++i) {\n \t\tStreamConfiguration &cfg = config->at(i);\n \n \t\tcfg.setStream(&data->streams_[i]);\n \n-\t\tif (data->useConverter_)\n+\t\tif (data->useConversion_)\n \t\t\toutputCfgs.push_back(cfg);\n \t}\n \n@@ -1189,7 +1190,7 @@ int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream,\n \t * Export buffers on the converter or capture video node, depending on\n \t * whether the converter is used or not.\n \t */\n-\tif (data->useConverter_)\n+\tif (data->useConversion_)\n \t\treturn data->converter_->exportBuffers(data->streamIndex(stream),\n \t\t\t\t\t\t count, buffers);\n \telse\n@@ -1210,13 +1211,13 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL\n \t\treturn -EBUSY;\n \t}\n \n-\tif (data->useConverter_) {\n+\tif (data->useConversion_) {\n \t\t/*\n \t\t * When using the converter allocate a fixed number of internal\n \t\t * buffers.\n \t\t */\n \t\tret = video->allocateBuffers(kNumInternalBuffers,\n-\t\t\t\t\t &data->converterBuffers_);\n+\t\t\t\t\t &data->conversionBuffers_);\n \t} else {\n \t\t/* Otherwise, prepare for using buffers from the only stream. */\n \t\tStream *stream = &data->streams_[0];\n@@ -1235,7 +1236,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL\n \t\treturn ret;\n \t}\n \n-\tif (data->useConverter_) {\n+\tif (data->useConversion_) {\n \t\tret = data->converter_->start();\n \t\tif (ret < 0) {\n \t\t\tstop(camera);\n@@ -1243,7 +1244,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL\n \t\t}\n \n \t\t/* Queue all internal buffers for capture. */\n-\t\tfor (std::unique_ptr &buffer : data->converterBuffers_)\n+\t\tfor (std::unique_ptr &buffer : data->conversionBuffers_)\n \t\t\tvideo->queueBuffer(buffer.get());\n \t}\n \n@@ -1255,7 +1256,7 @@ void SimplePipelineHandler::stopDevice(Camera *camera)\n \tSimpleCameraData *data = cameraData(camera);\n \tV4L2VideoDevice *video = data->video_;\n \n-\tif (data->useConverter_)\n+\tif (data->useConversion_)\n \t\tdata->converter_->stop();\n \n \tvideo->streamOff();\n@@ -1263,7 +1264,7 @@ void SimplePipelineHandler::stopDevice(Camera *camera)\n \n \tvideo->bufferReady.disconnect(data, &SimpleCameraData::bufferReady);\n \n-\tdata->converterBuffers_.clear();\n+\tdata->conversionBuffers_.clear();\n \n \treleasePipeline(data);\n }\n@@ -1281,7 +1282,7 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n \t\t * queue, it will be handed to the converter in the capture\n \t\t * completion handler.\n \t\t */\n-\t\tif (data->useConverter_) {\n+\t\tif (data->useConversion_) {\n \t\t\tbuffers.emplace(data->streamIndex(stream), buffer);\n \t\t} else {\n \t\t\tret = data->video_->queueBuffer(buffer);\n@@ -1290,8 +1291,8 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n \t\t}\n \t}\n \n-\tif (data->useConverter_)\n-\t\tdata->converterQueue_.push(std::move(buffers));\n+\tif (data->useConversion_)\n+\t\tdata->conversionQueue_.push(std::move(buffers));\n \n \treturn 0;\n }\n","prefixes":["libcamera-devel","RFC","v2","6/7"]}