{"id":18121,"url":"https://patchwork.libcamera.org/api/1.1/patches/18121/?format=json","web_url":"https://patchwork.libcamera.org/patch/18121/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20230116002808.16014-5-laurent.pinchart@ideasonboard.com>","date":"2023-01-16T00:28:04","name":"[libcamera-devel,v9,4/8] android: jpeg: Add an internal Encoder class in EncoderLibJpeg","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a43f02b713e69d03eab53cca153230e87e076089","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18121/mbox/","series":[{"id":3712,"url":"https://patchwork.libcamera.org/api/1.1/series/3712/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3712","date":"2023-01-16T00:28:00","name":"Add CrOS JEA implementation","version":9,"mbox":"https://patchwork.libcamera.org/series/3712/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18121/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18121/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 95C14C3294\n\tfor ;\n\tMon, 16 Jan 2023 00:28:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5539F625F4;\n\tMon, 16 Jan 2023 01:28:16 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 635F1625ED\n\tfor ;\n\tMon, 16 Jan 2023 01:28:14 +0100 (CET)","from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi\n\t[213.243.189.158])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E1BD5997;\n\tMon, 16 Jan 2023 01:28:13 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1673828896;\n\tbh=23Lrt/FAquSj1ng9i9FMSOEJnmV9rWZH7Nf3CVIz3es=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=MaIyWhtLAKX0q5xL5YFeHyg0cuX8Q6COOnCenjO0c7iVNzMVmIu+5HJLNONFH1iFV\n\tMRNRpgLayRND5qHLeTnsyBTTuJD+mI8XcF10rVMz5/zEhVJL9VzcYYIbzqrZ/uvXJM\n\tyc7r4onIMA1ywC5dPBa8zP+eu2yt6a+JQ9D1Et2OIWvRoeaLRIVzazPbWB/RmWIv9U\n\tolsXo96bOIsB3G33RCfYE/IGM4SofStpVHhseljZChoMvKRzn2XUy1nCStL40VkXTk\n\tdVWjSRYp+M/wzG7jHgwNhvXK35VMpiUXxpw8dj4dp593TuFFqgcYgE2NP3F4xzUqfX\n\tXxkqs1BU+rwXQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1673828894;\n\tbh=23Lrt/FAquSj1ng9i9FMSOEJnmV9rWZH7Nf3CVIz3es=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=tmClEgEwJSdMaZM4Bp3J6SSitx4nxN5y8ySGAb8ZEqQoYTy4U9Dy7pUgVHU8nvp3f\n\tEWng7UQjFEtPrcBn8AAbYvKrxvRQWJl8JcI2Vs3N/0Y3n68acbr+YKhVAwZS83xwyq\n\tBBexMoQ1regKEg2tnZHvLsJvd8QJa5VisnXJ34nA="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"tmClEgEw\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 16 Jan 2023 02:28:04 +0200","Message-Id":"<20230116002808.16014-5-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.38.2","In-Reply-To":"<20230116002808.16014-1-laurent.pinchart@ideasonboard.com>","References":"<20230116002808.16014-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v9 4/8] android: jpeg: Add an internal\n\tEncoder class in EncoderLibJpeg","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","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"Harvey Yang ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Harvey Yang \n\nTo move the thumbnail encoder into EncoderLibJpeg in the following\npatch, this patch adds a wrapper/internal Encoder class that allows\nEncoderLibJpeg to have more than one encoder to tackle encoding of both\ncaptured images and their thumbnails.\n\nSigned-off-by: Harvey Yang \nReviewed-by: Laurent Pinchart \nSigned-off-by: Laurent Pinchart \n---\n src/android/jpeg/encoder_libjpeg.cpp | 57 ++++++++++++++++++----------\n src/android/jpeg/encoder_libjpeg.h | 30 +++++++++++----\n 2 files changed, 59 insertions(+), 28 deletions(-)","diff":"diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\nindex fd62bd9c7c5b..69fd91122aa6 100644\n--- a/src/android/jpeg/encoder_libjpeg.cpp\n+++ b/src/android/jpeg/encoder_libjpeg.cpp\n@@ -68,7 +68,35 @@ const struct JPEGPixelFormatInfo &findPixelInfo(const PixelFormat &format)\n \n } /* namespace */\n \n-EncoderLibJpeg::EncoderLibJpeg()\n+EncoderLibJpeg::EncoderLibJpeg() = default;\n+EncoderLibJpeg::~EncoderLibJpeg() = default;\n+\n+int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n+{\n+\treturn encoder_.configure(cfg);\n+}\n+\n+int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest,\n+\t\t\t Span exifData, unsigned int quality)\n+{\n+\tMappedFrameBuffer frame(&source, MappedFrameBuffer::MapFlag::Read);\n+\tif (!frame.isValid()) {\n+\t\tLOG(JPEG, Error) << \"Failed to map FrameBuffer: \"\n+\t\t\t\t << strerror(frame.error());\n+\t\treturn frame.error();\n+\t}\n+\n+\treturn encoder_.encode(frame.planes(), dest, exifData, quality);\n+}\n+\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+\treturn encoder_.encode(src, dest, exifData, quality);\n+}\n+\n+EncoderLibJpeg::Encoder::Encoder()\n {\n \t/* \\todo Expand error handling coverage with a custom handler. */\n \tcompress_.err = jpeg_std_error(&jerr_);\n@@ -76,12 +104,12 @@ EncoderLibJpeg::EncoderLibJpeg()\n \tjpeg_create_compress(&compress_);\n }\n \n-EncoderLibJpeg::~EncoderLibJpeg()\n+EncoderLibJpeg::Encoder::~Encoder()\n {\n \tjpeg_destroy_compress(&compress_);\n }\n \n-int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n+int EncoderLibJpeg::Encoder::configure(const StreamConfiguration &cfg)\n {\n \tconst struct JPEGPixelFormatInfo info = findPixelInfo(cfg.pixelFormat);\n \tif (info.colorSpace == JCS_UNKNOWN)\n@@ -103,7 +131,7 @@ int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n \treturn 0;\n }\n \n-void EncoderLibJpeg::compressRGB(const std::vector> &planes)\n+void EncoderLibJpeg::Encoder::compressRGB(const std::vector> &planes)\n {\n \tunsigned char *src = const_cast(planes[0].data());\n \t/* \\todo Stride information should come from buffer configuration. */\n@@ -121,7 +149,7 @@ void EncoderLibJpeg::compressRGB(const std::vector> &planes)\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(const std::vector> &planes)\n+void EncoderLibJpeg::Encoder::compressNV(const std::vector> &planes)\n {\n \tuint8_t tmprowbuf[compress_.image_width * 3];\n \n@@ -178,22 +206,9 @@ void EncoderLibJpeg::compressNV(const std::vector> &planes)\n \t}\n }\n \n-int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest,\n-\t\t\t Span exifData, unsigned int quality)\n-{\n-\tMappedFrameBuffer frame(&source, MappedFrameBuffer::MapFlag::Read);\n-\tif (!frame.isValid()) {\n-\t\tLOG(JPEG, Error) << \"Failed to map FrameBuffer : \"\n-\t\t\t\t << strerror(frame.error());\n-\t\treturn frame.error();\n-\t}\n-\n-\treturn encode(frame.planes(), dest, exifData, quality);\n-}\n-\n-int EncoderLibJpeg::encode(const std::vector> &src,\n-\t\t\t Span dest, Span exifData,\n-\t\t\t unsigned int quality)\n+int EncoderLibJpeg::Encoder::encode(const std::vector> &src,\n+\t\t\t\t Span dest, Span exifData,\n+\t\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 1b3ac067a1c0..eba591633cbb 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -32,14 +32,30 @@ public:\n \t\t unsigned int quality);\n \n private:\n-\tvoid compressRGB(const std::vector> &planes);\n-\tvoid compressNV(const std::vector> &planes);\n+\tclass Encoder\n+\t{\n+\tpublic:\n+\t\tEncoder();\n+\t\t~Encoder();\n \n-\tstruct jpeg_compress_struct compress_;\n-\tstruct jpeg_error_mgr jerr_;\n+\t\tint configure(const libcamera::StreamConfiguration &cfg);\n+\t\tint encode(const std::vector> &planes,\n+\t\t\t libcamera::Span destination,\n+\t\t\t libcamera::Span exifData,\n+\t\t\t unsigned int quality);\n \n-\tconst libcamera::PixelFormatInfo *pixelFormatInfo_;\n+\tprivate:\n+\t\tvoid compressRGB(const std::vector> &planes);\n+\t\tvoid compressNV(const std::vector> &planes);\n \n-\tbool nv_;\n-\tbool nvSwap_;\n+\t\tstruct jpeg_compress_struct compress_;\n+\t\tstruct jpeg_error_mgr jerr_;\n+\n+\t\tconst libcamera::PixelFormatInfo *pixelFormatInfo_;\n+\n+\t\tbool nv_;\n+\t\tbool nvSwap_;\n+\t};\n+\n+\tEncoder encoder_;\n };\n","prefixes":["libcamera-devel","v9","4/8"]}