{"id":18005,"url":"https://patchwork.libcamera.org/api/patches/18005/?format=json","web_url":"https://patchwork.libcamera.org/patch/18005/","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":"<20221214093330.3345421-5-chenghaoyang@google.com>","date":"2022-12-14T09:33:27","name":"[libcamera-devel,v8,4/7] Add an internal Encoder class in EncoderLibJpeg","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2147439d53cf3a683d25070bcd963435920ce825","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18005/mbox/","series":[{"id":3671,"url":"https://patchwork.libcamera.org/api/series/3671/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3671","date":"2022-12-14T09:33:23","name":"Add CrOS JEA implementation","version":8,"mbox":"https://patchwork.libcamera.org/series/3671/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18005/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18005/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 B5257BDE6B\n\tfor ;\n\tWed, 14 Dec 2022 09:33:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6D1466336B;\n\tWed, 14 Dec 2022 10:33:44 +0100 (CET)","from mail-pg1-x536.google.com (mail-pg1-x536.google.com\n\t[IPv6:2607:f8b0:4864:20::536])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B2B1B63354\n\tfor ;\n\tWed, 14 Dec 2022 10:33:41 +0100 (CET)","by mail-pg1-x536.google.com with SMTP id f3so1598806pgc.2\n\tfor ;\n\tWed, 14 Dec 2022 01:33:41 -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\td206-20020a621dd7000000b0056bc742d21esm9331190pfd.176.2022.12.14.01.33.38\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 14 Dec 2022 01:33:39 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1671010424;\n\tbh=daXYMF8pm6qgpBdXIabLGjj0pOsp/unPaaChNbMmp3o=;\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=ddyb+pM5G/0A4BkMU6EZtak0hScDDjkGzHhEn4r9PcawtG5vC6B35+7GIUQqxdN6h\n\tZvwS52nQC7D9t8zRpi0yNcAK7YJF+LC6/JX9NiKcvlk09Kwya34IwrxcUXw+ru125F\n\tA1Y1cSAX/kd2aDLR8U2AkkI+I/qeAsKKqHpimFvHf9+3Cr3Axs+rmC5cbJNF5dy2es\n\tnccj/nhZZJOWzfmX/NH05BP+ZO9UCPN35I1nf4QE1IEPWvqdfbBTKMoG9HWXpA58iT\n\tpHEWpBBMuexrR02E8RLvSht+eC6Dt4rs0TGyX6wZ0IiZnycxTnsY0BUzieFV1iy5SF\n\t9ssSszdL8IQrg==","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=eGDdbiTIZndt734ffHSG72L0rpNEhdtkKxEhG+F6B38=;\n\tb=ATUdldNIv68absLXrWuDaXkMNa1f8yOKOTbFKjP5nwmg/Wqz1hfAF1YVQHdjlfdRr8\n\tCCTnrsUifwiomIQQlR8Osrr6eSY/VQdDCOPAaYvjmUt/wCtGhDUF0UKYsqKsZsliuzdY\n\tWKC3YQDii/NJVu6agSc5PukFUYjOlr9e5x/iY="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"ATUdldNI\"; \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=eGDdbiTIZndt734ffHSG72L0rpNEhdtkKxEhG+F6B38=;\n\tb=x38k/mYtioghElDIVg9FnYKhdoLInqBELufsTYxbUEoi+klSkxcN5Y3og1PLK4pdBz\n\tHRUGeJENBqfbW38LvWZkvIAu4k65EBp6ueMV6ppKJQ+SbHJG+dbF6nX8f7RNIxugQoeB\n\t7JWM/D3O/LaNyvI7y9z1WnJNFpAKkPtw7evI0vQl2bPVu15JSST90zd/ZzK6s1jj/ayt\n\tFUYZrBjXgZ6rUqqpVzxjUD1yMJc4pk83Di9lkNSmXtNxMM2nxlmkSb9UkXUPJT4SWjD6\n\tw/orZ1az9BQ78buh+D1V4aegwwwsxujOMh3exfpUTGipBEbziHtUdtvaPovwSxOsNqip\n\tBwmg==","X-Gm-Message-State":"ANoB5pnB9KpwHJocuz/EfQdyZkOv1CY0sV5jZX1WcEsKi+FuwFD+at1z\n\tlMLdc5VT7TagAcsWCCddcJ7zeo2BIrHx8/rd","X-Google-Smtp-Source":"AA0mqf70udHcMvwEfFN0MZzWOv/aym16pqd+VxKJ+SWPVXtQO6u64eU9CsSGxzVVJzaFtnsKeWcpxA==","X-Received":"by 2002:a05:6a00:1912:b0:56b:ca7a:2de2 with SMTP id\n\ty18-20020a056a00191200b0056bca7a2de2mr28662939pfi.14.1671010419609; \n\tWed, 14 Dec 2022 01:33:39 -0800 (PST)","X-Google-Original-From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 14 Dec 2022 09:33:27 +0000","Message-Id":"<20221214093330.3345421-5-chenghaoyang@google.com>","X-Mailer":"git-send-email 2.39.0.rc1.256.g54fd8350bd-goog","In-Reply-To":"<20221214093330.3345421-1-chenghaoyang@google.com>","References":"<20221214093330.3345421-1-chenghaoyang@google.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v8 4/7] Add an internal Encoder class in\n\tEncoderLibJpeg","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":"Harvey Yang via libcamera-devel ","Reply-To":"Harvey Yang ","Cc":"Harvey Yang ,\n\tHarvey Yang ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"To move the thumbnail encoder into EncoderLibJpeg in the following\npatch, this patch adds a wrapper/internal Encoder class that allows\nEncoderLibJpeg to have more than one encoder to tackle both captures\nand thumbnails.\n\nSigned-off-by: Harvey Yang \n---\n src/android/jpeg/encoder_libjpeg.cpp | 32 +++++++++++++++++++++-------\n src/android/jpeg/encoder_libjpeg.h | 30 ++++++++++++++++++++------\n 2 files changed, 47 insertions(+), 15 deletions(-)","diff":"diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\nindex fd62bd9c..d849547f 100644\n--- a/src/android/jpeg/encoder_libjpeg.cpp\n+++ b/src/android/jpeg/encoder_libjpeg.cpp\n@@ -68,7 +68,16 @@ const struct JPEGPixelFormatInfo &findPixelInfo(const PixelFormat &format)\n \n } /* namespace */\n \n-EncoderLibJpeg::EncoderLibJpeg()\n+EncoderLibJpeg::EncoderLibJpeg() = default;\n+\n+EncoderLibJpeg::~EncoderLibJpeg() = default;\n+\n+int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n+{\n+\treturn encoder_.configure(cfg);\n+}\n+\n+EncoderLibJpeg::Encoder::Encoder()\n {\n \t/* \\todo Expand error handling coverage with a custom handler. */\n \tcompress_.err = jpeg_std_error(&jerr_);\n@@ -76,12 +85,12 @@ EncoderLibJpeg::EncoderLibJpeg()\n \tjpeg_create_compress(&compress_);\n }\n \n-EncoderLibJpeg::~EncoderLibJpeg()\n+EncoderLibJpeg::Encoder::~Encoder()\n {\n \tjpeg_destroy_compress(&compress_);\n }\n \n-int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n+int EncoderLibJpeg::Encoder::configure(const StreamConfiguration &cfg)\n {\n \tconst struct JPEGPixelFormatInfo info = findPixelInfo(cfg.pixelFormat);\n \tif (info.colorSpace == JCS_UNKNOWN)\n@@ -103,7 +112,7 @@ int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n \treturn 0;\n }\n \n-void EncoderLibJpeg::compressRGB(const std::vector> &planes)\n+void EncoderLibJpeg::Encoder::compressRGB(const std::vector> &planes)\n {\n \tunsigned char *src = const_cast(planes[0].data());\n \t/* \\todo Stride information should come from buffer configuration. */\n@@ -121,7 +130,7 @@ void EncoderLibJpeg::compressRGB(const std::vector> &planes)\n * Compress the incoming buffer from a supported NV format.\n * This naively unpacks the semi-planar NV12 to a YUV888 format for libjpeg.\n */\n-void EncoderLibJpeg::compressNV(const std::vector> &planes)\n+void EncoderLibJpeg::Encoder::compressNV(const std::vector> &planes)\n {\n \tuint8_t tmprowbuf[compress_.image_width * 3];\n \n@@ -188,12 +197,19 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest,\n \t\treturn frame.error();\n \t}\n \n-\treturn encode(frame.planes(), dest, exifData, quality);\n+\treturn encoder_.encode(frame.planes(), dest, exifData, quality);\n }\n \n int EncoderLibJpeg::encode(const std::vector> &src,\n-\t\t\t Span dest, Span exifData,\n-\t\t\t unsigned int quality)\n+\t\t\t\t Span dest, Span exifData,\n+\t\t\t\t unsigned int quality)\n+{\n+\treturn encoder_.encode(src, std::move(dest), std::move(exifData), quality);\n+}\n+\n+int EncoderLibJpeg::Encoder::encode(const std::vector> &src,\n+\t\t\t\t Span dest, Span exifData,\n+\t\t\t\t unsigned int quality)\n {\n \tunsigned char *destination = dest.data();\n \tunsigned long size = dest.size();\ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 1b3ac067..97182b96 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -32,14 +32,30 @@ public:\n \t\t unsigned int quality);\n \n private:\n-\tvoid compressRGB(const std::vector> &planes);\n-\tvoid compressNV(const std::vector> &planes);\n+\tclass Encoder\n+\t{\n+\tpublic:\n+\t\tEncoder();\n+\t\t~Encoder();\n \n-\tstruct jpeg_compress_struct compress_;\n-\tstruct jpeg_error_mgr jerr_;\n+\t\tint encode(const std::vector> &planes,\n+\t\t\t libcamera::Span destination,\n+\t\t\t libcamera::Span exifData,\n+\t\t\t unsigned int quality);\n+\t\tint configure(const libcamera::StreamConfiguration &cfg);\n \n-\tconst libcamera::PixelFormatInfo *pixelFormatInfo_;\n+\tprivate:\n+\t\tvoid compressRGB(const std::vector> &planes);\n+\t\tvoid compressNV(const std::vector> &planes);\n \n-\tbool nv_;\n-\tbool nvSwap_;\n+\t\tstruct jpeg_compress_struct compress_;\n+\t\tstruct jpeg_error_mgr jerr_;\n+\n+\t\tconst libcamera::PixelFormatInfo *pixelFormatInfo_;\n+\n+\t\tbool nv_;\n+\t\tbool nvSwap_;\n+\t};\n+\n+\tEncoder encoder_;\n };\n","prefixes":["libcamera-devel","v8","4/7"]}