Patch Detail
Show a patch.
GET /api/patches/16653/?format=api
{ "id": 16653, "url": "https://patchwork.libcamera.org/api/patches/16653/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16653/", "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": "<20220715143822.672321-7-chenghaoyang@google.com>", "date": "2022-07-15T14:38:22", "name": "[libcamera-devel,v6,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/16653/mbox/", "series": [ { "id": 3290, "url": "https://patchwork.libcamera.org/api/series/3290/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3290", "date": "2022-07-15T14:38:16", "name": "Add CrOS JEA implementation", "version": 6, "mbox": "https://patchwork.libcamera.org/series/3290/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16653/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16653/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 A8A29BE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 15 Jul 2022 14:38:41 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 64E5863325;\n\tFri, 15 Jul 2022 16:38:41 +0200 (CEST)", "from mail-pl1-x636.google.com (mail-pl1-x636.google.com\n\t[IPv6:2607:f8b0:4864:20::636])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5EA176331F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 Jul 2022 16:38:39 +0200 (CEST)", "by mail-pl1-x636.google.com with SMTP id x21so3383974plb.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 Jul 2022 07:38:39 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(208.158.221.35.bc.googleusercontent.com. [35.221.158.208])\n\tby smtp.gmail.com with ESMTPSA id\n\tf15-20020aa7968f000000b00528c22fbb45sm3972782pfk.141.2022.07.15.07.38.35\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 15 Jul 2022 07:38:36 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1657895921;\n\tbh=+tjB4LTzWCfPPM67vf/WerPRthW/aELUZae3TY7QBkE=;\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=bfC0TfLnPbUUFNBdBTeRfv63S6Xh5vERf1fTvKoteMhPOBcK1n+P7sG21wmIYn1+S\n\t59CKzlz7aEmuK9Vm0o2RuDLjWPFjH9MRK6tgRvtmmdOo3mJ1+SmoQU+eRD0iKY6GBT\n\tQyjwFmUCDV3yEgAi3P3z5QLEI9HRdsuDK4uS2GvGoQdPoCXiyKfKzNmcVMwtYFSwgN\n\t6H4sihedzoeB1oEukMvObK95KKe62WDjLQ1ledyt0xGGVxIDHmN/w3s3lTfK16FPuk\n\ttkN+GqmeiyViXd7YFlwY7NU4F1jBSZpsXPikvBUOglSigmlZf2gWVDvI0hNpOGZfKH\n\ttbOZ+yzR5cbbw==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=mfZvt5bd/xUhy+7wLC7VGXH1E/p8r11kFkp7vFXsRe8=;\n\tb=O6S22fFga8bxl3quSyx0YEk2IB5U7dFYujyvGPyim99jcxl3yZ6VFCkvNm9eg+yEdq\n\tzrChfPoYCnjE5jnSs3TpkN+YMMCLMoRn11kwdE3KpyheocJqac3X0vmexJ8Tyq1Z2MF/\n\tBI7EBVvDx+2mG1TGEgUB1RX21MwFDTPbbSi2Q=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"O6S22fFg\"; \n\tdkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=mfZvt5bd/xUhy+7wLC7VGXH1E/p8r11kFkp7vFXsRe8=;\n\tb=6hm0WJENqI2snXKtdxroft3hiX07wmAbYh79VAFyHL3wCyBCWKgxZHXxvOkFoFCezy\n\tItTl1t6eBA9uu/jNXQErNHGLRgQGV9dtuC0c1TdWXTensFrWfw017rqPm56H/D48wuYu\n\tWXY10F/tYEH4HpXsG5eivmoE7CtOngO3S5l7n6TNXEbS677N9rXiiMuObFtk5LOlT2oT\n\tiZlWmBbsNaD19fEf+3RN/b2Xr99te57rWMs9HvLjcNHyIA9kHDQp1IrSKQLbcnXRNiJ/\n\t00rvhrsZKkRf8LYB+qxJDI63b/yYM6iUKgJgnptq1OSfQtoJwp9jTqJOez8OAJbgRKwZ\n\tBqKw==", "X-Gm-Message-State": "AJIora+hJtBJpCt4wXxT47hW4PgcDzgsqG61y3YL59wcSYuYzL/OWx72\n\tanp9UzQVoOWiIyXkHDdFSWvRBwsylPba3A==", "X-Google-Smtp-Source": "AGRyM1vDlW1sBQjUvljaUPe8o/mksBMAODMmr0m1Vu5AoR8o1zyQuyI+5LX/iy8QMo4baYX3Zg/5Hg==", "X-Received": "by 2002:a17:90b:4a88:b0:1ef:e6a1:f2e5 with SMTP id\n\tlp8-20020a17090b4a8800b001efe6a1f2e5mr16357053pjb.1.1657895917415; \n\tFri, 15 Jul 2022 07:38:37 -0700 (PDT)", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 15 Jul 2022 14:38:22 +0000", "Message-Id": "<20220715143822.672321-7-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.37.0.170.g444d1eabd0-goog", "In-Reply-To": "<20220715143822.672321-1-chenghaoyang@google.com>", "References": "<20220715143822.672321-1-chenghaoyang@google.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v6 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 a1555048..4486ff08 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", "v6", "6/6" ] }