From patchwork Thu Sep 24 09:19:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 9783 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id BEA9DC3B5B for ; Thu, 24 Sep 2020 09:19:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3E60862FF1; Thu, 24 Sep 2020 11:19:37 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="jUOH85Ne"; dkim-atps=neutral Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 351E562FD2 for ; Thu, 24 Sep 2020 11:19:35 +0200 (CEST) Received: by mail-wr1-x42a.google.com with SMTP id x14so2925489wrl.12 for ; Thu, 24 Sep 2020 02:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bZdNnuuWShhFJ2cWo0wyBUFyD/FF+sve3VF3O2RU1AY=; b=jUOH85NeHl6EBanGKpPuC9YQ/a4dfkC6upGPOooJEhZaQXnL00pnybWWUMb3qnIw7K OY8wVDZHa1hwF4kq/ri7md3jvu/ZAMhsov2nbUWS3ZYVr/y/3SKrjIbhRCRjjIq9Y9It IiKr1np4sUCOOJTgg9hImnFvdpdeWFBf/tyApr5v1tB0hPBSy8mcK2liVURZBnGmkU3G 0rAd51E4is3GBM0XurT7ysD8ktmbBmxOh7wUqbM9+Ps/GorJv0mdNciY8vKbIzpAIbs7 GGr4eAX9YOD779EJYNHp44AVbzdEbWl5ZWT6zoofRzShbgs5djSQVc9Pf2w4ke6V0ppq vWEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bZdNnuuWShhFJ2cWo0wyBUFyD/FF+sve3VF3O2RU1AY=; b=WQpH9wdwOoni/+Ynv5fmurcvHa2oJ5WjHIpaSXO3LRgPdNgwUtdOkijXO7ue0UhK3v t7e6hv7GIBV7PxahG1jJzAkOoTgI0OTd+CIZW/3tsUBWVR4Grchzp4sEfRAhY09KTX34 04S/qdGHQfeuu+9GUSJBMac9E1caep9zlpwvTkWlZMLXDHOOrprEeJuBqoXlGf9kW5F2 wzmgn52KNDkKxAxovwB9MnzMAH3gZ6mZV+DzubOK2AL82KkHJuxIr40wlib1j2/GSLCC tec9XzImrVjKWpUDjkQ6BCEGusjDj0rsrmIcBu9Qiu8whMvb6IKDDViJJH7h4AUoZBKr 56xg== X-Gm-Message-State: AOAM532JsH21mZ9PsYHwYVb4TSXuqQK/ViFlyEaHsK0bImdbX1fuzAiG 3PPP+25sYZHt9K3p3fk7FCA2slFc/yaPWw== X-Google-Smtp-Source: ABdhPJzGyD1FVE0F+ZPs+xK2GJ48KU9Cwomz3vMD9bPTMamp9weBuUsGHaNfmOjiq1KiNij++LLcjQ== X-Received: by 2002:a5d:56c1:: with SMTP id m1mr3856110wrw.87.1600939174282; Thu, 24 Sep 2020 02:19:34 -0700 (PDT) Received: from naushir-VirtualBox.pitowers.org ([2a00:1098:3142:14:a00:27ff:fe4d:f6a2]) by smtp.gmail.com with ESMTPSA id w81sm2689324wmg.47.2020.09.24.02.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2020 02:19:33 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Thu, 24 Sep 2020 10:19:26 +0100 Message-Id: <20200924091927.116385-4-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200924091927.116385-1-naush@raspberrypi.com> References: <20200924091927.116385-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/4] ipa: raspberrypi: Move IPA parameters to the RPi namespace X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" All IPA related types/params are now moved to the RPi namespace. There are no functional changes in this commit. Signed-off-by: Naushir Patuck Reviewed-by: Jacopo Mondi Acked-by: Laurent Pinchart --- include/libcamera/ipa/raspberrypi.h | 40 ++++++++++--------- src/ipa/raspberrypi/raspberrypi.cpp | 30 +++++++------- .../pipeline/raspberrypi/raspberrypi.cpp | 40 +++++++++---------- .../pipeline/raspberrypi/rpi_stream.cpp | 4 +- .../pipeline/raspberrypi/rpi_stream.h | 4 +- 5 files changed, 61 insertions(+), 57 deletions(-) diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h index dd6ebeac..c9d4aa81 100644 --- a/include/libcamera/ipa/raspberrypi.h +++ b/include/libcamera/ipa/raspberrypi.h @@ -10,25 +10,29 @@ #include #include -enum RPiConfigParameters { - RPI_IPA_CONFIG_LS_TABLE = (1 << 0), - RPI_IPA_CONFIG_STAGGERED_WRITE = (1 << 1), - RPI_IPA_CONFIG_SENSOR = (1 << 2), - RPI_IPA_CONFIG_DROP_FRAMES = (1 << 3), +namespace libcamera { + +namespace RPi { + +enum ConfigParameters { + IPA_CONFIG_LS_TABLE = (1 << 0), + IPA_CONFIG_STAGGERED_WRITE = (1 << 1), + IPA_CONFIG_SENSOR = (1 << 2), + IPA_CONFIG_DROP_FRAMES = (1 << 3), }; -enum RPiOperations { - RPI_IPA_ACTION_V4L2_SET_STAGGERED = 1, - RPI_IPA_ACTION_V4L2_SET_ISP, - RPI_IPA_ACTION_STATS_METADATA_COMPLETE, - RPI_IPA_ACTION_RUN_ISP, - RPI_IPA_ACTION_EMBEDDED_COMPLETE, - RPI_IPA_EVENT_SIGNAL_STAT_READY, - RPI_IPA_EVENT_SIGNAL_ISP_PREPARE, - RPI_IPA_EVENT_QUEUE_REQUEST, +enum Operations { + IPA_ACTION_V4L2_SET_STAGGERED = 1, + IPA_ACTION_V4L2_SET_ISP, + IPA_ACTION_STATS_METADATA_COMPLETE, + IPA_ACTION_RUN_ISP, + IPA_ACTION_EMBEDDED_COMPLETE, + IPA_EVENT_SIGNAL_STAT_READY, + IPA_EVENT_SIGNAL_ISP_PREPARE, + IPA_EVENT_QUEUE_REQUEST, }; -enum RPiBufferMask { +enum BufferMask { ID = 0x00ffff, STATS = 0x010000, EMBEDDED_DATA = 0x020000, @@ -39,10 +43,8 @@ enum RPiBufferMask { /* Size of the LS grid allocation. */ #define MAX_LS_GRID_SIZE (32 << 10) -namespace libcamera { - /* List of controls handled by the Raspberry Pi IPA */ -static const ControlInfoMap RPiControls = { +static const ControlInfoMap Controls = { { &controls::AeEnable, ControlInfo(false, true) }, { &controls::ExposureTime, ControlInfo(0, 999999) }, { &controls::AnalogueGain, ControlInfo(1.0f, 32.0f) }, @@ -60,6 +62,8 @@ static const ControlInfoMap RPiControls = { { &controls::ColourCorrectionMatrix, ControlInfo(-16.0f, 16.0f) }, }; +} /* namespace RPi */ + } /* namespace libcamera */ #endif /* __LIBCAMERA_IPA_INTERFACE_RASPBERRYPI_H__ */ diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 1d3136be..0c0dc743 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -224,7 +224,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo, result->data.push_back(exposureDelay); result->data.push_back(sensorMetadata); - result->operation |= RPI_IPA_CONFIG_STAGGERED_WRITE; + result->operation |= RPi::IPA_CONFIG_STAGGERED_WRITE; } /* Re-assemble camera mode using the sensor info. */ @@ -250,7 +250,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo, } result->data.push_back(drop_frame); - result->operation |= RPI_IPA_CONFIG_DROP_FRAMES; + result->operation |= RPi::IPA_CONFIG_DROP_FRAMES; struct AgcStatus agcStatus; /* These zero values mean not program anything (unless overwritten). */ @@ -278,13 +278,13 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo, applyAGC(&agcStatus, ctrls); result->controls.push_back(ctrls); - result->operation |= RPI_IPA_CONFIG_SENSOR; + result->operation |= RPi::IPA_CONFIG_SENSOR; } lastMode_ = mode_; /* Store the lens shading table pointer and handle if available. */ - if (ipaConfig.operation & RPI_IPA_CONFIG_LS_TABLE) { + if (ipaConfig.operation & RPi::IPA_CONFIG_LS_TABLE) { /* Remove any previous table, if there was one. */ if (lsTable_) { munmap(lsTable_, MAX_LS_GRID_SIZE); @@ -340,7 +340,7 @@ void IPARPi::unmapBuffers(const std::vector &ids) void IPARPi::processEvent(const IPAOperationData &event) { switch (event.operation) { - case RPI_IPA_EVENT_SIGNAL_STAT_READY: { + case RPi::IPA_EVENT_SIGNAL_STAT_READY: { unsigned int bufferId = event.data[0]; if (++check_count_ != frame_count_) /* assert here? */ @@ -351,14 +351,14 @@ void IPARPi::processEvent(const IPAOperationData &event) reportMetadata(); IPAOperationData op; - op.operation = RPI_IPA_ACTION_STATS_METADATA_COMPLETE; - op.data = { bufferId & RPiBufferMask::ID }; + op.operation = RPi::IPA_ACTION_STATS_METADATA_COMPLETE; + op.data = { bufferId & RPi::BufferMask::ID }; op.controls = { libcameraMetadata_ }; queueFrameAction.emit(0, op); break; } - case RPI_IPA_EVENT_SIGNAL_ISP_PREPARE: { + case RPi::IPA_EVENT_SIGNAL_ISP_PREPARE: { unsigned int embeddedbufferId = event.data[0]; unsigned int bayerbufferId = event.data[1]; @@ -372,13 +372,13 @@ void IPARPi::processEvent(const IPAOperationData &event) /* Ready to push the input buffer into the ISP. */ IPAOperationData op; - op.operation = RPI_IPA_ACTION_RUN_ISP; - op.data = { bayerbufferId & RPiBufferMask::ID }; + op.operation = RPi::IPA_ACTION_RUN_ISP; + op.data = { bayerbufferId & RPi::BufferMask::ID }; queueFrameAction.emit(0, op); break; } - case RPI_IPA_EVENT_QUEUE_REQUEST: { + case RPi::IPA_EVENT_QUEUE_REQUEST: { queueRequest(event.controls[0]); break; } @@ -699,8 +699,8 @@ void IPARPi::queueRequest(const ControlList &controls) void IPARPi::returnEmbeddedBuffer(unsigned int bufferId) { IPAOperationData op; - op.operation = RPI_IPA_ACTION_EMBEDDED_COMPLETE; - op.data = { bufferId & RPiBufferMask::ID }; + op.operation = RPi::IPA_ACTION_EMBEDDED_COMPLETE; + op.data = { bufferId & RPi::BufferMask::ID }; queueFrameAction.emit(0, op); } @@ -764,7 +764,7 @@ void IPARPi::prepareISP(unsigned int bufferId) if (!ctrls.empty()) { IPAOperationData op; - op.operation = RPI_IPA_ACTION_V4L2_SET_ISP; + op.operation = RPi::IPA_ACTION_V4L2_SET_ISP; op.controls.push_back(ctrls); queueFrameAction.emit(0, op); } @@ -824,7 +824,7 @@ void IPARPi::processStats(unsigned int bufferId) applyAGC(&agcStatus, ctrls); IPAOperationData op; - op.operation = RPI_IPA_ACTION_V4L2_SET_STAGGERED; + op.operation = RPi::IPA_ACTION_V4L2_SET_STAGGERED; op.controls.push_back(ctrls); queueFrameAction.emit(0, op); } diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 5ed74d51..35dbe0fb 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -837,7 +837,7 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator) } /* Register the controls that the Raspberry Pi IPA can handle. */ - data->controlInfo_ = RPiControls; + data->controlInfo_ = RPi::Controls; /* Initialize the camera properties. */ data->properties_ = data->sensor_->properties(); @@ -925,8 +925,8 @@ int PipelineHandlerRPi::prepareBuffers(Camera *camera) * Pass the stats and embedded data buffers to the IPA. No other * buffers need to be passed. */ - mapBuffers(camera, data->isp_[Isp::Stats].getBuffers(), RPiBufferMask::STATS); - mapBuffers(camera, data->unicam_[Unicam::Embedded].getBuffers(), RPiBufferMask::EMBEDDED_DATA); + mapBuffers(camera, data->isp_[Isp::Stats].getBuffers(), RPi::BufferMask::STATS); + mapBuffers(camera, data->unicam_[Unicam::Embedded].getBuffers(), RPi::BufferMask::EMBEDDED_DATA); return 0; } @@ -1017,7 +1017,7 @@ int RPiCameraData::configureIPA() return -ENOMEM; /* Allow the IPA to mmap the LS table via the file descriptor. */ - ipaConfig.operation = RPI_IPA_CONFIG_LS_TABLE; + ipaConfig.operation = RPi::IPA_CONFIG_LS_TABLE; ipaConfig.data = { static_cast(lsTable_.fd()) }; } @@ -1035,7 +1035,7 @@ int RPiCameraData::configureIPA() &result); unsigned int resultIdx = 0; - if (result.operation & RPI_IPA_CONFIG_STAGGERED_WRITE) { + if (result.operation & RPi::IPA_CONFIG_STAGGERED_WRITE) { /* * Setup our staggered control writer with the sensor default * gain and exposure delays. @@ -1048,13 +1048,13 @@ int RPiCameraData::configureIPA() } } - if (result.operation & RPI_IPA_CONFIG_SENSOR) { + if (result.operation & RPi::IPA_CONFIG_SENSOR) { const ControlList &ctrls = result.controls[0]; if (!staggeredCtrl_.set(ctrls)) LOG(RPI, Error) << "V4L2 staggered set failed"; } - if (result.operation & RPI_IPA_CONFIG_DROP_FRAMES) { + if (result.operation & RPi::IPA_CONFIG_DROP_FRAMES) { /* Configure the number of dropped frames required on startup. */ dropFrameCount_ = result.data[resultIdx++]; } @@ -1070,14 +1070,14 @@ void RPiCameraData::queueFrameAction([[maybe_unused]] unsigned int frame, * a stopped state. */ switch (action.operation) { - case RPI_IPA_ACTION_V4L2_SET_STAGGERED: { + case RPi::IPA_ACTION_V4L2_SET_STAGGERED: { const ControlList &controls = action.controls[0]; if (!staggeredCtrl_.set(controls)) LOG(RPI, Error) << "V4L2 staggered set failed"; goto done; } - case RPI_IPA_ACTION_V4L2_SET_ISP: { + case RPi::IPA_ACTION_V4L2_SET_ISP: { ControlList controls = action.controls[0]; isp_[Isp::Input].dev()->setControls(&controls); goto done; @@ -1092,7 +1092,7 @@ void RPiCameraData::queueFrameAction([[maybe_unused]] unsigned int frame, * is in a stopped state. */ switch (action.operation) { - case RPI_IPA_ACTION_STATS_METADATA_COMPLETE: { + case RPi::IPA_ACTION_STATS_METADATA_COMPLETE: { unsigned int bufferId = action.data[0]; FrameBuffer *buffer = isp_[Isp::Stats].getBuffers().at(bufferId); @@ -1103,14 +1103,14 @@ void RPiCameraData::queueFrameAction([[maybe_unused]] unsigned int frame, break; } - case RPI_IPA_ACTION_EMBEDDED_COMPLETE: { + case RPi::IPA_ACTION_EMBEDDED_COMPLETE: { unsigned int bufferId = action.data[0]; FrameBuffer *buffer = unicam_[Unicam::Embedded].getBuffers().at(bufferId); handleStreamBuffer(buffer, &unicam_[Unicam::Embedded]); break; } - case RPI_IPA_ACTION_RUN_ISP: { + case RPi::IPA_ACTION_RUN_ISP: { unsigned int bufferId = action.data[0]; FrameBuffer *buffer = unicam_[Unicam::Image].getBuffers().at(bufferId); @@ -1228,8 +1228,8 @@ void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer) */ if (stream == &isp_[Isp::Stats]) { IPAOperationData op; - op.operation = RPI_IPA_EVENT_SIGNAL_STAT_READY; - op.data = { RPiBufferMask::STATS | static_cast(index) }; + op.operation = RPi::IPA_EVENT_SIGNAL_STAT_READY; + op.data = { RPi::BufferMask::STATS | static_cast(index) }; ipa_->processEvent(op); } else { /* Any other ISP output can be handed back to the application now. */ @@ -1334,7 +1334,7 @@ void RPiCameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *strea { unsigned int id = stream->getBufferId(buffer); - if (!(id & RPiBufferMask::EXTERNAL_BUFFER)) + if (!(id & RPi::BufferMask::EXTERNAL_BUFFER)) return; /* Stop the Stream object from tracking the buffer. */ @@ -1454,7 +1454,7 @@ void RPiCameraData::tryRunPipeline() * queue the ISP output buffer listed in the request to start the HW * pipeline. */ - op.operation = RPI_IPA_EVENT_QUEUE_REQUEST; + op.operation = RPi::IPA_EVENT_QUEUE_REQUEST; op.controls = { request->controls() }; ipa_->processEvent(op); @@ -1468,13 +1468,13 @@ void RPiCameraData::tryRunPipeline() unsigned int bayerId = unicam_[Unicam::Image].getBufferId(bayerBuffer); unsigned int embeddedId = unicam_[Unicam::Embedded].getBufferId(embeddedBuffer); - LOG(RPI, Debug) << "Signalling RPI_IPA_EVENT_SIGNAL_ISP_PREPARE:" + LOG(RPI, Debug) << "Signalling RPi::IPA_EVENT_SIGNAL_ISP_PREPARE:" << " Bayer buffer id: " << bayerId << " Embedded buffer id: " << embeddedId; - op.operation = RPI_IPA_EVENT_SIGNAL_ISP_PREPARE; - op.data = { RPiBufferMask::EMBEDDED_DATA | embeddedId, - RPiBufferMask::BAYER_DATA | bayerId }; + op.operation = RPi::IPA_EVENT_SIGNAL_ISP_PREPARE; + op.data = { RPi::BufferMask::EMBEDDED_DATA | embeddedId, + RPi::BufferMask::BAYER_DATA | bayerId }; ipa_->processEvent(op); } diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp index 3ee859e9..1a42cc17 100644 --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp @@ -70,7 +70,7 @@ int Stream::getBufferId(FrameBuffer *buffer) const void Stream::setExternalBuffer(FrameBuffer *buffer) { - bufferMap_.emplace(RPiBufferMask::EXTERNAL_BUFFER | id_.get(), buffer); + bufferMap_.emplace(RPi::BufferMask::EXTERNAL_BUFFER | id_.get(), buffer); } void Stream::removeExternalBuffer(FrameBuffer *buffer) @@ -78,7 +78,7 @@ void Stream::removeExternalBuffer(FrameBuffer *buffer) int id = getBufferId(buffer); /* Ensure we have this buffer in the stream, and it is marked external. */ - ASSERT(id != -1 && (id & RPiBufferMask::EXTERNAL_BUFFER)); + ASSERT(id != -1 && (id & RPi::BufferMask::EXTERNAL_BUFFER)); bufferMap_.erase(id); } diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h index cb097e1c..0b502f64 100644 --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h @@ -31,13 +31,13 @@ class Stream : public libcamera::Stream { public: Stream() - : id_(RPiBufferMask::ID) + : id_(RPi::BufferMask::ID) { } Stream(const char *name, MediaEntity *dev, bool importOnly = false) : external_(false), importOnly_(importOnly), name_(name), - dev_(std::make_unique(dev)), id_(RPiBufferMask::ID) + dev_(std::make_unique(dev)), id_(RPi::BufferMask::ID) { }