Patch Detail
Show a patch.
GET /api/patches/13239/?format=api
{ "id": 13239, "url": "https://patchwork.libcamera.org/api/patches/13239/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13239/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210805222436.6263-9-laurent.pinchart@ideasonboard.com>", "date": "2021-08-05T22:24:34", "name": "[libcamera-devel,08/10] libcamera: pipeline: simple: Move converter to SimpleCameraData", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "cf36bd9c3a0371d832f5d00b9488539b609e430b", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13239/mbox/", "series": [ { "id": 2314, "url": "https://patchwork.libcamera.org/api/series/2314/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2314", "date": "2021-08-05T22:24:26", "name": "Concurrent camera support in simple pipeline handler", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2314/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13239/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13239/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 2EA3CC323D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 5 Aug 2021 22:25:04 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id ABE8168892;\n\tFri, 6 Aug 2021 00:25:02 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5E441687CF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 6 Aug 2021 00:24:58 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0977EE1A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 6 Aug 2021 00:24:57 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"CP+Z1Cqj\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628202298;\n\tbh=bxrBrcn4L9y9oMNwRh/dP4+Egnd/J4qfdrqUrnhjIy8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=CP+Z1Cqj135uemp0Ny04gQb6GT4IgImm0cjbnLaJ7dq4CglHWKmRATipek+PqavaK\n\tllNFaYIxFqFRTpdGJizozosBJkuTqO3BSib/aUK8Qy51YhFk8MkuRw55PtSbvVIFog\n\tnkc1R+U5CbFKwBfEtsEqKoLyjYBNEn5gHbV2Pq6w=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 6 Aug 2021 01:24:34 +0300", "Message-Id": "<20210805222436.6263-9-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210805222436.6263-1-laurent.pinchart@ideasonboard.com>", "References": "<20210805222436.6263-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 08/10] libcamera: pipeline: simple: Move\n\tconverter to SimpleCameraData", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "To use multiple cameras at the same time, each camera instance will need\nits own converter. Store the converter in SimpleCameraData, and open it\nin init().\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/pipeline/simple/simple.cpp | 106 +++++++++++------------\n 1 file changed, 51 insertions(+), 55 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex b32369cae701..961262b7803d 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -226,9 +226,14 @@ public:\n \tstd::vector<Configuration> configs_;\n \tstd::map<PixelFormat, const Configuration *> formats_;\n \n+\tstd::unique_ptr<SimpleConverter> converter_;\n \tstd::vector<std::unique_ptr<FrameBuffer>> converterBuffers_;\n \tbool useConverter_;\n \tstd::queue<std::map<unsigned int, FrameBuffer *>> converterQueue_;\n+\n+private:\n+\tvoid converterInputDone(FrameBuffer *buffer);\n+\tvoid converterOutputDone(FrameBuffer *buffer);\n };\n \n class SimpleCameraConfiguration : public CameraConfiguration\n@@ -277,7 +282,7 @@ public:\n \n \tV4L2VideoDevice *video(const MediaEntity *entity);\n \tV4L2Subdevice *subdev(const MediaEntity *entity);\n-\tSimpleConverter *converter() { return converter_.get(); }\n+\tMediaDevice *converter() { return converter_; }\n \n protected:\n \tint queueRequestDevice(Camera *camera, Request *request) override;\n@@ -303,13 +308,11 @@ private:\n \tvoid releasePipeline(SimpleCameraData *data);\n \n \tvoid bufferReady(FrameBuffer *buffer);\n-\tvoid converterInputDone(FrameBuffer *buffer);\n-\tvoid converterOutputDone(FrameBuffer *buffer);\n \n \tMediaDevice *media_;\n \tstd::map<const MediaEntity *, EntityData> entities_;\n \n-\tstd::unique_ptr<SimpleConverter> converter_;\n+\tMediaDevice *converter_;\n \n \tCamera *activeCamera_;\n };\n@@ -417,9 +420,22 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n int SimpleCameraData::init()\n {\n \tSimplePipelineHandler *pipe = static_cast<SimplePipelineHandler *>(pipe_);\n-\tSimpleConverter *converter = pipe->converter();\n \tint ret;\n \n+\t/* Open the converter, if any. */\n+\tMediaDevice *converter = pipe->converter();\n+\tif (converter) {\n+\t\tconverter_ = std::make_unique<SimpleConverter>(converter);\n+\t\tif (!converter_->isValid()) {\n+\t\t\tLOG(SimplePipeline, Warning)\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}\n+\t}\n+\n \tvideo_ = pipe->video(entities_.back().entity);\n \tASSERT(video_);\n \n@@ -471,12 +487,12 @@ int SimpleCameraData::init()\n \t\t\tconfig.captureFormat = pixelFormat;\n \t\t\tconfig.captureSize = format.size;\n \n-\t\t\tif (!converter) {\n+\t\t\tif (!converter_) {\n \t\t\t\tconfig.outputFormats = { pixelFormat };\n \t\t\t\tconfig.outputSizes = config.captureSize;\n \t\t\t} else {\n-\t\t\t\tconfig.outputFormats = converter->formats(pixelFormat);\n-\t\t\t\tconfig.outputSizes = converter->sizes(format.size);\n+\t\t\t\tconfig.outputFormats = converter_->formats(pixelFormat);\n+\t\t\t\tconfig.outputSizes = converter_->sizes(format.size);\n \t\t\t}\n \n \t\t\tconfigs_.push_back(config);\n@@ -605,6 +621,20 @@ int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,\n \treturn 0;\n }\n \n+void SimpleCameraData::converterInputDone(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+{\n+\t/* Complete the buffer and the request. */\n+\tRequest *request = buffer->request();\n+\tif (pipe_->completeBuffer(request, buffer))\n+\t\tpipe_->completeRequest(request);\n+}\n+\n /* -----------------------------------------------------------------------------\n * Camera Configuration\n */\n@@ -650,11 +680,9 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \t\t}\n \t}\n \n-\t/* Adjust the requested streams. */\n-\tSimplePipelineHandler *pipe = static_cast<SimplePipelineHandler *>(data_->pipe_);\n-\tSimpleConverter *converter = pipe->converter();\n-\n \t/*\n+\t * Adjust the requested streams.\n+\t *\n \t * Enable usage of the converter when producing multiple streams, as\n \t * the video capture device can't capture to multiple buffers.\n \t *\n@@ -700,7 +728,8 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \t\t/* Set the stride, frameSize and bufferCount. */\n \t\tif (needConversion_) {\n \t\t\tstd::tie(cfg.stride, cfg.frameSize) =\n-\t\t\t\tconverter->strideAndFrameSize(cfg.pixelFormat, cfg.size);\n+\t\t\t\tdata_->converter_->strideAndFrameSize(cfg.pixelFormat,\n+\t\t\t\t\t\t\t\t cfg.size);\n \t\t\tif (cfg.stride == 0)\n \t\t\t\treturn Invalid;\n \t\t} else {\n@@ -727,7 +756,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n */\n \n SimplePipelineHandler::SimplePipelineHandler(CameraManager *manager)\n-\t: PipelineHandler(manager)\n+\t: PipelineHandler(manager), converter_(nullptr)\n {\n }\n \n@@ -841,7 +870,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \tinputCfg.stride = captureFormat.planes[0].bpl;\n \tinputCfg.bufferCount = kNumInternalBuffers;\n \n-\treturn converter_->configure(inputCfg, outputCfgs);\n+\treturn data->converter_->configure(inputCfg, outputCfgs);\n }\n \n int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream,\n@@ -855,8 +884,8 @@ int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream,\n \t * whether the converter is used or not.\n \t */\n \tif (data->useConverter_)\n-\t\treturn converter_->exportBuffers(data->streamIndex(stream),\n-\t\t\t\t\t\t count, buffers);\n+\t\treturn data->converter_->exportBuffers(data->streamIndex(stream),\n+\t\t\t\t\t\t count, buffers);\n \telse\n \t\treturn data->video_->exportBuffers(count, buffers);\n }\n@@ -899,7 +928,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL\n \t}\n \n \tif (data->useConverter_) {\n-\t\tret = converter_->start();\n+\t\tret = data->converter_->start();\n \t\tif (ret < 0) {\n \t\t\tstop(camera);\n \t\t\treturn ret;\n@@ -921,7 +950,7 @@ void SimplePipelineHandler::stop(Camera *camera)\n \tV4L2VideoDevice *video = data->video_;\n \n \tif (data->useConverter_)\n-\t\tconverter_->stop();\n+\t\tdata->converter_->stop();\n \n \tvideo->streamOff();\n \tvideo->releaseBuffers();\n@@ -1028,7 +1057,6 @@ std::vector<MediaEntity *> SimplePipelineHandler::locateSensors()\n bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n {\n \tconst SimplePipelineInfo *info = nullptr;\n-\tMediaDevice *converter = nullptr;\n \tunsigned int numStreams = 1;\n \n \tfor (const SimplePipelineInfo &inf : supportedDevices) {\n@@ -1045,8 +1073,8 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n \n \tfor (const auto &[name, streams] : info->converters) {\n \t\tDeviceMatch converterMatch(name);\n-\t\tconverter = acquireMediaDevice(enumerator, converterMatch);\n-\t\tif (converter) {\n+\t\tconverter_ = acquireMediaDevice(enumerator, converterMatch);\n+\t\tif (converter_) {\n \t\t\tnumStreams = streams;\n \t\t\tbreak;\n \t\t}\n@@ -1059,19 +1087,6 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n \t\treturn false;\n \t}\n \n-\t/* Open the converter, if any. */\n-\tif (converter) {\n-\t\tconverter_ = std::make_unique<SimpleConverter>(converter);\n-\t\tif (!converter_->isValid()) {\n-\t\t\tLOG(SimplePipeline, Warning)\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, &SimplePipelineHandler::converterInputDone);\n-\t\t\tconverter_->outputBufferReady.connect(this, &SimplePipelineHandler::converterOutputDone);\n-\t\t}\n-\t}\n-\n \t/*\n \t * Create one camera data instance for each sensor and gather all\n \t * entities in all pipelines.\n@@ -1317,7 +1332,7 @@ void SimplePipelineHandler::bufferReady(FrameBuffer *buffer)\n \t\t\treturn;\n \t\t}\n \n-\t\tconverter_->queueBuffers(buffer, data->converterQueue_.front());\n+\t\tdata->converter_->queueBuffers(buffer, data->converterQueue_.front());\n \t\tdata->converterQueue_.pop();\n \t\treturn;\n \t}\n@@ -1327,25 +1342,6 @@ void SimplePipelineHandler::bufferReady(FrameBuffer *buffer)\n \tcompleteRequest(request);\n }\n \n-void SimplePipelineHandler::converterInputDone(FrameBuffer *buffer)\n-{\n-\tASSERT(activeCamera_);\n-\tSimpleCameraData *data = cameraData(activeCamera_);\n-\n-\t/* Queue the input buffer back for capture. */\n-\tdata->video_->queueBuffer(buffer);\n-}\n-\n-void SimplePipelineHandler::converterOutputDone(FrameBuffer *buffer)\n-{\n-\tASSERT(activeCamera_);\n-\n-\t/* Complete the buffer and the request. */\n-\tRequest *request = buffer->request();\n-\tif (completeBuffer(request, buffer))\n-\t\tcompleteRequest(request);\n-}\n-\n REGISTER_PIPELINE_HANDLER(SimplePipelineHandler)\n \n } /* namespace libcamera */\n", "prefixes": [ "libcamera-devel", "08/10" ] }