Patch Detail
Show a patch.
GET /api/patches/17928/?format=api
{ "id": 17928, "url": "https://patchwork.libcamera.org/api/patches/17928/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17928/", "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": "<20221201092733.2042078-7-chenghaoyang@google.com>", "date": "2022-12-01T09:27:33", "name": "[libcamera-devel,v7,6/6] Add JEA implementation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2ea1fce47dc2a6c89470dd75933c2bea32962d4c", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17928/mbox/", "series": [ { "id": 3652, "url": "https://patchwork.libcamera.org/api/series/3652/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3652", "date": "2022-12-01T09:27:27", "name": "Add CrOS JEA implementation", "version": 7, "mbox": "https://patchwork.libcamera.org/series/3652/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17928/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17928/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 AEF93C3284\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 1 Dec 2022 09:27:53 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6A02463336;\n\tThu, 1 Dec 2022 10:27:53 +0100 (CET)", "from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com\n\t[IPv6:2607:f8b0:4864:20::1032])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8F87D63336\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 1 Dec 2022 10:27:51 +0100 (CET)", "by mail-pj1-x1032.google.com with SMTP id cm20so1330499pjb.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 01 Dec 2022 01:27:51 -0800 (PST)", "from chenghaoyang-low.c.googlers.com.com\n\t(46.165.189.35.bc.googleusercontent.com. [35.189.165.46])\n\tby smtp.gmail.com with ESMTPSA id\n\tz9-20020a1709027e8900b00186b8752a78sm3108050pla.80.2022.12.01.01.27.48\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 01 Dec 2022 01:27:49 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1669886873;\n\tbh=KgBVeC479hx8nwxCUQfH81KCm4FAwzDWbVAlWZXCyUQ=;\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=rno4a/acshpgAqDtFJygLAu0GoLh/OBYL2p5kt3MJWzs0Dp/DkT6J9T2qqADsJzlT\n\tY7rJL0tnBc/ZC3OkOTOCc+fn+Kl+GkVQgwjiNnqYiFE5UalxUVlzH1GpgRkViWaTQv\n\t6AjfOgkp9WDF/xGYGjOhoEx1E7OnPd6tcg0VnTB66lnM4OG+Pd2PRgj4LnfhDjcPaa\n\tctrodHW9MHF6MprRezyDmGdkH9pz6th+FrIoUZsUuSPGMtxw2UWAxOonwT442VGvTY\n\tOv03dAW6txERT1gwbm0bBTRDJYyyvSS/vyDQ34ZMstqc9NYVZGCeul3k5zv5hc2oJr\n\tQoJOG827xIpCg==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=p0n4GYoGdVuD6ag/A8hLDe9e8xGF6rYG6bYzbxH7S6A=;\n\tb=OT6OmqcRZiMMvWnglyrhgg1BXr5ah0ouacwN5hwNRMvzTY6bLL8BNP2vv4RMkGGCkW\n\tyX1TCLMGWnU49deroqFn432g/r0MFnqu1CLxBI3bb+QIEuY9ALbe4YrFdmwCFfLU7PpV\n\t8fNsB5M1aTeyhyoagO/TIHXoLmXwcML+DHsh4=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"OT6OmqcR\"; \n\tdkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=p0n4GYoGdVuD6ag/A8hLDe9e8xGF6rYG6bYzbxH7S6A=;\n\tb=WpPQbmuE+k0cIPWTY5ZUD4Rwnrm37xLi7q5d1U1DIf+YLZhl3z/GBqJ4k9cpCnhYYz\n\t+VsY3gMiExOwvQS2YvtUYCMwZw8c2bTXvWy4uixYETfuHqZhUBIABpwHRRG7lOPb7AXY\n\tKxgs4d67LyUK9/rrqRiV+PGJhZKS1QLetUhdKyoqiQx44EdTLnyE72drTr2wpTrUZt9c\n\tCKIrGediFRYnOELOFgxrxFASwHpjulcJ05qj4hq2G+539MGMFOlxFeRkZn5netzWEqCC\n\tQ1fE6Z7zgh4rZYzHK3kl8eq3KeQo4P8lJjJxGlJV4XSPYEqWtPRFuF9d6Mhkn4LrB2iM\n\tOV6Q==", "X-Gm-Message-State": "ANoB5pkI0ntMtRQL8kRCD5CqbJq+zKsvKjmOODI6uYl3fLMccC26nDfj\n\tIJMNSGzbk/NlLxktkFpyfxugEnH8MsaVBlUK", "X-Google-Smtp-Source": "AA0mqf4+L6fQZKcllU5mA0Jy3gl4jtCd7MbtQ3v9ubLNtkbrXDS14Q17mLq1WYPibwU9AyBJrvcxhQ==", "X-Received": "by 2002:a17:902:7c82:b0:189:760d:c5f2 with SMTP id\n\ty2-20020a1709027c8200b00189760dc5f2mr26980885pll.90.1669886869481; \n\tThu, 01 Dec 2022 01:27:49 -0800 (PST)", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 1 Dec 2022 09:27:33 +0000", "Message-Id": "<20221201092733.2042078-7-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.38.1.584.g0f3c55d4c2-goog", "In-Reply-To": "<20221201092733.2042078-1-chenghaoyang@google.com>", "References": "<20221201092733.2042078-1-chenghaoyang@google.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v7 6/6] Add JEA implementation", "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": "Harvey Yang via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Harvey Yang <chenghaoyang@chromium.org>", "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\nThis patch adds JEA implementation to replace Lib Jpeg in cros platform,\nwhere HW accelerator is available.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/android/cros/camera3_hal.cpp | 2 +\n src/android/cros_mojo_token.h | 12 +++\n src/android/jpeg/encoder_jea.cpp | 93 ++++++++++++++++++++++++\n src/android/jpeg/encoder_jea.h | 35 +++++++++\n src/android/jpeg/meson.build | 12 ++-\n src/android/jpeg/post_processor_jpeg.cpp | 8 ++\n 6 files changed, 160 insertions(+), 2 deletions(-)\n create mode 100644 src/android/cros_mojo_token.h\n create mode 100644 src/android/jpeg/encoder_jea.cpp\n create mode 100644 src/android/jpeg/encoder_jea.h", "diff": "diff --git a/src/android/cros/camera3_hal.cpp b/src/android/cros/camera3_hal.cpp\nindex fb863b5f..d75afccb 100644\n--- a/src/android/cros/camera3_hal.cpp\n+++ b/src/android/cros/camera3_hal.cpp\n@@ -8,9 +8,11 @@\n #include <cros-camera/cros_camera_hal.h>\n \n #include \"../camera_hal_manager.h\"\n+#include \"../cros_mojo_token.h\"\n \n static void set_up([[maybe_unused]] cros::CameraMojoChannelManagerToken *token)\n {\n+\tgCrosMojoToken = token;\n }\n \n static void tear_down()\ndiff --git a/src/android/cros_mojo_token.h b/src/android/cros_mojo_token.h\nnew file mode 100644\nindex 00000000..043c752a\n--- /dev/null\n+++ b/src/android/cros_mojo_token.h\n@@ -0,0 +1,12 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Google Inc.\n+ *\n+ * cros_mojo_token.h - cros-specific mojo token\n+ */\n+\n+#pragma once\n+\n+#include <cros-camera/cros_camera_hal.h>\n+\n+inline cros::CameraMojoChannelManagerToken *gCrosMojoToken = nullptr;\ndiff --git a/src/android/jpeg/encoder_jea.cpp b/src/android/jpeg/encoder_jea.cpp\nnew file mode 100644\nindex 00000000..66a854c4\n--- /dev/null\n+++ b/src/android/jpeg/encoder_jea.cpp\n@@ -0,0 +1,93 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Google Inc.\n+ *\n+ * encoder_jea.cpp - JPEG encoding using CrOS JEA\n+ */\n+\n+#include \"encoder_jea.h\"\n+\n+#include \"libcamera/internal/mapped_framebuffer.h\"\n+\n+#include <cros-camera/camera_mojo_channel_manager_token.h>\n+\n+#include \"../cros_mojo_token.h\"\n+#include \"../hal_framebuffer.h\"\n+\n+EncoderJea::EncoderJea() = default;\n+\n+EncoderJea::~EncoderJea() = default;\n+\n+int EncoderJea::configure(const libcamera::StreamConfiguration &cfg)\n+{\n+\tsize_ = cfg.size;\n+\n+\tif (jpegCompressor_)\n+\t\treturn 0;\n+\n+\tif (gCrosMojoToken == nullptr)\n+\t\treturn -ENOTSUP;\n+\n+\tjpegCompressor_ = cros::JpegCompressor::GetInstance(gCrosMojoToken);\n+\n+\treturn 0;\n+}\n+\n+int EncoderJea::encode(Camera3RequestDescriptor::StreamBuffer *streamBuffer,\n+\t\t libcamera::Span<const uint8_t> exifData,\n+\t\t unsigned int quality)\n+{\n+\tif (!jpegCompressor_)\n+\t\treturn -ENOTSUP;\n+\n+\tuint32_t outDataSize = 0;\n+\tconst HALFrameBuffer *fb = dynamic_cast<const HALFrameBuffer *>(\n+\t\tstreamBuffer->srcBuffer);\n+\n+\tif (!jpegCompressor_->CompressImageFromHandle(fb->handle(),\n+\t\t\t\t\t\t *streamBuffer->camera3Buffer,\n+\t\t\t\t\t\t size_.width, size_.height,\n+\t\t\t\t\t\t quality, exifData.data(),\n+\t\t\t\t\t\t exifData.size(),\n+\t\t\t\t\t\t &outDataSize))\n+\t\treturn -EBUSY;\n+\n+\treturn outDataSize;\n+}\n+\n+int EncoderJea::generateThumbnail(const libcamera::FrameBuffer &source,\n+\t\t\t\t const libcamera::Size &targetSize,\n+\t\t\t\t unsigned int quality,\n+\t\t\t\t std::vector<unsigned char> *thumbnail)\n+{\n+\tif (!jpegCompressor_)\n+\t\treturn -ENOTSUP;\n+\n+\tlibcamera::MappedFrameBuffer frame(&source,\n+\t\t\t\t\t libcamera::MappedFrameBuffer::MapFlag::Read);\n+\n+\tif (frame.planes().empty())\n+\t\treturn -ENODATA;\n+\n+\tuint32_t outDataSize = 0;\n+\n+\t// Since the structure of the App1 segment is like:\n+\t// 0xFF [1 byte marker] [2 bytes size] [data]\n+\t// And it should not be larger than 64K.\n+\tconst int kApp1MaxDataSize = 65532;\n+\tthumbnail->resize(kApp1MaxDataSize);\n+\n+\tif (!jpegCompressor_->GenerateThumbnail(frame.planes()[0].data(),\n+\t\t\t\t\t\tsize_.width, size_.height,\n+\t\t\t\t\t\ttargetSize.width,\n+\t\t\t\t\t\ttargetSize.height, quality,\n+\t\t\t\t\t\tthumbnail->size(),\n+\t\t\t\t\t\tthumbnail->data(),\n+\t\t\t\t\t\t&outDataSize)) {\n+\t\tthumbnail->clear();\n+\t\treturn -EBUSY;\n+\t}\n+\n+\tthumbnail->resize(outDataSize);\n+\treturn outDataSize;\n+}\ndiff --git a/src/android/jpeg/encoder_jea.h b/src/android/jpeg/encoder_jea.h\nnew file mode 100644\nindex 00000000..2eba31c2\n--- /dev/null\n+++ b/src/android/jpeg/encoder_jea.h\n@@ -0,0 +1,35 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Google Inc.\n+ *\n+ * encoder_jea.h - JPEG encoding using CrOS JEA\n+ */\n+\n+#pragma once\n+\n+#include <libcamera/geometry.h>\n+\n+#include <cros-camera/jpeg_compressor.h>\n+\n+#include \"encoder.h\"\n+\n+class EncoderJea : public Encoder\n+{\n+public:\n+\tEncoderJea();\n+\t~EncoderJea();\n+\n+\tint configure(const libcamera::StreamConfiguration &cfg) override;\n+\tint encode(Camera3RequestDescriptor::StreamBuffer *streamBuffer,\n+\t\t libcamera::Span<const uint8_t> exifData,\n+\t\t unsigned int quality) override;\n+\tint generateThumbnail(const libcamera::FrameBuffer &source,\n+\t\t\t const libcamera::Size &targetSize,\n+\t\t\t unsigned int quality,\n+\t\t\t std::vector<unsigned char> *thumbnail) override;\n+\n+private:\n+\tlibcamera::Size size_;\n+\n+\tstd::unique_ptr<cros::JpegCompressor> jpegCompressor_;\n+};\ndiff --git a/src/android/jpeg/meson.build b/src/android/jpeg/meson.build\nindex 08397a87..d25016b1 100644\n--- a/src/android/jpeg/meson.build\n+++ b/src/android/jpeg/meson.build\n@@ -1,8 +1,16 @@\n # SPDX-License-Identifier: CC0-1.0\n \n android_hal_sources += files([\n- 'encoder_libjpeg.cpp',\n 'exif.cpp',\n 'post_processor_jpeg.cpp',\n- 'thumbnailer.cpp'\n ])\n+\n+platform = get_option('android_platform')\n+if platform == 'generic'\n+ android_hal_sources += files(['encoder_libjpeg.cpp',\n+ 'thumbnailer.cpp'\n+ ])\n+elif platform == 'cros'\n+ android_hal_sources += files(['encoder_jea.cpp'])\n+ android_deps += [dependency('libcros_camera')]\n+endif\ndiff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex 10ac4666..15115424 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -12,7 +12,11 @@\n #include \"../camera_device.h\"\n #include \"../camera_metadata.h\"\n #include \"../camera_request.h\"\n+#if defined(OS_CHROMEOS)\n+#include \"encoder_jea.h\"\n+#else // !defined(OS_CHROMEOS)\n #include \"encoder_libjpeg.h\"\n+#endif\n #include \"exif.h\"\n \n #include <libcamera/base/log.h>\n@@ -44,7 +48,11 @@ int PostProcessorJpeg::configure(const StreamConfiguration &inCfg,\n \n \tstreamSize_ = outCfg.size;\n \n+#if defined(OS_CHROMEOS)\n+\tencoder_ = std::make_unique<EncoderJea>();\n+#else // !defined(OS_CHROMEOS)\n \tencoder_ = std::make_unique<EncoderLibJpeg>();\n+#endif\n \n \treturn encoder_->configure(inCfg);\n }\n", "prefixes": [ "libcamera-devel", "v7", "6/6" ] }