[{"id":19187,"web_url":"https://patchwork.libcamera.org/comment/19187/","msgid":"","date":"2021-08-30T21:33:49","subject":"Re: [libcamera-devel] [PATCH] libcamera: mapped_framebuffer: Rename\n\tmaps() to planes()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Tue, Aug 31, 2021 at 06:02:24AM +0900, Hirokazu Honda wrote:\n> MappedFrameBuffer::maps() returns planes_. This renames the function\n> name to planes().\n> \n> Signed-off-by: Hirokazu Honda \n> ---\n> include/libcamera/internal/mapped_framebuffer.h | 3 +--\n> src/android/jpeg/encoder_libjpeg.cpp | 2 +-\n> src/android/jpeg/thumbnailer.cpp | 2 +-\n> src/android/yuv/post_processor_yuv.cpp | 4 ++--\n> src/ipa/ipu3/ipu3.cpp | 4 ++--\n> src/ipa/raspberrypi/raspberrypi.cpp | 4 ++--\n> src/ipa/rkisp1/rkisp1.cpp | 4 ++--\n> src/libcamera/mapped_framebuffer.cpp | 2 +-\n> 8 files changed, 12 insertions(+), 13 deletions(-)\n> \n> diff --git a/include/libcamera/internal/mapped_framebuffer.h b/include/libcamera/internal/mapped_framebuffer.h\n> index 42479541..70ffbcbe 100644\n> --- a/include/libcamera/internal/mapped_framebuffer.h\n> +++ b/include/libcamera/internal/mapped_framebuffer.h\n> @@ -30,8 +30,7 @@ public:\n> \n> \tbool isValid() const { return error_ == 0; }\n> \tint error() const { return error_; }\n> -\t/* \\todo rename to planes(). */\n\nI like removing todo items :-) Thanks for following up on this.\n\nReviewed-by: Laurent Pinchart \n\n\n> -\tconst std::vector &maps() const { return planes_; }\n> +\tconst std::vector &planes() const { return planes_; }\n> \n> protected:\n> \tMappedBuffer();\n> diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\n> index a7a63601..b8b01e20 100644\n> --- a/src/android/jpeg/encoder_libjpeg.cpp\n> +++ b/src/android/jpeg/encoder_libjpeg.cpp\n> @@ -188,7 +188,7 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest,\n> \t\treturn frame.error();\n> \t}\n> \n> -\treturn encode(frame.maps()[0], dest, exifData, quality);\n> +\treturn encode(frame.planes()[0], dest, exifData, quality);\n> }\n> \n> int EncoderLibJpeg::encode(Span src, Span dest,\n> diff --git a/src/android/jpeg/thumbnailer.cpp b/src/android/jpeg/thumbnailer.cpp\n> index 79d83926..043c7b33 100644\n> --- a/src/android/jpeg/thumbnailer.cpp\n> +++ b/src/android/jpeg/thumbnailer.cpp\n> @@ -62,7 +62,7 @@ void Thumbnailer::createThumbnail(const FrameBuffer &source,\n> \tASSERT(tw % 2 == 0 && th % 2 == 0);\n> \n> \t/* Image scaling block implementing nearest-neighbour algorithm. */\n> -\tunsigned char *src = static_cast(frame.maps()[0].data());\n> +\tunsigned char *src = static_cast(frame.planes()[0].data());\n> \tunsigned char *srcC = src + sh * sw;\n> \tunsigned char *srcCb, *srcCr;\n> \tunsigned char *dstY, *srcY;\n> diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\n> index 3e793a58..6952fc38 100644\n> --- a/src/android/yuv/post_processor_yuv.cpp\n> +++ b/src/android/yuv/post_processor_yuv.cpp\n> @@ -63,9 +63,9 @@ int PostProcessorYuv::process(const FrameBuffer &source,\n> \t\treturn -EINVAL;\n> \t}\n> \n> -\tint ret = libyuv::NV12Scale(sourceMapped.maps()[0].data(),\n> +\tint ret = libyuv::NV12Scale(sourceMapped.planes()[0].data(),\n> \t\t\t\t sourceStride_[0],\n> -\t\t\t\t sourceMapped.maps()[1].data(),\n> +\t\t\t\t sourceMapped.planes()[1].data(),\n> \t\t\t\t sourceStride_[1],\n> \t\t\t\t sourceSize_.width, sourceSize_.height,\n> \t\t\t\t destination->plane(0).data(),\n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index 0ed0a6f1..c925cf64 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -422,7 +422,7 @@ void IPAIPU3::processEvent(const IPU3Event &event)\n> \t\t\treturn;\n> \t\t}\n> \n> -\t\tSpan mem = it->second.maps()[0];\n> +\t\tSpan mem = it->second.planes()[0];\n> \t\tconst ipu3_uapi_stats_3a *stats =\n> \t\t\treinterpret_cast(mem.data());\n> \n> @@ -436,7 +436,7 @@ void IPAIPU3::processEvent(const IPU3Event &event)\n> \t\t\treturn;\n> \t\t}\n> \n> -\t\tSpan mem = it->second.maps()[0];\n> +\t\tSpan mem = it->second.planes()[0];\n> \t\tipu3_uapi_params *params =\n> \t\t\treinterpret_cast(mem.data());\n> \n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 7215b205..047123ab 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -936,7 +936,7 @@ void IPARPi::prepareISP(const ipa::RPi::ISPConfig &data)\n> \t\t */\n> \t\tauto it = buffers_.find(data.embeddedBufferId);\n> \t\tASSERT(it != buffers_.end());\n> -\t\tembeddedBuffer = it->second.maps()[0];\n> +\t\tembeddedBuffer = it->second.planes()[0];\n> \t}\n> \n> \t/*\n> @@ -1043,7 +1043,7 @@ void IPARPi::processStats(unsigned int bufferId)\n> \t\treturn;\n> \t}\n> \n> -\tSpan mem = it->second.maps()[0];\n> +\tSpan mem = it->second.planes()[0];\n> \tbcm2835_isp_stats *stats = reinterpret_cast(mem.data());\n> \tRPiController::StatisticsPtr statistics = std::make_shared(*stats);\n> \thelper_->Process(statistics, rpiMetadata_);\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 046816e0..bf2c13b6 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -192,7 +192,7 @@ void IPARkISP1::processEvent(const RkISP1Event &event)\n> \n> \t\tconst rkisp1_stat_buffer *stats =\n> \t\t\treinterpret_cast(\n> -\t\t\t\tmappedBuffers_.at(bufferId).maps()[0].data());\n> +\t\t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\n> \n> \t\tupdateStatistics(frame, stats);\n> \t\tbreak;\n> @@ -203,7 +203,7 @@ void IPARkISP1::processEvent(const RkISP1Event &event)\n> \n> \t\trkisp1_params_cfg *params =\n> \t\t\treinterpret_cast(\n> -\t\t\t\tmappedBuffers_.at(bufferId).maps()[0].data());\n> +\t\t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\n> \n> \t\tqueueRequest(frame, params, event.controls);\n> \t\tbreak;\n> diff --git a/src/libcamera/mapped_framebuffer.cpp b/src/libcamera/mapped_framebuffer.cpp\n> index 4db92b8c..464d35fe 100644\n> --- a/src/libcamera/mapped_framebuffer.cpp\n> +++ b/src/libcamera/mapped_framebuffer.cpp\n> @@ -113,7 +113,7 @@ MappedBuffer::~MappedBuffer()\n> */\n> \n> /**\n> - * \\fn MappedBuffer::maps()\n> + * \\fn MappedBuffer::planes()\n> * \\brief Retrieve the mapped planes\n> *\n> * This function retrieves the successfully mapped planes stored as a vector","headers":{"Return-Path":"","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 D11D5BD87D\n\tfor ;\n\tMon, 30 Aug 2021 21:34:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3122A6916A;\n\tMon, 30 Aug 2021 23:34:06 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 066D760258\n\tfor ;\n\tMon, 30 Aug 2021 23:34:04 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7269D5A7;\n\tMon, 30 Aug 2021 23:34:03 +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=\"mLp9iPAx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630359243;\n\tbh=3cXQiteld+iTVEIWoWr3fYkrHtR1eN+60eBwHA4envE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=mLp9iPAxXXqucQ6DcNtaft2b+otxzXoK34iGnxZ4RFu3F+xxi844cVHTIzaVvixN1\n\t33KDw9N+Iu2GAbahPynrN6p+8Woi9zG+2Nu3CHO2co7BbedXXTPlgTbzs/WJT1W6Ac\n\tNNWRnhaEcRbtK+qyC9muHqcJGjo4jfhZIbNiHtMQ=","Date":"Tue, 31 Aug 2021 00:33:49 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210830210224.703704-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210830210224.703704-1-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH] libcamera: mapped_framebuffer: Rename\n\tmaps() to planes()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":19213,"web_url":"https://patchwork.libcamera.org/comment/19213/","msgid":"<20210831101237.5q4vowbhgf2ewbiw@uno.localdomain>","date":"2021-08-31T10:12:37","subject":"Re: [libcamera-devel] [PATCH] libcamera: mapped_framebuffer: Rename\n\tmaps() to planes()","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Hiro,\n\nOn Tue, Aug 31, 2021 at 06:02:24AM +0900, Hirokazu Honda wrote:\n> MappedFrameBuffer::maps() returns planes_. This renames the function\n> name to planes().\n>\n> Signed-off-by: Hirokazu Honda \n\nLooks good\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> include/libcamera/internal/mapped_framebuffer.h | 3 +--\n> src/android/jpeg/encoder_libjpeg.cpp | 2 +-\n> src/android/jpeg/thumbnailer.cpp | 2 +-\n> src/android/yuv/post_processor_yuv.cpp | 4 ++--\n> src/ipa/ipu3/ipu3.cpp | 4 ++--\n> src/ipa/raspberrypi/raspberrypi.cpp | 4 ++--\n> src/ipa/rkisp1/rkisp1.cpp | 4 ++--\n> src/libcamera/mapped_framebuffer.cpp | 2 +-\n> 8 files changed, 12 insertions(+), 13 deletions(-)\n>\n> diff --git a/include/libcamera/internal/mapped_framebuffer.h b/include/libcamera/internal/mapped_framebuffer.h\n> index 42479541..70ffbcbe 100644\n> --- a/include/libcamera/internal/mapped_framebuffer.h\n> +++ b/include/libcamera/internal/mapped_framebuffer.h\n> @@ -30,8 +30,7 @@ public:\n>\n> \tbool isValid() const { return error_ == 0; }\n> \tint error() const { return error_; }\n> -\t/* \\todo rename to planes(). */\n> -\tconst std::vector &maps() const { return planes_; }\n> +\tconst std::vector &planes() const { return planes_; }\n>\n> protected:\n> \tMappedBuffer();\n> diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\n> index a7a63601..b8b01e20 100644\n> --- a/src/android/jpeg/encoder_libjpeg.cpp\n> +++ b/src/android/jpeg/encoder_libjpeg.cpp\n> @@ -188,7 +188,7 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest,\n> \t\treturn frame.error();\n> \t}\n>\n> -\treturn encode(frame.maps()[0], dest, exifData, quality);\n> +\treturn encode(frame.planes()[0], dest, exifData, quality);\n> }\n>\n> int EncoderLibJpeg::encode(Span src, Span dest,\n> diff --git a/src/android/jpeg/thumbnailer.cpp b/src/android/jpeg/thumbnailer.cpp\n> index 79d83926..043c7b33 100644\n> --- a/src/android/jpeg/thumbnailer.cpp\n> +++ b/src/android/jpeg/thumbnailer.cpp\n> @@ -62,7 +62,7 @@ void Thumbnailer::createThumbnail(const FrameBuffer &source,\n> \tASSERT(tw % 2 == 0 && th % 2 == 0);\n>\n> \t/* Image scaling block implementing nearest-neighbour algorithm. */\n> -\tunsigned char *src = static_cast(frame.maps()[0].data());\n> +\tunsigned char *src = static_cast(frame.planes()[0].data());\n> \tunsigned char *srcC = src + sh * sw;\n> \tunsigned char *srcCb, *srcCr;\n> \tunsigned char *dstY, *srcY;\n> diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp\n> index 3e793a58..6952fc38 100644\n> --- a/src/android/yuv/post_processor_yuv.cpp\n> +++ b/src/android/yuv/post_processor_yuv.cpp\n> @@ -63,9 +63,9 @@ int PostProcessorYuv::process(const FrameBuffer &source,\n> \t\treturn -EINVAL;\n> \t}\n>\n> -\tint ret = libyuv::NV12Scale(sourceMapped.maps()[0].data(),\n> +\tint ret = libyuv::NV12Scale(sourceMapped.planes()[0].data(),\n> \t\t\t\t sourceStride_[0],\n> -\t\t\t\t sourceMapped.maps()[1].data(),\n> +\t\t\t\t sourceMapped.planes()[1].data(),\n> \t\t\t\t sourceStride_[1],\n> \t\t\t\t sourceSize_.width, sourceSize_.height,\n> \t\t\t\t destination->plane(0).data(),\n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index 0ed0a6f1..c925cf64 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -422,7 +422,7 @@ void IPAIPU3::processEvent(const IPU3Event &event)\n> \t\t\treturn;\n> \t\t}\n>\n> -\t\tSpan mem = it->second.maps()[0];\n> +\t\tSpan mem = it->second.planes()[0];\n> \t\tconst ipu3_uapi_stats_3a *stats =\n> \t\t\treinterpret_cast(mem.data());\n>\n> @@ -436,7 +436,7 @@ void IPAIPU3::processEvent(const IPU3Event &event)\n> \t\t\treturn;\n> \t\t}\n>\n> -\t\tSpan mem = it->second.maps()[0];\n> +\t\tSpan mem = it->second.planes()[0];\n> \t\tipu3_uapi_params *params =\n> \t\t\treinterpret_cast(mem.data());\n>\n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 7215b205..047123ab 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -936,7 +936,7 @@ void IPARPi::prepareISP(const ipa::RPi::ISPConfig &data)\n> \t\t */\n> \t\tauto it = buffers_.find(data.embeddedBufferId);\n> \t\tASSERT(it != buffers_.end());\n> -\t\tembeddedBuffer = it->second.maps()[0];\n> +\t\tembeddedBuffer = it->second.planes()[0];\n> \t}\n>\n> \t/*\n> @@ -1043,7 +1043,7 @@ void IPARPi::processStats(unsigned int bufferId)\n> \t\treturn;\n> \t}\n>\n> -\tSpan mem = it->second.maps()[0];\n> +\tSpan mem = it->second.planes()[0];\n> \tbcm2835_isp_stats *stats = reinterpret_cast(mem.data());\n> \tRPiController::StatisticsPtr statistics = std::make_shared(*stats);\n> \thelper_->Process(statistics, rpiMetadata_);\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 046816e0..bf2c13b6 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -192,7 +192,7 @@ void IPARkISP1::processEvent(const RkISP1Event &event)\n>\n> \t\tconst rkisp1_stat_buffer *stats =\n> \t\t\treinterpret_cast(\n> -\t\t\t\tmappedBuffers_.at(bufferId).maps()[0].data());\n> +\t\t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\n>\n> \t\tupdateStatistics(frame, stats);\n> \t\tbreak;\n> @@ -203,7 +203,7 @@ void IPARkISP1::processEvent(const RkISP1Event &event)\n>\n> \t\trkisp1_params_cfg *params =\n> \t\t\treinterpret_cast(\n> -\t\t\t\tmappedBuffers_.at(bufferId).maps()[0].data());\n> +\t\t\t\tmappedBuffers_.at(bufferId).planes()[0].data());\n>\n> \t\tqueueRequest(frame, params, event.controls);\n> \t\tbreak;\n> diff --git a/src/libcamera/mapped_framebuffer.cpp b/src/libcamera/mapped_framebuffer.cpp\n> index 4db92b8c..464d35fe 100644\n> --- a/src/libcamera/mapped_framebuffer.cpp\n> +++ b/src/libcamera/mapped_framebuffer.cpp\n> @@ -113,7 +113,7 @@ MappedBuffer::~MappedBuffer()\n> */\n>\n> /**\n> - * \\fn MappedBuffer::maps()\n> + * \\fn MappedBuffer::planes()\n> * \\brief Retrieve the mapped planes\n> *\n> * This function retrieves the successfully mapped planes stored as a vector\n> --\n> 2.33.0.259.gc128427fd7-goog\n>","headers":{"Return-Path":"","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 12487BD87D\n\tfor ;\n\tTue, 31 Aug 2021 10:11:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 74FC36916A;\n\tTue, 31 Aug 2021 12:11:50 +0200 (CEST)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D324268890\n\tfor ;\n\tTue, 31 Aug 2021 12:11:48 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 5DD1D240002;\n\tTue, 31 Aug 2021 10:11:48 +0000 (UTC)"],"Date":"Tue, 31 Aug 2021 12:12:37 +0200","From":"Jacopo Mondi ","To":"Hirokazu Honda ","Message-ID":"<20210831101237.5q4vowbhgf2ewbiw@uno.localdomain>","References":"<20210830210224.703704-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210830210224.703704-1-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH] libcamera: mapped_framebuffer: Rename\n\tmaps() to planes()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]