Patch Detail
Show a patch.
GET /api/patches/16316/?format=api
{ "id": 16316, "url": "https://patchwork.libcamera.org/api/patches/16316/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16316/", "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": "<20220622123706.2946976-7-chenghaoyang@google.com>", "date": "2022-06-22T12:37:06", "name": "[libcamera-devel,v5,6/6] Add JEA implementation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "f7f3ea1beb8d449b1100b89d1fd25d0f18fb35ef", "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/16316/mbox/", "series": [ { "id": 3203, "url": "https://patchwork.libcamera.org/api/series/3203/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3203", "date": "2022-06-22T12:37:00", "name": "Add CrOS JEA implementation", "version": 5, "mbox": "https://patchwork.libcamera.org/series/3203/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16316/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16316/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 7C50BBE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 22 Jun 2022 12:37:38 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3A951633A7;\n\tWed, 22 Jun 2022 14:37:38 +0200 (CEST)", "from mail-pg1-x532.google.com (mail-pg1-x532.google.com\n\t[IPv6:2607:f8b0:4864:20::532])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9C5D7633A7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 Jun 2022 14:37:36 +0200 (CEST)", "by mail-pg1-x532.google.com with SMTP id l4so15961251pgh.13\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 Jun 2022 05:37:36 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(21.160.199.104.bc.googleusercontent.com. [104.199.160.21])\n\tby smtp.gmail.com with ESMTPSA id\n\tj3-20020a170903024300b0016378bfeb90sm12684038plh.227.2022.06.22.05.37.31\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 22 Jun 2022 05:37:33 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1655901458;\n\tbh=Z2FDpJT+kMisGa3hL+Qi2PF/+puvBNfJeFcuwl+XSmI=;\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=0Ez7fZovWrmYRXZD8lEsBLs0oCAaDriYCwWqjyDV7BxD0fWiBeSIiaip40O8EAz5S\n\t862bG5p+ddns6HFCPaqeU0ntSxCAQL0aS4Lz92GrRBWBKlc6r59UotEkH8pkVeaHhT\n\t7cJlBedmgxwzFxczZoNl/UklXDpiHzER85TINnjg0pbZji7X/VsURdlDoWnunZHtBH\n\tKuV0cVExrcPhglv8wbyARGUSnFQci44dKyJpglYXVUoyf9foQebCGJOi4AhuiYJjM1\n\t89PhKVx0oGDOBlXYTH6y56Xxo0T9UFdACdq1N3HBM5flqGEQujGseuEkDKjjXcM/Eh\n\tw9NhdZ/FDGN9g==", "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=0XhpHenpUB/4FLjMfid3gqItzjdyetLAoPXt2cZ6ytc=;\n\tb=L39oaQcFlIgMh9cn5FPu5kMoIxGcyJ7z+8UXgwOYk5lgYmlOYJiUWLAbioxb5NsQLR\n\tAGxwQQw+Vsy471d4mPfDg+yivK6U51hPR9kpNA4BCJNloS8ZXPc5OJht4jqVhsOPjsZ3\n\t9vepogSLgiM0KVooqyKQ+Hto/Vvji2Xu95fDY=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"L39oaQcF\"; \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=0XhpHenpUB/4FLjMfid3gqItzjdyetLAoPXt2cZ6ytc=;\n\tb=l7KrFONLTa3IN7j08dBcAPqbjVGGElsJKokqqBujfCehq93Oj/FWv5Q8HQLYGGIg94\n\tXweNnKbgHD1L97OurATBC6nD5m62uXkNw7JGzbiyFXD2Ll8HY1YJcot0x2lCwUmFHY0k\n\t519tZ/e2Z7jFqgGd9+hQseWHFNqzjuasd9zLMiKHJwfCNxDjzZYldFNK1CUqDCbNbejm\n\tGZD0bOE+C5f84qtJKkIf79qfuQNa6DyPShrL4DhpwR9L/siOjO/w5k71QMX4sMg+HXgt\n\tpHcDn7430Em5bv2AZYrWQnaIGG+fk18UGl4WSIwNuT6d8sqEpNSGCdHlPC7IUnZRWdiB\n\t3VTQ==", "X-Gm-Message-State": "AJIora8SGDIgsscUnbeyUNl04KmdCcf9AslVOHno+hYLqFxUjh3F7CNE\n\tnOQt5TLMprC7Z8Htmb3O4BSgdyYLFz8PiQ==", "X-Google-Smtp-Source": "AGRyM1vfBOukQ23g/lh9ocFVDaf8IjClLeXUMbjMExarn8Y4T3LpokUd3Lsa77q5LNiDB4P/e7hCVw==", "X-Received": "by 2002:a05:6a00:170e:b0:525:4cac:fa65 with SMTP id\n\th14-20020a056a00170e00b005254cacfa65mr1199101pfc.40.1655901454824; \n\tWed, 22 Jun 2022 05:37:34 -0700 (PDT)", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 22 Jun 2022 12:37:06 +0000", "Message-Id": "<20220622123706.2946976-7-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.37.0.rc0.104.g0611611a94-goog", "In-Reply-To": "<20220622123706.2946976-1-chenghaoyang@google.com>", "References": "<20220622123706.2946976-1-chenghaoyang@google.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 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 | 86 ++++++++++++++++++++++++\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, 153 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..af384748\n--- /dev/null\n+++ b/src/android/jpeg/encoder_jea.cpp\n@@ -0,0 +1,86 @@\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/base/log.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+\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\treturn -EBUSY;\n+\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", "v5", "6/6" ] }