Patch Detail
Show a patch.
GET /api/patches/11333/?format=api
{ "id": 11333, "url": "https://patchwork.libcamera.org/api/patches/11333/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11333/", "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": "<20210218124824.1825418-4-naush@raspberrypi.com>", "date": "2021-02-18T12:48:23", "name": "[libcamera-devel,v3,3/4] pipeline: ipa: raspberrypi: Rename IPA Interface namespace to ipa::RPi", "commit_ref": "a6c41759fcdd90f395ea90040e55d1b881ea04f6", "pull_url": null, "state": "accepted", "archived": false, "hash": "074a54044d27d035d640fdaa980b96a5d3f23e88", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11333/mbox/", "series": [ { "id": 1706, "url": "https://patchwork.libcamera.org/api/series/1706/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1706", "date": "2021-02-18T12:48:20", "name": "Updates after IPAInterface changes", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1706/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11333/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11333/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 00CFABD1F6\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 18 Feb 2021 12:48:38 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AD15B689B6;\n\tThu, 18 Feb 2021 13:48:37 +0100 (CET)", "from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com\n\t[IPv6:2a00:1450:4864:20::32a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 607DB689B5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 18 Feb 2021 13:48:35 +0100 (CET)", "by mail-wm1-x32a.google.com with SMTP id a132so3556150wmc.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 18 Feb 2021 04:48:35 -0800 (PST)", "from naush-laptop.pitowers.org\n\t([2a00:1098:3142:15:c37b:2722:9ed2:1d58])\n\tby smtp.gmail.com with ESMTPSA id\n\tz63sm7675876wme.8.2021.02.18.04.48.33\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 18 Feb 2021 04:48:34 -0800 (PST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"OgwJcUC1\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=tWbYymExjdFC1yv8KSs1CjjsFt8R6XwxYz+zqsbboC8=;\n\tb=OgwJcUC1hozXA3euLu1bzRE5moodtU0xvCojGKBT0OxoaH3tKgoYR4ZHoB4Xi1KkY7\n\tAmVOsCQYf2tdYTOa6w6T76anYrDcCUnAXWQ73U4ZSvwURVT7uJHkFQwlBUITbR8WOUEu\n\tfXF2mqp7DmAiVLtYCo+77gGQ+gTMmjF/JaU2lS252LAVZDZX+zS0R1pkI7TVQh5ax2kV\n\to8H/Rn9kYq3EpIUvqZiEu2Y+7t3Hvf/z6YGELsY5fdGhRCJOt3FsQaZHqFJBAs47+z6F\n\tzmKEGIquS2dIsD/V+QzDfIm/RLwjsLyCPa0MfFNjSJA8WwQAVDJ+HN1zDI3WMMRsv5E2\n\tAheQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=tWbYymExjdFC1yv8KSs1CjjsFt8R6XwxYz+zqsbboC8=;\n\tb=ufiugZPE7sNIKOMKVMW+707yzIDJSrG+o6zN56tJiKeV3RbhTqnxdy5MKngO4l0ZV9\n\ttjiboVjP9lN7vE/s3smVU2i4+o0tJBqoZaJvcx6ekEUlbW2lVGy1sJWOT7ipeHsH1tjJ\n\tYQjSDC3ql0flgMKw8hNilMLKAb95g7aWtm63ETiLRQDXEL9t4hsxNds5NRPKa8AJffRg\n\t0DiUfc5m+RIhhhOH9YNd7g7XfiRO7uZsWHqwKNjmQNMZpo4BrCChTM0c9icSYt/qUoGz\n\t1Gw0QAHuLSi2AYxqN5L1r0NqSGg5LH4FHe7bA7rt2+gE5uEGyyEk0Fw7TDp1sa8Tfn7F\n\tElmA==", "X-Gm-Message-State": "AOAM530FROHREnvT8sZyyw672n1JwInArPvFn12M6oB2rhbL7Qct75LY\n\tgOFXs/KznE2Veiyh9SnKuosDPHlQd83Rf/PP", "X-Google-Smtp-Source": "ABdhPJyXSG6f+/syigJdvlpo/1Ph8kqJEUyDdgH4vTBLhqGNNoqVF7uizyhvoyrgtSWGf1RNA29/YA==", "X-Received": "by 2002:a05:600c:1552:: with SMTP id\n\tf18mr3466426wmg.149.1613652514666; \n\tThu, 18 Feb 2021 04:48:34 -0800 (PST)", "From": "Naushir Patuck <naush@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 18 Feb 2021 12:48:23 +0000", "Message-Id": "<20210218124824.1825418-4-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210218124824.1825418-1-naush@raspberrypi.com>", "References": "<20210218124824.1825418-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 3/4] pipeline: ipa: raspberrypi: Rename\n\tIPA Interface namespace to ipa::RPi", "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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Rename the IPA interface namespace to ipa::RPi for consistency with\nthe libcamera::RPi namespace label.\n\nThere is no functional change in this commit.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n include/libcamera/ipa/raspberrypi.mojom | 2 +-\n src/ipa/raspberrypi/raspberrypi.cpp | 38 +++++++++----------\n .../pipeline/raspberrypi/raspberrypi.cpp | 30 +++++++--------\n .../pipeline/raspberrypi/rpi_stream.cpp | 4 +-\n .../pipeline/raspberrypi/rpi_stream.h | 4 +-\n 5 files changed, 39 insertions(+), 39 deletions(-)", "diff": "diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\nindex 9c05cc68cceb..5a27b1e4fc2d 100644\n--- a/include/libcamera/ipa/raspberrypi.mojom\n+++ b/include/libcamera/ipa/raspberrypi.mojom\n@@ -1,6 +1,6 @@\n /* SPDX-License-Identifier: LGPL-2.1-or-later */\n \n-module ipa.rpi;\n+module ipa.RPi;\n \n import \"include/libcamera/ipa/core.mojom\";\n \ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 974f4ec63058..1226ea514521 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -63,7 +63,7 @@ constexpr double defaultMaxFrameDuration = 1e6 / 0.01;\n \n LOG_DEFINE_CATEGORY(IPARPI)\n \n-class IPARPi : public ipa::rpi::IPARPiInterface\n+class IPARPi : public ipa::RPi::IPARPiInterface\n {\n public:\n \tIPARPi()\n@@ -76,24 +76,24 @@ public:\n \t~IPARPi()\n \t{\n \t\tif (lsTable_)\n-\t\t\tmunmap(lsTable_, ipa::rpi::MaxLsGridSize);\n+\t\t\tmunmap(lsTable_, ipa::RPi::MaxLsGridSize);\n \t}\n \n \tint init(const IPASettings &settings) override;\n-\tvoid start(const ipa::rpi::StartControls &data,\n-\t\t ipa::rpi::StartControls *result) override;\n+\tvoid start(const ipa::RPi::StartControls &data,\n+\t\t ipa::RPi::StartControls *result) override;\n \tvoid stop() override {}\n \n \tvoid configure(const CameraSensorInfo &sensorInfo,\n \t\t const std::map<unsigned int, IPAStream> &streamConfig,\n \t\t const std::map<unsigned int, ControlInfoMap> &entityControls,\n-\t\t const ipa::rpi::ConfigInput &data,\n-\t\t ipa::rpi::ConfigOutput *response, int32_t *ret) override;\n+\t\t const ipa::RPi::ConfigInput &data,\n+\t\t ipa::RPi::ConfigOutput *response, int32_t *ret) override;\n \tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override;\n \tvoid unmapBuffers(const std::vector<unsigned int> &ids) override;\n \tvoid signalStatReady(const uint32_t bufferId) override;\n \tvoid signalQueueRequest(const ControlList &controls) override;\n-\tvoid signalIspPrepare(const ipa::rpi::ISPConfig &data) override;\n+\tvoid signalIspPrepare(const ipa::RPi::ISPConfig &data) override;\n \n private:\n \tvoid setMode(const CameraSensorInfo &sensorInfo);\n@@ -168,8 +168,8 @@ int IPARPi::init(const IPASettings &settings)\n \treturn 0;\n }\n \n-void IPARPi::start(const ipa::rpi::StartControls &data,\n-\t\t ipa::rpi::StartControls *result)\n+void IPARPi::start(const ipa::RPi::StartControls &data,\n+\t\t ipa::RPi::StartControls *result)\n {\n \tRPiController::Metadata metadata;\n \n@@ -291,8 +291,8 @@ void IPARPi::setMode(const CameraSensorInfo &sensorInfo)\n void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t\t [[maybe_unused]] const std::map<unsigned int, IPAStream> &streamConfig,\n \t\t const std::map<unsigned int, ControlInfoMap> &entityControls,\n-\t\t const ipa::rpi::ConfigInput &ipaConfig,\n-\t\t ipa::rpi::ConfigOutput *result, int32_t *ret)\n+\t\t const ipa::RPi::ConfigInput &ipaConfig,\n+\t\t ipa::RPi::ConfigOutput *result, int32_t *ret)\n {\n \tif (entityControls.size() != 2) {\n \t\tLOG(IPARPI, Error) << \"No ISP or sensor controls found.\";\n@@ -344,7 +344,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t\thelper_->GetDelays(exposureDelay, gainDelay);\n \t\tsensorMetadata = helper_->SensorEmbeddedDataPresent();\n \n-\t\tresult->params |= ipa::rpi::ConfigSensorParams;\n+\t\tresult->params |= ipa::RPi::ConfigSensorParams;\n \t\tresult->sensorConfig.gainDelay = gainDelay;\n \t\tresult->sensorConfig.exposureDelay = exposureDelay;\n \t\tresult->sensorConfig.vblank = exposureDelay;\n@@ -360,14 +360,14 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \tif (ipaConfig.lsTableHandle.isValid()) {\n \t\t/* Remove any previous table, if there was one. */\n \t\tif (lsTable_) {\n-\t\t\tmunmap(lsTable_, ipa::rpi::MaxLsGridSize);\n+\t\t\tmunmap(lsTable_, ipa::RPi::MaxLsGridSize);\n \t\t\tlsTable_ = nullptr;\n \t\t}\n \n \t\t/* Map the LS table buffer into user space. */\n \t\tlsTableHandle_ = std::move(ipaConfig.lsTableHandle);\n \t\tif (lsTableHandle_.isValid()) {\n-\t\t\tlsTable_ = mmap(nullptr, ipa::rpi::MaxLsGridSize, PROT_READ | PROT_WRITE,\n+\t\t\tlsTable_ = mmap(nullptr, ipa::RPi::MaxLsGridSize, PROT_READ | PROT_WRITE,\n \t\t\t\t\tMAP_SHARED, lsTableHandle_.fd(), 0);\n \n \t\t\tif (lsTable_ == MAP_FAILED) {\n@@ -432,7 +432,7 @@ void IPARPi::signalStatReady(uint32_t bufferId)\n \n \treportMetadata();\n \n-\tstatsMetadataComplete.emit(bufferId & ipa::rpi::MaskID, libcameraMetadata_);\n+\tstatsMetadataComplete.emit(bufferId & ipa::RPi::MaskID, libcameraMetadata_);\n }\n \n void IPARPi::signalQueueRequest(const ControlList &controls)\n@@ -440,7 +440,7 @@ void IPARPi::signalQueueRequest(const ControlList &controls)\n \tqueueRequest(controls);\n }\n \n-void IPARPi::signalIspPrepare(const ipa::rpi::ISPConfig &data)\n+void IPARPi::signalIspPrepare(const ipa::RPi::ISPConfig &data)\n {\n \t/*\n \t * At start-up, or after a mode-switch, we may want to\n@@ -451,7 +451,7 @@ void IPARPi::signalIspPrepare(const ipa::rpi::ISPConfig &data)\n \tframeCount_++;\n \n \t/* Ready to push the input buffer into the ISP. */\n-\trunIsp.emit(data.bayerBufferId & ipa::rpi::MaskID);\n+\trunIsp.emit(data.bayerBufferId & ipa::RPi::MaskID);\n }\n \n void IPARPi::reportMetadata()\n@@ -906,7 +906,7 @@ void IPARPi::queueRequest(const ControlList &controls)\n \n void IPARPi::returnEmbeddedBuffer(unsigned int bufferId)\n {\n-\tembeddedComplete.emit(bufferId & ipa::rpi::MaskID);\n+\tembeddedComplete.emit(bufferId & ipa::RPi::MaskID);\n }\n \n void IPARPi::prepareISP(unsigned int bufferId)\n@@ -1271,7 +1271,7 @@ void IPARPi::applyLS(const struct AlscStatus *lsStatus, ControlList &ctrls)\n \t\t.gain_format = GAIN_FORMAT_U4P10\n \t};\n \n-\tif (!lsTable_ || w * h * 4 * sizeof(uint16_t) > ipa::rpi::MaxLsGridSize) {\n+\tif (!lsTable_ || w * h * 4 * sizeof(uint16_t) > ipa::RPi::MaxLsGridSize) {\n \t\tLOG(IPARPI, Error) << \"Do not have a correctly allocate lens shading table!\";\n \t\treturn;\n \t}\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex aac285b44748..acf2d56cddb2 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -166,7 +166,7 @@ public:\n \tvoid handleState();\n \tvoid applyScalerCrop(const ControlList &controls);\n \n-\tstd::unique_ptr<ipa::rpi::IPAProxyRPi> ipa_;\n+\tstd::unique_ptr<ipa::RPi::IPAProxyRPi> ipa_;\n \n \tstd::unique_ptr<CameraSensor> sensor_;\n \t/* Array of Unicam and ISP device streams and associated buffers/streams. */\n@@ -778,8 +778,8 @@ int PipelineHandlerRPi::start(Camera *camera, ControlList *controls)\n \t\tdata->applyScalerCrop(*controls);\n \n \t/* Start the IPA. */\n-\tipa::rpi::StartControls ipaData;\n-\tipa::rpi::StartControls result;\n+\tipa::RPi::StartControls ipaData;\n+\tipa::RPi::StartControls result;\n \tif (controls)\n \t\tipaData.controls = *controls;\n \tdata->ipa_->start(ipaData, &result);\n@@ -1114,8 +1114,8 @@ int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n \t * Pass the stats and embedded data buffers to the IPA. No other\n \t * buffers need to be passed.\n \t */\n-\tmapBuffers(camera, data->isp_[Isp::Stats].getBuffers(), ipa::rpi::MaskStats);\n-\tmapBuffers(camera, data->unicam_[Unicam::Embedded].getBuffers(), ipa::rpi::MaskEmbeddedData);\n+\tmapBuffers(camera, data->isp_[Isp::Stats].getBuffers(), ipa::RPi::MaskStats);\n+\tmapBuffers(camera, data->unicam_[Unicam::Embedded].getBuffers(), ipa::RPi::MaskEmbeddedData);\n \n \treturn 0;\n }\n@@ -1164,7 +1164,7 @@ void RPiCameraData::frameStarted(uint32_t sequence)\n \n int RPiCameraData::loadIPA()\n {\n-\tipa_ = IPAManager::createIPA<ipa::rpi::IPAProxyRPi>(pipe_, 1, 1);\n+\tipa_ = IPAManager::createIPA<ipa::RPi::IPAProxyRPi>(pipe_, 1, 1);\n \n \tif (!ipa_)\n \t\treturn -ENOENT;\n@@ -1188,7 +1188,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n \n \tstd::map<unsigned int, IPAStream> streamConfig;\n \tstd::map<unsigned int, ControlInfoMap> entityControls;\n-\tipa::rpi::ConfigInput ipaConfig;\n+\tipa::RPi::ConfigInput ipaConfig;\n \n \t/* Get the device format to pass to the IPA. */\n \tV4L2DeviceFormat sensorFormat;\n@@ -1211,7 +1211,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n \n \t/* Allocate the lens shading table via dmaHeap and pass to the IPA. */\n \tif (!lsTable_.isValid()) {\n-\t\tlsTable_ = dmaHeap_.alloc(\"ls_grid\", ipa::rpi::MaxLsGridSize);\n+\t\tlsTable_ = dmaHeap_.alloc(\"ls_grid\", ipa::RPi::MaxLsGridSize);\n \t\tif (!lsTable_.isValid())\n \t\t\treturn -ENOMEM;\n \n@@ -1231,7 +1231,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n \t}\n \n \t/* Ready the IPA - it must know about the sensor resolution. */\n-\tipa::rpi::ConfigOutput result;\n+\tipa::RPi::ConfigOutput result;\n \n \tipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig,\n \t\t\t&result, &ret);\n@@ -1241,7 +1241,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n \t\treturn -EPIPE;\n \t}\n \n-\tif (result.params & ipa::rpi::ConfigSensorParams) {\n+\tif (result.params & ipa::RPi::ConfigSensorParams) {\n \t\t/*\n \t\t * Setup our delayed control writer with the sensor default\n \t\t * gain and exposure delays.\n@@ -1455,7 +1455,7 @@ void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n \t * application until after the IPA signals so.\n \t */\n \tif (stream == &isp_[Isp::Stats]) {\n-\t\tipa_->signalStatReady(ipa::rpi::MaskStats | static_cast<unsigned int>(index));\n+\t\tipa_->signalStatReady(ipa::RPi::MaskStats | static_cast<unsigned int>(index));\n \t} else {\n \t\t/* Any other ISP output can be handed back to the application now. */\n \t\thandleStreamBuffer(buffer, stream);\n@@ -1559,7 +1559,7 @@ void RPiCameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *strea\n {\n \tunsigned int id = stream->getBufferId(buffer);\n \n-\tif (!(id & ipa::rpi::MaskExternalBuffer))\n+\tif (!(id & ipa::RPi::MaskExternalBuffer))\n \t\treturn;\n \n \t/* Stop the Stream object from tracking the buffer. */\n@@ -1691,9 +1691,9 @@ void RPiCameraData::tryRunPipeline()\n \t\t\t<< \" Bayer buffer id: \" << bayerId\n \t\t\t<< \" Embedded buffer id: \" << embeddedId;\n \n-\tipa::rpi::ISPConfig ispPrepare;\n-\tispPrepare.embeddedBufferId = ipa::rpi::MaskEmbeddedData | embeddedId;\n-\tispPrepare.bayerBufferId = ipa::rpi::MaskBayerData | bayerId;\n+\tipa::RPi::ISPConfig ispPrepare;\n+\tispPrepare.embeddedBufferId = ipa::RPi::MaskEmbeddedData | embeddedId;\n+\tispPrepare.bayerBufferId = ipa::RPi::MaskBayerData | bayerId;\n \tipa_->signalIspPrepare(ispPrepare);\n }\n \ndiff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\nindex 496dd36fabbc..f2430415d32d 100644\n--- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n@@ -72,7 +72,7 @@ int Stream::getBufferId(FrameBuffer *buffer) const\n \n void Stream::setExternalBuffer(FrameBuffer *buffer)\n {\n-\tbufferMap_.emplace(ipa::rpi::MaskExternalBuffer | id_.get(), buffer);\n+\tbufferMap_.emplace(ipa::RPi::MaskExternalBuffer | id_.get(), buffer);\n }\n \n void Stream::removeExternalBuffer(FrameBuffer *buffer)\n@@ -80,7 +80,7 @@ void Stream::removeExternalBuffer(FrameBuffer *buffer)\n \tint id = getBufferId(buffer);\n \n \t/* Ensure we have this buffer in the stream, and it is marked external. */\n-\tASSERT(id != -1 && (id & ipa::rpi::MaskExternalBuffer));\n+\tASSERT(id != -1 && (id & ipa::RPi::MaskExternalBuffer));\n \tbufferMap_.erase(id);\n }\n \ndiff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\nindex 701110d04bdb..f1ac715f4221 100644\n--- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n@@ -32,13 +32,13 @@ class Stream : public libcamera::Stream\n {\n public:\n \tStream()\n-\t\t: id_(ipa::rpi::MaskID)\n+\t\t: id_(ipa::RPi::MaskID)\n \t{\n \t}\n \n \tStream(const char *name, MediaEntity *dev, bool importOnly = false)\n \t\t: external_(false), importOnly_(importOnly), name_(name),\n-\t\t dev_(std::make_unique<V4L2VideoDevice>(dev)), id_(ipa::rpi::MaskID)\n+\t\t dev_(std::make_unique<V4L2VideoDevice>(dev)), id_(ipa::RPi::MaskID)\n \t{\n \t}\n \n", "prefixes": [ "libcamera-devel", "v3", "3/4" ] }