From patchwork Mon Aug 30 21:02:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 13570 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 3F5F0BD87D for ; Mon, 30 Aug 2021 21:02:35 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9F96A6916C; Mon, 30 Aug 2021 23:02:34 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="BD10Tp76"; dkim-atps=neutral Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CD32960258 for ; Mon, 30 Aug 2021 23:02:32 +0200 (CEST) Received: by mail-pg1-x52c.google.com with SMTP id q68so14612302pga.9 for ; Mon, 30 Aug 2021 14:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oZOr00ZrrvJz4iZkJNUQwKcQ7pxGVbhQipt+LP9Wlco=; b=BD10Tp76n2J5iTrWm//G97Y+2VeNO1xuVekCYQO85YLP8R9BPLsK5+YzBcYUQTJxst AhAt9YaMzd6/2e/gScWqQo3ZjOg/qfgNLUZKQQZS7g5XFZ8GIKvwquCzBT6gHqGDZ68m Fcw2J5zatcLjVLGstkYiBoxcWhDyr413M7PJE= 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:mime-version :content-transfer-encoding; bh=oZOr00ZrrvJz4iZkJNUQwKcQ7pxGVbhQipt+LP9Wlco=; b=eF6F/BNbc65s2neX4Ijp04MJKqJb9gGmu8CCvAVlYG8jqADLNhid76vCC+BuvlOOGK eM7Z81ICW7aote9YzSugay9IgG3ob0B36kBf2xojhWYdF7FJzJ+ANZcGS0fsYeLShMt1 gZlMIxEOCcro9BLLmAsbHe9yWSi3c9LYNLA0ajxqncz7CM7TO+3mJdOJN4Z+esYQX76E JlkHUxGVRQPy59fx0/Xr71ziz+3KaPXosmfOOoTn8BrfCULCr/ZgZLy8MXLn/7SQEinK 5ytnUbuzggccvg59+1lKe60QRDjAZOkFZotqsqljqXwPU8Umt5CqCO7XWZCHTMI83nl5 WDRA== X-Gm-Message-State: AOAM533u0a1SfZ62Nm+cd6dvZhJx1bLX79OdVPWlw4M9pVQtL3PVpT26 T6I5nVBF3Z8BH66iMwpKPCVzr0Ss0L8H2w== X-Google-Smtp-Source: ABdhPJyVJyXH33mmB2YxnU52UvU1g25+zlw8wYnowP9hPonOT5y8m0z13xPt2+3KUpSSOpbF8XCkcw== X-Received: by 2002:aa7:9ac9:0:b0:3fb:28ca:584b with SMTP id x9-20020aa79ac9000000b003fb28ca584bmr12765510pfp.64.1630357350702; Mon, 30 Aug 2021 14:02:30 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:3c62:aba4:18ea:5441]) by smtp.gmail.com with ESMTPSA id nh21sm351909pjb.34.2021.08.30.14.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Aug 2021 14:02:30 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Tue, 31 Aug 2021 06:02:24 +0900 Message-Id: <20210830210224.703704-1-hiroh@chromium.org> X-Mailer: git-send-email 2.33.0.259.gc128427fd7-goog MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: mapped_framebuffer: Rename maps() to planes() 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" MappedFrameBuffer::maps() returns planes_. This renames the function name to planes(). Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- include/libcamera/internal/mapped_framebuffer.h | 3 +-- src/android/jpeg/encoder_libjpeg.cpp | 2 +- src/android/jpeg/thumbnailer.cpp | 2 +- src/android/yuv/post_processor_yuv.cpp | 4 ++-- src/ipa/ipu3/ipu3.cpp | 4 ++-- src/ipa/raspberrypi/raspberrypi.cpp | 4 ++-- src/ipa/rkisp1/rkisp1.cpp | 4 ++-- src/libcamera/mapped_framebuffer.cpp | 2 +- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/include/libcamera/internal/mapped_framebuffer.h b/include/libcamera/internal/mapped_framebuffer.h index 42479541..70ffbcbe 100644 --- a/include/libcamera/internal/mapped_framebuffer.h +++ b/include/libcamera/internal/mapped_framebuffer.h @@ -30,8 +30,7 @@ public: bool isValid() const { return error_ == 0; } int error() const { return error_; } - /* \todo rename to planes(). */ - const std::vector &maps() const { return planes_; } + const std::vector &planes() const { return planes_; } protected: MappedBuffer(); diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp index a7a63601..b8b01e20 100644 --- a/src/android/jpeg/encoder_libjpeg.cpp +++ b/src/android/jpeg/encoder_libjpeg.cpp @@ -188,7 +188,7 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest, return frame.error(); } - return encode(frame.maps()[0], dest, exifData, quality); + return encode(frame.planes()[0], dest, exifData, quality); } int EncoderLibJpeg::encode(Span src, Span dest, diff --git a/src/android/jpeg/thumbnailer.cpp b/src/android/jpeg/thumbnailer.cpp index 79d83926..043c7b33 100644 --- a/src/android/jpeg/thumbnailer.cpp +++ b/src/android/jpeg/thumbnailer.cpp @@ -62,7 +62,7 @@ void Thumbnailer::createThumbnail(const FrameBuffer &source, ASSERT(tw % 2 == 0 && th % 2 == 0); /* Image scaling block implementing nearest-neighbour algorithm. */ - unsigned char *src = static_cast(frame.maps()[0].data()); + unsigned char *src = static_cast(frame.planes()[0].data()); unsigned char *srcC = src + sh * sw; unsigned char *srcCb, *srcCr; unsigned char *dstY, *srcY; diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp index 3e793a58..6952fc38 100644 --- a/src/android/yuv/post_processor_yuv.cpp +++ b/src/android/yuv/post_processor_yuv.cpp @@ -63,9 +63,9 @@ int PostProcessorYuv::process(const FrameBuffer &source, return -EINVAL; } - int ret = libyuv::NV12Scale(sourceMapped.maps()[0].data(), + int ret = libyuv::NV12Scale(sourceMapped.planes()[0].data(), sourceStride_[0], - sourceMapped.maps()[1].data(), + sourceMapped.planes()[1].data(), sourceStride_[1], sourceSize_.width, sourceSize_.height, destination->plane(0).data(), diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 0ed0a6f1..c925cf64 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -422,7 +422,7 @@ void IPAIPU3::processEvent(const IPU3Event &event) return; } - Span mem = it->second.maps()[0]; + Span mem = it->second.planes()[0]; const ipu3_uapi_stats_3a *stats = reinterpret_cast(mem.data()); @@ -436,7 +436,7 @@ void IPAIPU3::processEvent(const IPU3Event &event) return; } - Span mem = it->second.maps()[0]; + Span mem = it->second.planes()[0]; ipu3_uapi_params *params = reinterpret_cast(mem.data()); diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 7215b205..047123ab 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -936,7 +936,7 @@ void IPARPi::prepareISP(const ipa::RPi::ISPConfig &data) */ auto it = buffers_.find(data.embeddedBufferId); 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; } - Span mem = it->second.maps()[0]; + Span mem = it->second.planes()[0]; bcm2835_isp_stats *stats = reinterpret_cast(mem.data()); RPiController::StatisticsPtr statistics = std::make_shared(*stats); helper_->Process(statistics, rpiMetadata_); diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 046816e0..bf2c13b6 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -192,7 +192,7 @@ void IPARkISP1::processEvent(const RkISP1Event &event) const rkisp1_stat_buffer *stats = reinterpret_cast( - mappedBuffers_.at(bufferId).maps()[0].data()); + mappedBuffers_.at(bufferId).planes()[0].data()); updateStatistics(frame, stats); break; @@ -203,7 +203,7 @@ void IPARkISP1::processEvent(const RkISP1Event &event) rkisp1_params_cfg *params = reinterpret_cast( - mappedBuffers_.at(bufferId).maps()[0].data()); + mappedBuffers_.at(bufferId).planes()[0].data()); queueRequest(frame, params, event.controls); break; diff --git a/src/libcamera/mapped_framebuffer.cpp b/src/libcamera/mapped_framebuffer.cpp index 4db92b8c..464d35fe 100644 --- a/src/libcamera/mapped_framebuffer.cpp +++ b/src/libcamera/mapped_framebuffer.cpp @@ -113,7 +113,7 @@ MappedBuffer::~MappedBuffer() */ /** - * \fn MappedBuffer::maps() + * \fn MappedBuffer::planes() * \brief Retrieve the mapped planes * * This function retrieves the successfully mapped planes stored as a vector