{"id":18125,"url":"https://patchwork.libcamera.org/api/patches/18125/?format=json","web_url":"https://patchwork.libcamera.org/patch/18125/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","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-9-laurent.pinchart@ideasonboard.com>","date":"2023-01-16T00:28:08","name":"[libcamera-devel,v9,8/8] android: jpeg: Add JEA implementation","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"f9b4e828234a5b3431e23cb847fec1a5320bc7ed","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18125/mbox/","series":[{"id":3712,"url":"https://patchwork.libcamera.org/api/series/3712/?format=json","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/18125/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18125/checks/","tags":{},"headers":{"Return-Path":"","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 BC302C3294\n\tfor ;\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 5D2A2625EC;\n\tMon, 16 Jan 2023 01:28:21 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E869D625EC\n\tfor ;\n\tMon, 16 Jan 2023 01:28:19 +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 75D53997;\n\tMon, 16 Jan 2023 01:28:19 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1673828901;\n\tbh=4eAWDyIXyZYGJ7WwvcqGEf9HQqfFtULkt2N066/wd2c=;\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=Vcxlnj6AP8YuOGpduFxJQr1YgI2k04o4jjXejb4KEhYAShElc6TrjRt2QHRnfcLw+\n\tFIu14T4tqgttu/BHb1VfLTSfUXx7cEOnq3+o5oE4zviwAqwAx67gSdj1jDa0kWLQGj\n\tIZiR2Mc18OV7qkq6y0QYyRtXrLTg58quQcLyJag6SlgSUKCzQIDADsuyZJLrw0yuWk\n\t3djrXQhromRLg80Df7gLZD2gHA9Fr2uWILPt3HuXvbWBFYhVxlJpcL49DwfiRPNOuD\n\t5MB2yncOhpuIhtD/TWcd8RGaKr8LjjBoGWizA+w/qsWuYVj4LHdDJSiy43NiY6iFo/\n\tSOtLKBLhcec6w==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1673828899;\n\tbh=4eAWDyIXyZYGJ7WwvcqGEf9HQqfFtULkt2N066/wd2c=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=aeX0E3TqpLifv7ykAZ7CjWCa6CwJyFA6G1BWUKzhJe6sIWw5DDAYagBQpWIM4OTXr\n\t6cOCmw6oPPnojAb15bA5/XfdopLlTYhp4nvB3pSS3YP38iEz+qBY2fkd5M9XY3U5v1\n\tYfCEtN6hyqH9uOg+21NQnNLXk/uGBNMnn62pyTG0="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"aeX0E3Tq\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 16 Jan 2023 02:28:08 +0200","Message-Id":"<20230116002808.16014-9-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 8/8] android: jpeg: Add JEA\n\timplementation","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"Harvey Yang ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Harvey Yang \n\nThis patch adds JEA implementation to replace libjpeg in CrOS platform,\nwhere hardware accelerator is available.\n\nSigned-off-by: Harvey Yang \n---\n src/android/cros/camera3_hal.cpp | 4 +-\n src/android/cros_mojo_token.h | 12 +++\n src/android/jpeg/encoder_jea.cpp | 103 +++++++++++++++++++++++\n src/android/jpeg/encoder_jea.h | 35 ++++++++\n src/android/jpeg/meson.build | 13 ++-\n src/android/jpeg/post_processor_jpeg.cpp | 8 ++\n 6 files changed, 172 insertions(+), 3 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 fb863b5f9aa9..71acb441b0d4 100644\n--- a/src/android/cros/camera3_hal.cpp\n+++ b/src/android/cros/camera3_hal.cpp\n@@ -8,9 +8,11 @@\n #include \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+static void set_up(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 000000000000..043c752a3997\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 \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 000000000000..a7076039d0b7\n--- /dev/null\n+++ b/src/android/jpeg/encoder_jea.cpp\n@@ -0,0 +1,103 @@\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 \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 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 =\n+\t\tdynamic_cast(streamBuffer->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 *thumbnail)\n+{\n+\tif (!jpegCompressor_)\n+\t\treturn -ENOTSUPP;\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 -EINVAL;\n+\n+\t/* JEA needs consecutive memory. */\n+\tunsigned long size = 0, index = 0;\n+\tfor (const auto &plane : frame.planes())\n+\t\tsize += plane.size();\n+\n+\tstd::vector data(size);\n+\tfor (const auto &plane : frame.planes()) {\n+\t\tmemcpy(&data[index], plane.data(), plane.size());\n+\t\tindex += plane.size();\n+\t}\n+\n+\tuint32_t outDataSize = 0;\n+\n+\t/*\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+\t */\n+\tconstexpr int kApp1MaxDataSize = 65532;\n+\tthumbnail->resize(kApp1MaxDataSize);\n+\n+\tif (!jpegCompressor_->GenerateThumbnail(data.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+\tthumbnail->resize(outDataSize);\n+}\ndiff --git a/src/android/jpeg/encoder_jea.h b/src/android/jpeg/encoder_jea.h\nnew file mode 100644\nindex 000000000000..2eba31c2f73c\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 \n+\n+#include \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 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 *thumbnail) override;\n+\n+private:\n+\tlibcamera::Size size_;\n+\n+\tstd::unique_ptr jpegCompressor_;\n+};\ndiff --git a/src/android/jpeg/meson.build b/src/android/jpeg/meson.build\nindex 08397a87bc46..2b68f54c4228 100644\n--- a/src/android/jpeg/meson.build\n+++ b/src/android/jpeg/meson.build\n@@ -1,8 +1,17 @@\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([\n+ '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 2a22b4a88f4a..f7cc70de1ef1 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 \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();\n+#else /* !defined(OS_CHROMEOS) */\n \tencoder_ = std::make_unique();\n+#endif\n \n \treturn encoder_->configure(inCfg);\n }\n","prefixes":["libcamera-devel","v9","8/8"]}