{"id":13629,"url":"https://patchwork.libcamera.org/api/patches/13629/?format=json","web_url":"https://patchwork.libcamera.org/patch/13629/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210906134004.23485-1-laurent.pinchart@ideasonboard.com>","date":"2021-09-06T13:40:04","name":"[libcamera-devel,v2,28/27] android: jpeg: Support multi-planar buffers","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"177952124135afabb51292dfb0f51c16bf3efc07","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13629/mbox/","series":[{"id":2446,"url":"https://patchwork.libcamera.org/api/series/2446/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2446","date":"2021-09-06T02:00:33","name":"libcamera: Handle fallout of FrameBuffer offset support","version":2,"mbox":"https://patchwork.libcamera.org/series/2446/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13629/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13629/checks/","tags":{},"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 8C91BBDC71\n\tfor ;\n\tMon, 6 Sep 2021 13:40:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4FA4C69167;\n\tMon, 6 Sep 2021 15:40:29 +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 95BCE60137\n\tfor ;\n\tMon, 6 Sep 2021 15:40:27 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 279538AD;\n\tMon, 6 Sep 2021 15:40:27 +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=\"oVSaAeDW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630935627;\n\tbh=TBQvXpQIJzuTDycAD7Y3oLbrRvEgYn7z0BfVUGGdfFE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=oVSaAeDWBYuRQdUq7mMQAlQKC/FKO+hI9gmAj5HIborwetw/d6q/UigCIExFKsLex\n\tKdLEGYeSjnKkApTo3KDgovE7AsBmRBpHJDMIFtzQOqUTf38hhhQeXIDpnZnegBtT70\n\tG/OX53+LKLhmI3bU9n58u1UpnAaDJOCMmS1VE2fY=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 6 Sep 2021 16:40:04 +0300","Message-Id":"<20210906134004.23485-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20210906020100.14430-1-laurent.pinchart@ideasonboard.com>","References":"<20210906020100.14430-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 28/27] android: jpeg: Support\n\tmulti-planar buffers","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The JPEG post-processor uses MappedFrameBuffer to access pixel data, but\nonly uses data from the first plane. Pass the vector of planes to the\nencode() function to correctly handle multi-planar formats (currently\nlimited to NV12).\n\nSigned-off-by: Laurent Pinchart \n---\n src/android/jpeg/encoder_libjpeg.cpp | 18 +++++++++---------\n src/android/jpeg/encoder_libjpeg.h | 8 +++++---\n src/android/jpeg/post_processor_jpeg.cpp | 2 +-\n src/android/jpeg/thumbnailer.cpp | 4 ++--\n 4 files changed, 17 insertions(+), 15 deletions(-)","diff":"diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\nindex b8b01e20a001..7f63f36e793e 100644\n--- a/src/android/jpeg/encoder_libjpeg.cpp\n+++ b/src/android/jpeg/encoder_libjpeg.cpp\n@@ -103,9 +103,9 @@ int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n \treturn 0;\n }\n \n-void EncoderLibJpeg::compressRGB(Span frame)\n+void EncoderLibJpeg::compressRGB(const std::vector> &planes)\n {\n-\tunsigned char *src = const_cast(frame.data());\n+\tunsigned char *src = const_cast(planes[0].data());\n \t/* \\todo Stride information should come from buffer configuration. */\n \tunsigned int stride = pixelFormatInfo_->stride(compress_.image_width, 0);\n \n@@ -121,7 +121,7 @@ void EncoderLibJpeg::compressRGB(Span frame)\n * Compress the incoming buffer from a supported NV format.\n * This naively unpacks the semi-planar NV12 to a YUV888 format for libjpeg.\n */\n-void EncoderLibJpeg::compressNV(Span frame)\n+void EncoderLibJpeg::compressNV(const std::vector> &planes)\n {\n \tuint8_t tmprowbuf[compress_.image_width * 3];\n \n@@ -133,7 +133,6 @@ void EncoderLibJpeg::compressNV(Span frame)\n \t * Possible hints at:\n \t * https://sourceforge.net/p/libjpeg/mailman/message/30815123/\n \t */\n-\tunsigned int y_stride = pixelFormatInfo_->stride(compress_.image_width, 0);\n \tunsigned int c_stride = pixelFormatInfo_->stride(compress_.image_width, 1);\n \n \tunsigned int horzSubSample = 2 * compress_.image_width / c_stride;\n@@ -143,8 +142,8 @@ void EncoderLibJpeg::compressNV(Span frame)\n \tunsigned int cb_pos = nvSwap_ ? 1 : 0;\n \tunsigned int cr_pos = nvSwap_ ? 0 : 1;\n \n-\tconst unsigned char *src = frame.data();\n-\tconst unsigned char *src_c = src + y_stride * compress_.image_height;\n+\tconst unsigned char *src = planes[0].data();\n+\tconst unsigned char *src_c = planes[1].data();\n \n \tJSAMPROW row_pointer[1];\n \trow_pointer[0] = &tmprowbuf[0];\n@@ -188,11 +187,12 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest,\n \t\treturn frame.error();\n \t}\n \n-\treturn encode(frame.planes()[0], dest, exifData, quality);\n+\treturn encode(frame.planes(), dest, exifData, quality);\n }\n \n-int EncoderLibJpeg::encode(Span src, Span dest,\n-\t\t\t Span exifData, unsigned int quality)\n+int EncoderLibJpeg::encode(const std::vector> &src,\n+\t\t\t Span dest, Span exifData,\n+\t\t\t unsigned int quality)\n {\n \tunsigned char *destination = dest.data();\n \tunsigned long size = dest.size();\ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 61fbd1a69278..45ffbd7fae5d 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -9,6 +9,8 @@\n \n #include \"encoder.h\"\n \n+#include \n+\n #include \"libcamera/internal/formats.h\"\n \n #include \n@@ -24,14 +26,14 @@ public:\n \t\t libcamera::Span destination,\n \t\t libcamera::Span exifData,\n \t\t unsigned int quality) override;\n-\tint encode(libcamera::Span source,\n+\tint encode(const std::vector> &planes,\n \t\t libcamera::Span destination,\n \t\t libcamera::Span exifData,\n \t\t unsigned int quality);\n \n private:\n-\tvoid compressRGB(libcamera::Span frame);\n-\tvoid compressNV(libcamera::Span frame);\n+\tvoid compressRGB(const std::vector> &planes);\n+\tvoid compressNV(const std::vector> &planes);\n \n \tstruct jpeg_compress_struct compress_;\n \tstruct jpeg_error_mgr jerr_;\ndiff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex 3160a784419c..68d74842925d 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -72,7 +72,7 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer &source,\n \t\t */\n \t\tthumbnail->resize(rawThumbnail.size());\n \n-\t\tint jpeg_size = thumbnailEncoder_.encode(rawThumbnail,\n+\t\tint jpeg_size = thumbnailEncoder_.encode({ rawThumbnail },\n \t\t\t\t\t\t\t *thumbnail, {}, quality);\n \t\tthumbnail->resize(jpeg_size);\n \ndiff --git a/src/android/jpeg/thumbnailer.cpp b/src/android/jpeg/thumbnailer.cpp\nindex 043c7b33f06a..2c341535de9e 100644\n--- a/src/android/jpeg/thumbnailer.cpp\n+++ b/src/android/jpeg/thumbnailer.cpp\n@@ -62,8 +62,8 @@ 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.planes()[0].data());\n-\tunsigned char *srcC = src + sh * sw;\n+\tunsigned char *src = frame.planes()[0].data();\n+\tunsigned char *srcC = frame.planes()[1].data();\n \tunsigned char *srcCb, *srcCr;\n \tunsigned char *dstY, *srcY;\n \n","prefixes":["libcamera-devel","v2","28/27"]}