Patch Detail
Show a patch.
GET /api/patches/18124/?format=api
{ "id": 18124, "url": "https://patchwork.libcamera.org/api/patches/18124/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18124/", "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": "<20230116002808.16014-8-laurent.pinchart@ideasonboard.com>", "date": "2023-01-16T00:28:07", "name": "[libcamera-devel,v9,7/8] android: jpeg: Pass StreamBuffer to Encoder::encoder", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "577750b282e7608be052feb804e4b554f7765d17", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18124/mbox/", "series": [ { "id": 3712, "url": "https://patchwork.libcamera.org/api/series/3712/?format=api", "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/18124/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18124/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 298A2BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 16 Jan 2023 00:28:21 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D75FE625EF;\n\tMon, 16 Jan 2023 01:28:20 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9E2A5625F0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 16 Jan 2023 01:28:18 +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 1F051997;\n\tMon, 16 Jan 2023 01:28:18 +0100 (CET)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1673828900;\n\tbh=6Bsg9cgMployM9UcfkXKPXFJldYQPlYqaB0ftDOCHqI=;\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=izzBIIbdKfk3gnaKWBjZkNKzg4bKRyMzLqXwcPbCUasmQs3OQaTC3iNkRNX0+YFBL\n\tVnzVTgexBGGw66W/mGy6CV0bJfvgkMGONZeKKony7XqfIYLRqwKtUjteApPN8vt6uu\n\ttS2MmFmWDywC1TD/WOjCr9cxOb5brbEUeUt3WO7pBOoFhgZbV1tjoIxo09ABN0MT/c\n\t4o7/+SHllQPgkE5kNR+Ca4uxUygxQxVEDhP6hWtah3GttqjCjRyUn5gsmYfkICQguY\n\t5SX0zweUDkTeKwMXpl33IPkkko1IJ2pvuQ1iKNcayMOMAsq1X31y6idwjvz4M3tgvv\n\t9hm3Ou66R3KiA==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1673828898;\n\tbh=6Bsg9cgMployM9UcfkXKPXFJldYQPlYqaB0ftDOCHqI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=VlemsUnrOdTqLWZU+8+2NGpjKzVQOamMtCJ3sgo0KrCe9qHXLQm2QEyBsAZbXEZLC\n\teN2RhOCaDZfTynkZMM9mZQOWwqKHGhbV3U3d1wZJcCRiMnSPkBP3Z27I0puvyF7GJZ\n\tkkbEZIXhLdEY1gUoxQGclZ713tSj0rPsswyFGMU0=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"VlemsUnr\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 16 Jan 2023 02:28:07 +0200", "Message-Id": "<20230116002808.16014-8-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 7/8] android: jpeg: Pass StreamBuffer\n\tto Encoder::encoder", "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>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Cc": "Harvey Yang <chenghaoyang@chromium.org>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Harvey Yang <chenghaoyang@chromium.org>\n\nTo prepare for support of the JEA encoder in a following commit, which\nwill need to access the buffer_handle_t of the destination buffer, pass\nthe StreamBuffer to the Encoder::encoder() function. As the StreamBuffer\ncontains the source FrameBuffer and the destination Span, drop them from\nthe function arguments and access them directly from the StreamBuffer.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Han-Lin Chen <hanlinchen@chromium.org>\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/android/jpeg/encoder.h | 5 +++--\n src/android/jpeg/encoder_libjpeg.cpp | 15 ++++++++++-----\n src/android/jpeg/encoder_libjpeg.h | 3 +--\n src/android/jpeg/post_processor_jpeg.cpp | 3 +--\n 4 files changed, 15 insertions(+), 11 deletions(-)", "diff": "diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\nindex d15f22e67830..d73cafba099d 100644\n--- a/src/android/jpeg/encoder.h\n+++ b/src/android/jpeg/encoder.h\n@@ -12,14 +12,15 @@\n #include <libcamera/framebuffer.h>\n #include <libcamera/stream.h>\n \n+#include \"../camera_request.h\"\n+\n class Encoder\n {\n public:\n \tvirtual ~Encoder() = default;\n \n \tvirtual int configure(const libcamera::StreamConfiguration &cfg) = 0;\n-\tvirtual int encode(const libcamera::FrameBuffer &source,\n-\t\t\t libcamera::Span<uint8_t> destination,\n+\tvirtual int encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n \t\t\t libcamera::Span<const uint8_t> exifData,\n \t\t\t unsigned int quality) = 0;\n \tvirtual int generateThumbnail(const libcamera::FrameBuffer &source,\ndiff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\nindex 8f4df7899dfd..c2fdc37770e5 100644\n--- a/src/android/jpeg/encoder_libjpeg.cpp\n+++ b/src/android/jpeg/encoder_libjpeg.cpp\n@@ -24,6 +24,8 @@\n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/mapped_framebuffer.h\"\n \n+#include \"../camera_buffer.h\"\n+\n using namespace libcamera;\n \n LOG_DECLARE_CATEGORY(JPEG)\n@@ -76,17 +78,20 @@ int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n \treturn captureEncoder_.configure(cfg);\n }\n \n-int EncoderLibJpeg::encode(const FrameBuffer &source, Span<uint8_t> dest,\n-\t\t\t Span<const uint8_t> exifData, unsigned int quality)\n+int EncoderLibJpeg::encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n+\t\t\t libcamera::Span<const uint8_t> exifData,\n+\t\t\t unsigned int quality)\n {\n-\tMappedFrameBuffer frame(&source, MappedFrameBuffer::MapFlag::Read);\n+\tMappedFrameBuffer frame(buffer->srcBuffer,\n+\t\t\t\tMappedFrameBuffer::MapFlag::Read);\n \tif (!frame.isValid()) {\n-\t\tLOG(JPEG, Error) << \"Failed to map FrameBuffer: \"\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 captureEncoder_.encode(frame.planes(), dest, exifData, quality);\n+\treturn captureEncoder_.encode(frame.planes(), buffer->dstBuffer->plane(0),\n+\t\t\t\t exifData, quality);\n }\n \n int EncoderLibJpeg::generateThumbnail(const libcamera::FrameBuffer &source,\ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 9cff4f1b42e3..d770595a495c 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -24,8 +24,7 @@ public:\n \t~EncoderLibJpeg();\n \n \tint configure(const libcamera::StreamConfiguration &cfg) override;\n-\tint encode(const libcamera::FrameBuffer &source,\n-\t\t libcamera::Span<uint8_t> destination,\n+\tint encode(Camera3RequestDescriptor::StreamBuffer *buffer,\n \t\t libcamera::Span<const uint8_t> exifData,\n \t\t unsigned int quality) override;\n \tint generateThumbnail(const libcamera::FrameBuffer &source,\ndiff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex 5df89383e1af..2a22b4a88f4a 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -146,8 +146,7 @@ void PostProcessorJpeg::process(Camera3RequestDescriptor::StreamBuffer *streamBu\n \tconst uint8_t quality = ret ? *entry.data.u8 : 95;\n \tresultMetadata->addEntry(ANDROID_JPEG_QUALITY, quality);\n \n-\tint jpeg_size = encoder_->encode(source, destination->plane(0),\n-\t\t\t\t\t exif.data(), quality);\n+\tint jpeg_size = encoder_->encode(streamBuffer, exif.data(), quality);\n \tif (jpeg_size < 0) {\n \t\tLOG(JPEG, Error) << \"Failed to encode stream image\";\n \t\tprocessComplete.emit(streamBuffer, PostProcessor::Status::Error);\n", "prefixes": [ "libcamera-devel", "v9", "7/8" ] }