Patch Detail
Show a patch.
GET /api/patches/10270/?format=api
{ "id": 10270, "url": "https://patchwork.libcamera.org/api/patches/10270/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10270/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20201027212447.131431-2-email@uajain.com>", "date": "2020-10-27T21:24:45", "name": "[libcamera-devel,v2,1/3] android: jpeg: encoder_libjpeg: Allow encoding raw frame bytes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "93068e6575b08266fae719cc557bd021178372be", "submitter": { "id": 1, "url": "https://patchwork.libcamera.org/api/people/1/?format=api", "name": "Umang Jain", "email": "email@uajain.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/10270/mbox/", "series": [ { "id": 1422, "url": "https://patchwork.libcamera.org/api/series/1422/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1422", "date": "2020-10-27T21:24:44", "name": "android: jpeg: exif: Embed a JPEG-encoded thumbnail", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1422/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10270/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10270/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 5EF58C3B5C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 27 Oct 2020 21:25:01 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2EFC562230;\n\tTue, 27 Oct 2020 22:25:01 +0100 (CET)", "from mail.uajain.com (static.126.159.217.95.clients.your-server.de\n\t[95.217.159.126])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EE7AF6205F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 27 Oct 2020 22:24:59 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=uajain.com header.i=@uajain.com\n\theader.b=\"g4zx2o5Q\"; dkim-atps=neutral", "From": "Umang Jain <email@uajain.com>", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=uajain.com; s=mail;\n\tt=1603833899; bh=GbH+9TPuv/EdjiwNPJXY2dWcOMqZNJcKqFJJt+3Rd3U=;\n\th=From:To:Cc:Subject:In-Reply-To:References;\n\tb=g4zx2o5QBq2xT9CWdhiqxIdjZ3eA6KqDOEAjC9Y2rOLugjqjkyXytqEjwvAcsjtkZ\n\tBJNpTk2qicmdt9a0EpY5RpcKGW8ukkMImQnYBuN4sR6hZ57fKhrOhdxpmptB55YUFl\n\tRXG5UHsyjAMZ54HuhctqTFaNnTern2iEYUtaARMMuJB7zggFSftKB/t66e7tttbkJD\n\ttF3eJ7AqRdatvr73sgBv9/VMH9zTlmSMbXfyNFcvWxd8gZGHpD0jHOfe0tA3Ve2c7z\n\tj+y2197pKb0EsQGCeC9ASccazvWozBcnJH/ogAZKRHjo5e0m2vBq+FtnB7Jq1iUXDt\n\tkxutukq4Vtg1w==", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 28 Oct 2020 02:54:45 +0530", "Message-Id": "<20201027212447.131431-2-email@uajain.com>", "In-Reply-To": "<20201027212447.131431-1-email@uajain.com>", "References": "<20201027212447.131431-1-email@uajain.com>", "Mime-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 1/3] android: jpeg: encoder_libjpeg:\n\tAllow encoding raw frame bytes", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Allow encoding frames which are directly handed over to the encoder\nvia a span or vector i.e. a raw frame bytes. Introduce an overloaded\nEncoderLibJpeg::encode() with libcamera::Span source parameter to\nachieve this functionality. This makes the libjpeg-encoder a bit\nflexible for use case such as compressing a thumbnail generated for\nExif.\n\nSigned-off-by: Umang Jain <email@uajain.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/android/jpeg/encoder_libjpeg.cpp | 18 ++++++++++++------\n src/android/jpeg/encoder_libjpeg.h | 7 +++++--\n 2 files changed, 17 insertions(+), 8 deletions(-)", "diff": "diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\nindex cfa5332..aed919b 100644\n--- a/src/android/jpeg/encoder_libjpeg.cpp\n+++ b/src/android/jpeg/encoder_libjpeg.cpp\n@@ -104,9 +104,9 @@ int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n \treturn 0;\n }\n \n-void EncoderLibJpeg::compressRGB(const MappedBuffer *frame)\n+void EncoderLibJpeg::compressRGB(Span<const uint8_t> frame)\n {\n-\tunsigned char *src = static_cast<unsigned char *>(frame->maps()[0].data());\n+\tunsigned char *src = const_cast<unsigned char *>(frame.data());\n \t/* \\todo Stride information should come from buffer configuration. */\n \tunsigned int stride = pixelFormatInfo_->stride(compress_.image_width, 0);\n \n@@ -122,7 +122,7 @@ void EncoderLibJpeg::compressRGB(const MappedBuffer *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(const MappedBuffer *frame)\n+void EncoderLibJpeg::compressNV(Span<const uint8_t> frame)\n {\n \tuint8_t tmprowbuf[compress_.image_width * 3];\n \n@@ -144,7 +144,7 @@ void EncoderLibJpeg::compressNV(const MappedBuffer *frame)\n \tunsigned int cb_pos = nvSwap_ ? 1 : 0;\n \tunsigned int cr_pos = nvSwap_ ? 0 : 1;\n \n-\tconst unsigned char *src = static_cast<unsigned char *>(frame->maps()[0].data());\n+\tconst unsigned char *src = frame.data();\n \tconst unsigned char *src_c = src + y_stride * compress_.image_height;\n \n \tJSAMPROW row_pointer[1];\n@@ -189,6 +189,12 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span<uint8_t> dest,\n \t\treturn frame.error();\n \t}\n \n+\treturn encode(frame.maps()[0], dest, exifData);\n+}\n+\n+int EncoderLibJpeg::encode(Span<const uint8_t> src, Span<uint8_t> dest,\n+\t\t\t Span<const uint8_t> exifData)\n+{\n \tunsigned char *destination = dest.data();\n \tunsigned long size = dest.size();\n \n@@ -214,9 +220,9 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span<uint8_t> dest,\n \t\t\t << \"x\" << compress_.image_height;\n \n \tif (nv_)\n-\t\tcompressNV(&frame);\n+\t\tcompressNV(src);\n \telse\n-\t\tcompressRGB(&frame);\n+\t\tcompressRGB(src);\n \n \tjpeg_finish_compress(&compress_);\n \ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 40505dd..070f56f 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -24,10 +24,13 @@ public:\n \tint encode(const libcamera::FrameBuffer &source,\n \t\t libcamera::Span<uint8_t> destination,\n \t\t libcamera::Span<const uint8_t> exifData) override;\n+\tint encode(libcamera::Span<const uint8_t> source,\n+\t\t libcamera::Span<uint8_t> destination,\n+\t\t libcamera::Span<const uint8_t> exifData);\n \n private:\n-\tvoid compressRGB(const libcamera::MappedBuffer *frame);\n-\tvoid compressNV(const libcamera::MappedBuffer *frame);\n+\tvoid compressRGB(libcamera::Span<const uint8_t> frame);\n+\tvoid compressNV(libcamera::Span<const uint8_t> frame);\n \n \tstruct jpeg_compress_struct compress_;\n \tstruct jpeg_error_mgr jerr_;\n", "prefixes": [ "libcamera-devel", "v2", "1/3" ] }