Patch Detail
Show a patch.
GET /api/1.1/patches/15746/?format=api
{ "id": 15746, "url": "https://patchwork.libcamera.org/api/1.1/patches/15746/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15746/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20220428095544.2795980-5-chenghaoyang@chromium.org>", "date": "2022-04-28T09:55:42", "name": "[libcamera-devel,v4,4/6] Move generateThumbnail from PostProcessorJpeg to Encoder", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "cadf2fb1501799a42e186751137d3c7251160797", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15746/mbox/", "series": [ { "id": 3081, "url": "https://patchwork.libcamera.org/api/1.1/series/3081/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3081", "date": "2022-04-28T09:55:38", "name": "Add CrOS JEA implementation", "version": 4, "mbox": "https://patchwork.libcamera.org/series/3081/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15746/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15746/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 8A208C3256\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 28 Apr 2022 09:56:04 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 39EB565643;\n\tThu, 28 Apr 2022 11:56:04 +0200 (CEST)", "from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com\n\t[IPv6:2607:f8b0:4864:20::102e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1CCC065648\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 28 Apr 2022 11:56:02 +0200 (CEST)", "by mail-pj1-x102e.google.com with SMTP id\n\tbd19-20020a17090b0b9300b001d98af6dcd1so7230743pjb.4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 28 Apr 2022 02:56:02 -0700 (PDT)", "from chenghaoyang.c.googlers.com.com\n\t(93.135.240.35.bc.googleusercontent.com. [35.240.135.93])\n\tby smtp.gmail.com with ESMTPSA id\n\tx6-20020a17090a46c600b001d960eaed66sm5861256pjg.42.2022.04.28.02.55.58\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 28 Apr 2022 02:55:59 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1651139764;\n\tbh=NnT3+MhIUEFP4qccDKQ3HJO9JviPehILtlxghQU0lxc=;\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=Sv/i0ESXFfaftljzrzWmsridCQwuNNqMPsD+r6Ae3FD2z35TBW9JR2pdJHS9ytafo\n\tLv7Lmml2n8ZE0+Rocn498L+egyIH8GdwhmzJvcY32RjLyDhyYrc5FIMLXl1P5w9AIW\n\tAirFWo3XAIdB4hDdVScmMWGJ/mwyP2igR3Ubtd9I7rtVCAa9FkAEHhqOJwtVznWDYE\n\t5JCNO2afoh9CAazus3Idwh5V7mHENtW235FQ+CZMaEAT2hv3u339w1rhXaIcKMzt0U\n\tAR8HmNCWz/k3iN7rrHUglZDi9S5LuY7Wb274WaX3O7LV3LQk1mQv6KfiQKZyHTnrYl\n\tjo7XjAuDTp71A==", "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=nbhdR181/dVJQPm0nFvUFyBeNc3lVr7BtscGlF3x0Qw=;\n\tb=QwUA3E7UuZUNKuyNO0Dt4VvqDoT6drZOcCtOMfgYfIjti3iMdld32ydH8K4tNQognm\n\tpJTufMwYgNCnmyWp4uiGP2jlB0DpLOWApiqoZ2MU72o683PM8O3SpR1sf61+UMpGPZUi\n\t8pSwJOVhqFDpYCeT4RKa8J9qSKc9HYZK/dlOk=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"QwUA3E7U\"; \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=nbhdR181/dVJQPm0nFvUFyBeNc3lVr7BtscGlF3x0Qw=;\n\tb=NDlr4HJr1biSOBq0m9/Iba7YQ871P3TPtzwsflY+zEQX0sxQcvayt4Je0vVjcuIBnV\n\tbE+Ns5ALLAcw97qx+pFsldKi5hwcxvBNX+s75BlTrVvSX4PLrfvItEDpFKWSLDC19+nM\n\tImpWJCXFLDJypHo4ihEipRyqj/j9ty+Iwh1VjljAHabV+P9Yd1nQv/S+/0zFNgfYiDXl\n\tR+fCB9xwKZsx5rh5LUA9ZaUPqlY4qc0ho76689+Fhm8VoXnkH1PzOOyWW9XeMnRkgwAc\n\tWLs0ONyRpTXBtgOk/1kIwPL2V/KBfgHwIVhQTrRytUFIpnK7/vJ/BpzYo5kgouIzKQp4\n\t/SSg==", "X-Gm-Message-State": "AOAM532ozAhijJfoQNVw8Q3ADgx92ftuNhIK4on5yKPROceL1hL8uShv\n\tC7Y5jgTa+wVkwZ8nr5Crtj+/WQREvvjkGNUD", "X-Google-Smtp-Source": "ABdhPJwb1BauBL7mP7Z271PvIuNZH2mbDkKSBHUMwwnFiI8TW5LKyinEhQSwWrYq7+rh6LZvR1NIcw==", "X-Received": "by 2002:a17:90b:4d82:b0:1d9:5c18:b749 with SMTP id\n\toj2-20020a17090b4d8200b001d95c18b749mr25313357pjb.27.1651139760182; \n\tThu, 28 Apr 2022 02:56:00 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 28 Apr 2022 09:55:42 +0000", "Message-Id": "<20220428095544.2795980-5-chenghaoyang@chromium.org>", "X-Mailer": "git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog", "In-Reply-To": "<20220428095544.2795980-1-chenghaoyang@chromium.org>", "References": "<20220428095544.2795980-1-chenghaoyang@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 4/6] Move generateThumbnail from\n\tPostProcessorJpeg to 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": "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": "In the following patch, generateThumbnail will have a different\nimplementation in the jea encoder. Therefore, this patch moves the\ngenerateThumbnail function from PostProcessorJpeg to Encoder.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/android/jpeg/encoder.h | 5 ++\n src/android/jpeg/encoder_libjpeg.cpp | 70 +++++++++++++++++++++++-\n src/android/jpeg/encoder_libjpeg.h | 18 +++++-\n src/android/jpeg/post_processor_jpeg.cpp | 54 +-----------------\n src/android/jpeg/post_processor_jpeg.h | 11 +---\n 5 files changed, 94 insertions(+), 64 deletions(-)", "diff": "diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\nindex b974d367..e76947d7 100644\n--- a/src/android/jpeg/encoder.h\n+++ b/src/android/jpeg/encoder.h\n@@ -22,4 +22,9 @@ public:\n \t\t\t libcamera::Span<uint8_t> destination,\n \t\t\t libcamera::Span<const uint8_t> exifData,\n \t\t\t unsigned int quality) = 0;\n+\tvirtual int generateThumbnail(\n+\t\t\tconst libcamera::FrameBuffer &source,\n+\t\t\tconst libcamera::Size &targetSize,\n+\t\t\tunsigned int quality,\n+\t\t\tstd::vector<unsigned char> *thumbnail) = 0;\n };\ndiff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\nindex 21a3b33d..d9a20b67 100644\n--- a/src/android/jpeg/encoder_libjpeg.cpp\n+++ b/src/android/jpeg/encoder_libjpeg.cpp\n@@ -83,12 +83,23 @@ EncoderLibJpeg::~EncoderLibJpeg()\n \n int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n {\n-\tconst struct JPEGPixelFormatInfo info = findPixelInfo(cfg.pixelFormat);\n+\tthumbnailer_.configure(cfg.size, cfg.pixelFormat);\n+\tpixelFormat_ = cfg.pixelFormat;\n+\tsize_ = cfg.size;\n+\n+\treturn configureEncoder(pixelFormat_, size_);\n+}\n+\n+int EncoderLibJpeg::configureEncoder(libcamera::PixelFormat pixelFormat,\n+\t\t\t\t libcamera::Size size)\n+{\n+\tconst struct JPEGPixelFormatInfo info = findPixelInfo(pixelFormat);\n+\n \tif (info.colorSpace == JCS_UNKNOWN)\n \t\treturn -ENOTSUP;\n \n-\tcompress_.image_width = cfg.size.width;\n-\tcompress_.image_height = cfg.size.height;\n+\tcompress_.image_width = size.width;\n+\tcompress_.image_height = size.height;\n \tcompress_.in_color_space = info.colorSpace;\n \n \tcompress_.input_components = info.colorSpace == JCS_GRAYSCALE ? 1 : 3;\n@@ -178,9 +189,62 @@ void EncoderLibJpeg::compressNV(const std::vector<Span<uint8_t>> &planes)\n \t}\n }\n \n+int EncoderLibJpeg::generateThumbnail(\n+\t\t const libcamera::FrameBuffer &source,\n+\t\t const libcamera::Size &targetSize,\n+\t\t unsigned int quality,\n+\t\t std::vector<unsigned char> *thumbnail)\n+{\n+\t/* Stores the raw scaled-down thumbnail bytes. */\n+\tstd::vector<unsigned char> rawThumbnail;\n+\n+\tthumbnailer_.createThumbnail(source, targetSize, &rawThumbnail);\n+\n+\tint ret = configureEncoder(thumbnailer_.pixelFormat(), targetSize);\n+\n+\tif (!rawThumbnail.empty() && !ret) {\n+\t\t/*\n+\t\t * \\todo Avoid value-initialization of all elements of the\n+\t\t * vector.\n+\t\t */\n+\t\tthumbnail->resize(rawThumbnail.size());\n+\n+\t\t/*\n+\t\t * Split planes manually as the encoder expects a vector of\n+\t\t * planes.\n+\t\t *\n+\t\t * \\todo Pass a vector of planes directly to\n+\t\t * Thumbnailer::createThumbnailer above and remove the manual\n+\t\t * planes split from here.\n+\t\t */\n+\t\tstd::vector<Span<uint8_t>> thumbnailPlanes;\n+\t\tconst PixelFormatInfo &formatNV12 =\n+\t\t\tPixelFormatInfo::info(formats::NV12);\n+\t\tsize_t yPlaneSize = formatNV12.planeSize(targetSize, 0);\n+\t\tsize_t uvPlaneSize = formatNV12.planeSize(targetSize, 1);\n+\t\tthumbnailPlanes.push_back({ rawThumbnail.data(), yPlaneSize });\n+\t\tthumbnailPlanes.push_back({ rawThumbnail.data() + yPlaneSize,\n+\t\t\t\t\t uvPlaneSize });\n+\n+\t\tint jpeg_size = encode(thumbnailPlanes, *thumbnail, {},\n+\t\t\t\t quality);\n+\t\tthumbnail->resize(jpeg_size);\n+\n+\t\tLOG(JPEG, Debug)\n+\t\t\t<< \"Thumbnail compress returned \"\n+\t\t\t<< jpeg_size << \" bytes\";\n+\n+\t\treturn jpeg_size;\n+\t}\n+\n+\treturn -1;\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 {\n+\tconfigureEncoder(pixelFormat_, size_);\n+\n \tMappedFrameBuffer frame(&source, MappedFrameBuffer::MapFlag::Read);\n \tif (!frame.isValid()) {\n \t\tLOG(JPEG, Error) << \"Failed to map FrameBuffer : \"\ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 1b3ac067..7b6131a4 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -15,6 +15,8 @@\n \n #include <jpeglib.h>\n \n+#include \"thumbnailer.h\"\n+\n class EncoderLibJpeg : public Encoder\n {\n public:\n@@ -26,15 +28,27 @@ public:\n \t\t libcamera::Span<uint8_t> destination,\n \t\t libcamera::Span<const uint8_t> exifData,\n \t\t unsigned int quality) override;\n+\tint generateThumbnail(\n+\t\t\tconst libcamera::FrameBuffer &source,\n+\t\t\tconst libcamera::Size &targetSize,\n+\t\t\tunsigned int quality,\n+\t\t\tstd::vector<unsigned char> *thumbnail) override;\n+\n+private:\n+\tint configureEncoder(libcamera::PixelFormat pixelFormat,\n+\t\t\t libcamera::Size size);\n+\n \tint encode(const std::vector<libcamera::Span<uint8_t>> &planes,\n \t\t libcamera::Span<uint8_t> destination,\n \t\t libcamera::Span<const uint8_t> exifData,\n \t\t unsigned int quality);\n \n-private:\n \tvoid compressRGB(const std::vector<libcamera::Span<uint8_t>> &planes);\n \tvoid compressNV(const std::vector<libcamera::Span<uint8_t>> &planes);\n \n+\tlibcamera::PixelFormat pixelFormat_;\n+\tlibcamera::Size size_;\n+\n \tstruct jpeg_compress_struct compress_;\n \tstruct jpeg_error_mgr jerr_;\n \n@@ -42,4 +56,6 @@ private:\n \n \tbool nv_;\n \tbool nvSwap_;\n+\n+\tThumbnailer thumbnailer_;\n };\ndiff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex d72ebc3c..332ce1ca 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -44,60 +44,11 @@ int PostProcessorJpeg::configure(const StreamConfiguration &inCfg,\n \n \tstreamSize_ = outCfg.size;\n \n-\tthumbnailer_.configure(inCfg.size, inCfg.pixelFormat);\n-\n \tencoder_ = std::make_unique<EncoderLibJpeg>();\n \n \treturn encoder_->configure(inCfg);\n }\n \n-void PostProcessorJpeg::generateThumbnail(const FrameBuffer &source,\n-\t\t\t\t\t const Size &targetSize,\n-\t\t\t\t\t unsigned int quality,\n-\t\t\t\t\t std::vector<unsigned char> *thumbnail)\n-{\n-\t/* Stores the raw scaled-down thumbnail bytes. */\n-\tstd::vector<unsigned char> rawThumbnail;\n-\n-\tthumbnailer_.createThumbnail(source, targetSize, &rawThumbnail);\n-\n-\tStreamConfiguration thCfg;\n-\tthCfg.size = targetSize;\n-\tthCfg.pixelFormat = thumbnailer_.pixelFormat();\n-\tint ret = thumbnailEncoder_.configure(thCfg);\n-\n-\tif (!rawThumbnail.empty() && !ret) {\n-\t\t/*\n-\t\t * \\todo Avoid value-initialization of all elements of the\n-\t\t * vector.\n-\t\t */\n-\t\tthumbnail->resize(rawThumbnail.size());\n-\n-\t\t/*\n-\t\t * Split planes manually as the encoder expects a vector of\n-\t\t * planes.\n-\t\t *\n-\t\t * \\todo Pass a vector of planes directly to\n-\t\t * Thumbnailer::createThumbnailer above and remove the manual\n-\t\t * planes split from here.\n-\t\t */\n-\t\tstd::vector<Span<uint8_t>> thumbnailPlanes;\n-\t\tconst PixelFormatInfo &formatNV12 = PixelFormatInfo::info(formats::NV12);\n-\t\tsize_t yPlaneSize = formatNV12.planeSize(targetSize, 0);\n-\t\tsize_t uvPlaneSize = formatNV12.planeSize(targetSize, 1);\n-\t\tthumbnailPlanes.push_back({ rawThumbnail.data(), yPlaneSize });\n-\t\tthumbnailPlanes.push_back({ rawThumbnail.data() + yPlaneSize, uvPlaneSize });\n-\n-\t\tint jpeg_size = thumbnailEncoder_.encode(thumbnailPlanes,\n-\t\t\t\t\t\t\t *thumbnail, {}, quality);\n-\t\tthumbnail->resize(jpeg_size);\n-\n-\t\tLOG(JPEG, Debug)\n-\t\t\t<< \"Thumbnail compress returned \"\n-\t\t\t<< jpeg_size << \" bytes\";\n-\t}\n-}\n-\n void PostProcessorJpeg::process(Camera3RequestDescriptor::StreamBuffer *streamBuffer)\n {\n \tASSERT(encoder_);\n@@ -164,8 +115,9 @@ void PostProcessorJpeg::process(Camera3RequestDescriptor::StreamBuffer *streamBu\n \n \t\tif (thumbnailSize != Size(0, 0)) {\n \t\t\tstd::vector<unsigned char> thumbnail;\n-\t\t\tgenerateThumbnail(source, thumbnailSize, quality, &thumbnail);\n-\t\t\tif (!thumbnail.empty())\n+\t\t\tret = encoder_->generateThumbnail(source,\n+\t\t\t\t\tthumbnailSize, quality, &thumbnail);\n+\t\t\tif (ret > 0 && !thumbnail.empty())\n \t\t\t\texif.setThumbnail(thumbnail, Exif::Compression::JPEG);\n \t\t}\n \ndiff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\nindex 98309b01..55b23d7d 100644\n--- a/src/android/jpeg/post_processor_jpeg.h\n+++ b/src/android/jpeg/post_processor_jpeg.h\n@@ -8,11 +8,11 @@\n #pragma once\n \n #include \"../post_processor.h\"\n-#include \"encoder_libjpeg.h\"\n-#include \"thumbnailer.h\"\n \n #include <libcamera/geometry.h>\n \n+#include \"encoder.h\"\n+\n class CameraDevice;\n \n class PostProcessorJpeg : public PostProcessor\n@@ -25,14 +25,7 @@ public:\n \tvoid process(Camera3RequestDescriptor::StreamBuffer *streamBuffer) override;\n \n private:\n-\tvoid 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);\n-\n \tCameraDevice *const cameraDevice_;\n \tstd::unique_ptr<Encoder> encoder_;\n \tlibcamera::Size streamSize_;\n-\tEncoderLibJpeg thumbnailEncoder_;\n-\tThumbnailer thumbnailer_;\n };\n", "prefixes": [ "libcamera-devel", "v4", "4/6" ] }