libcamera: mapped_framebuffer: Rename maps() to planes()

MappedFrameBuffer::maps() returns planes_. This renames the function
name to planes().

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Hirokazu Honda 2021-08-31 06:02:24 +09:00 committed by Laurent Pinchart
parent 1c877bd868
commit 75df3c7139
8 changed files with 12 additions and 13 deletions

View file

@ -30,8 +30,7 @@ public:
bool isValid() const { return error_ == 0; } bool isValid() const { return error_ == 0; }
int error() const { return error_; } int error() const { return error_; }
/* \todo rename to planes(). */ const std::vector<Plane> &planes() const { return planes_; }
const std::vector<Plane> &maps() const { return planes_; }
protected: protected:
MappedBuffer(); MappedBuffer();

View file

@ -188,7 +188,7 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span<uint8_t> dest,
return frame.error(); return frame.error();
} }
return encode(frame.maps()[0], dest, exifData, quality); return encode(frame.planes()[0], dest, exifData, quality);
} }
int EncoderLibJpeg::encode(Span<const uint8_t> src, Span<uint8_t> dest, int EncoderLibJpeg::encode(Span<const uint8_t> src, Span<uint8_t> dest,

View file

@ -62,7 +62,7 @@ void Thumbnailer::createThumbnail(const FrameBuffer &source,
ASSERT(tw % 2 == 0 && th % 2 == 0); ASSERT(tw % 2 == 0 && th % 2 == 0);
/* Image scaling block implementing nearest-neighbour algorithm. */ /* Image scaling block implementing nearest-neighbour algorithm. */
unsigned char *src = static_cast<unsigned char *>(frame.maps()[0].data()); unsigned char *src = static_cast<unsigned char *>(frame.planes()[0].data());
unsigned char *srcC = src + sh * sw; unsigned char *srcC = src + sh * sw;
unsigned char *srcCb, *srcCr; unsigned char *srcCb, *srcCr;
unsigned char *dstY, *srcY; unsigned char *dstY, *srcY;

View file

@ -63,9 +63,9 @@ int PostProcessorYuv::process(const FrameBuffer &source,
return -EINVAL; return -EINVAL;
} }
int ret = libyuv::NV12Scale(sourceMapped.maps()[0].data(), int ret = libyuv::NV12Scale(sourceMapped.planes()[0].data(),
sourceStride_[0], sourceStride_[0],
sourceMapped.maps()[1].data(), sourceMapped.planes()[1].data(),
sourceStride_[1], sourceStride_[1],
sourceSize_.width, sourceSize_.height, sourceSize_.width, sourceSize_.height,
destination->plane(0).data(), destination->plane(0).data(),

View file

@ -422,7 +422,7 @@ void IPAIPU3::processEvent(const IPU3Event &event)
return; return;
} }
Span<uint8_t> mem = it->second.maps()[0]; Span<uint8_t> mem = it->second.planes()[0];
const ipu3_uapi_stats_3a *stats = const ipu3_uapi_stats_3a *stats =
reinterpret_cast<ipu3_uapi_stats_3a *>(mem.data()); reinterpret_cast<ipu3_uapi_stats_3a *>(mem.data());
@ -436,7 +436,7 @@ void IPAIPU3::processEvent(const IPU3Event &event)
return; return;
} }
Span<uint8_t> mem = it->second.maps()[0]; Span<uint8_t> mem = it->second.planes()[0];
ipu3_uapi_params *params = ipu3_uapi_params *params =
reinterpret_cast<ipu3_uapi_params *>(mem.data()); reinterpret_cast<ipu3_uapi_params *>(mem.data());

View file

@ -936,7 +936,7 @@ void IPARPi::prepareISP(const ipa::RPi::ISPConfig &data)
*/ */
auto it = buffers_.find(data.embeddedBufferId); auto it = buffers_.find(data.embeddedBufferId);
ASSERT(it != buffers_.end()); ASSERT(it != buffers_.end());
embeddedBuffer = it->second.maps()[0]; embeddedBuffer = it->second.planes()[0];
} }
/* /*
@ -1043,7 +1043,7 @@ void IPARPi::processStats(unsigned int bufferId)
return; return;
} }
Span<uint8_t> mem = it->second.maps()[0]; Span<uint8_t> mem = it->second.planes()[0];
bcm2835_isp_stats *stats = reinterpret_cast<bcm2835_isp_stats *>(mem.data()); bcm2835_isp_stats *stats = reinterpret_cast<bcm2835_isp_stats *>(mem.data());
RPiController::StatisticsPtr statistics = std::make_shared<bcm2835_isp_stats>(*stats); RPiController::StatisticsPtr statistics = std::make_shared<bcm2835_isp_stats>(*stats);
helper_->Process(statistics, rpiMetadata_); helper_->Process(statistics, rpiMetadata_);

View file

@ -192,7 +192,7 @@ void IPARkISP1::processEvent(const RkISP1Event &event)
const rkisp1_stat_buffer *stats = const rkisp1_stat_buffer *stats =
reinterpret_cast<rkisp1_stat_buffer *>( reinterpret_cast<rkisp1_stat_buffer *>(
mappedBuffers_.at(bufferId).maps()[0].data()); mappedBuffers_.at(bufferId).planes()[0].data());
updateStatistics(frame, stats); updateStatistics(frame, stats);
break; break;
@ -203,7 +203,7 @@ void IPARkISP1::processEvent(const RkISP1Event &event)
rkisp1_params_cfg *params = rkisp1_params_cfg *params =
reinterpret_cast<rkisp1_params_cfg *>( reinterpret_cast<rkisp1_params_cfg *>(
mappedBuffers_.at(bufferId).maps()[0].data()); mappedBuffers_.at(bufferId).planes()[0].data());
queueRequest(frame, params, event.controls); queueRequest(frame, params, event.controls);
break; break;

View file

@ -113,7 +113,7 @@ MappedBuffer::~MappedBuffer()
*/ */
/** /**
* \fn MappedBuffer::maps() * \fn MappedBuffer::planes()
* \brief Retrieve the mapped planes * \brief Retrieve the mapped planes
* *
* This function retrieves the successfully mapped planes stored as a vector * This function retrieves the successfully mapped planes stored as a vector