{"id":10973,"url":"https://patchwork.libcamera.org/api/1.1/patches/10973/?format=json","web_url":"https://patchwork.libcamera.org/patch/10973/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210123051704.188117-9-paul.elder@ideasonboard.com>","date":"2021-01-23T05:17:04","name":"[libcamera-devel,v3,8/8] android: jpeg: Set thumbnail and JPEG quality based on request","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1620d3dfc01a37de4fc30a183e56ff66a3db7cfa","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/10973/mbox/","series":[{"id":1601,"url":"https://patchwork.libcamera.org/api/1.1/series/1601/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1601","date":"2021-01-23T05:16:56","name":"Fill in android result metadata and EXIF tabs","version":3,"mbox":"https://patchwork.libcamera.org/series/1601/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10973/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10973/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 1D3A6C0F2B\n\tfor ;\n\tSat, 23 Jan 2021 05:17:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DC20668299;\n\tSat, 23 Jan 2021 06:17:32 +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 3E0716030D\n\tfor ;\n\tSat, 23 Jan 2021 06:17:31 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BA2248AE;\n\tSat, 23 Jan 2021 06:17:29 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"NYjY3wlL\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611379051;\n\tbh=K/tNt6KCTzoXKlUi/gogGUCIiPV4o0yos9fdSEz8YUs=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=NYjY3wlLCdKZGEyyYdgcfGWMJYXgSvbT6KF02VYH7QUSoeZ08whx++TGTy7FAAHTP\n\tC/x/5gpsqq/PCT9eeCy8hDCiHiQRupEMbIhTYspdDKWh/1eEjcUEmgyJSieQu3wHd9\n\tOYnzsawoaPMLyKY/HANogmPCqAAvDxtbS3JnZ/jY=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 23 Jan 2021 14:17:04 +0900","Message-Id":"<20210123051704.188117-9-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210123051704.188117-1-paul.elder@ideasonboard.com>","References":"<20210123051704.188117-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 8/8] android: jpeg: Set thumbnail and\n\tJPEG quality based on request","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Set the thumbnail quality and the JPEG quality based on the android\nrequest metadata.\n\nSigned-off-by: Paul Elder \n\n---\nNew in v3\n---\n src/android/jpeg/encoder.h | 3 ++-\n src/android/jpeg/encoder_libjpeg.cpp | 10 +++++-----\n src/android/jpeg/encoder_libjpeg.h | 8 ++++----\n src/android/jpeg/post_processor_jpeg.cpp | 25 ++++++++++++------------\n src/android/jpeg/post_processor_jpeg.h | 1 +\n 5 files changed, 25 insertions(+), 22 deletions(-)","diff":"diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\nindex 027233dc..8d449369 100644\n--- a/src/android/jpeg/encoder.h\n+++ b/src/android/jpeg/encoder.h\n@@ -19,7 +19,8 @@ public:\n \tvirtual int configure(const libcamera::StreamConfiguration &cfg) = 0;\n \tvirtual int encode(const libcamera::FrameBuffer &source,\n \t\t\t libcamera::Span destination,\n-\t\t\t libcamera::Span exifData) = 0;\n+\t\t\t libcamera::Span exifData,\n+\t\t\t unsigned int quality) = 0;\n };\n \n #endif /* __ANDROID_JPEG_ENCODER_H__ */\ndiff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\nindex aed919b9..f006e1d1 100644\n--- a/src/android/jpeg/encoder_libjpeg.cpp\n+++ b/src/android/jpeg/encoder_libjpeg.cpp\n@@ -68,7 +68,6 @@ const struct JPEGPixelFormatInfo &findPixelInfo(const PixelFormat &format)\n } /* namespace */\n \n EncoderLibJpeg::EncoderLibJpeg()\n-\t: quality_(95)\n {\n \t/* \\todo Expand error handling coverage with a custom handler. */\n \tcompress_.err = jpeg_std_error(&jerr_);\n@@ -94,7 +93,6 @@ int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n \tcompress_.input_components = info.colorSpace == JCS_GRAYSCALE ? 1 : 3;\n \n \tjpeg_set_defaults(&compress_);\n-\tjpeg_set_quality(&compress_, quality_, TRUE);\n \n \tpixelFormatInfo_ = &info.pixelFormatInfo;\n \n@@ -180,7 +178,7 @@ void EncoderLibJpeg::compressNV(Span frame)\n }\n \n int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest,\n-\t\t\t Span exifData)\n+\t\t\t Span exifData, unsigned int quality)\n {\n \tMappedFrameBuffer frame(&source, PROT_READ);\n \tif (!frame.isValid()) {\n@@ -189,15 +187,17 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest,\n \t\treturn frame.error();\n \t}\n \n-\treturn encode(frame.maps()[0], dest, exifData);\n+\treturn encode(frame.maps()[0], dest, exifData, quality);\n }\n \n int EncoderLibJpeg::encode(Span src, Span dest,\n-\t\t\t Span exifData)\n+\t\t\t Span exifData, unsigned int quality)\n {\n \tunsigned char *destination = dest.data();\n \tunsigned long size = dest.size();\n \n+\tjpeg_set_quality(&compress_, quality, TRUE);\n+\n \t/*\n \t * The jpeg_mem_dest will reallocate if the required size is not\n \t * sufficient. That means the output won't be written to the correct\ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 070f56f8..838da772 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -23,10 +23,12 @@ public:\n \tint configure(const libcamera::StreamConfiguration &cfg) override;\n \tint encode(const libcamera::FrameBuffer &source,\n \t\t libcamera::Span destination,\n-\t\t libcamera::Span exifData) override;\n+\t\t libcamera::Span exifData,\n+\t\t unsigned int quality) override;\n \tint encode(libcamera::Span source,\n \t\t libcamera::Span destination,\n-\t\t libcamera::Span exifData);\n+\t\t libcamera::Span exifData,\n+\t\t unsigned int quality);\n \n private:\n \tvoid compressRGB(libcamera::Span frame);\n@@ -35,8 +37,6 @@ private:\n \tstruct jpeg_compress_struct compress_;\n \tstruct jpeg_error_mgr jerr_;\n \n-\tunsigned int quality_;\n-\n \tconst libcamera::PixelFormatInfo *pixelFormatInfo_;\n \n \tbool nv_;\ndiff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex e5e42d39..8b1801b9 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -49,6 +49,7 @@ int PostProcessorJpeg::configure(const StreamConfiguration &inCfg,\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 *thumbnail)\n {\n \t/* Stores the raw scaled-down thumbnail bytes. */\n@@ -69,7 +70,7 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer &source,\n \t\tthumbnail->resize(rawThumbnail.size());\n \n \t\tint jpeg_size = thumbnailEncoder_.encode(rawThumbnail,\n-\t\t\t\t\t\t\t *thumbnail, {});\n+\t\t\t\t\t\t\t *thumbnail, {}, quality);\n \t\tthumbnail->resize(jpeg_size);\n \n \t\tLOG(JPEG, Debug)\n@@ -131,19 +132,20 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n \t\tSize thumbnailSize = { static_cast(data[0]),\n \t\t\t\t static_cast(data[1]) };\n \n+\t\tret = requestMetadata.getEntry(ANDROID_JPEG_THUMBNAIL_QUALITY, &entry);\n+\t\tif (ret)\n+\t\t\tresultMetadata->addEntry(ANDROID_JPEG_THUMBNAIL_QUALITY, entry.data.u8, 1);\n+\n \t\tif (thumbnailSize != Size(0, 0)) {\n \t\t\tstd::vector thumbnail;\n-\t\t\tgenerateThumbnail(source, thumbnailSize, &thumbnail);\n+\t\t\tgenerateThumbnail(source, thumbnailSize,\n+\t\t\t\t\t ret ? *entry.data.u8 : 95, &thumbnail);\n \t\t\tif (!thumbnail.empty())\n \t\t\t\texif.setThumbnail(thumbnail, Exif::Compression::JPEG);\n \t\t}\n \n \t\tresultMetadata->addEntry(ANDROID_JPEG_THUMBNAIL_SIZE, data, 2);\n \n-\t\t/* \\todo Use this quality as a parameter to the encoder */\n-\t\tret = requestMetadata.getEntry(ANDROID_JPEG_THUMBNAIL_QUALITY, &entry);\n-\t\tif (ret)\n-\t\t\tresultMetadata->addEntry(ANDROID_JPEG_THUMBNAIL_QUALITY, entry.data.u8, 1);\n \t}\n \n \tret = requestMetadata.getEntry(ANDROID_JPEG_GPS_COORDINATES, &entry);\n@@ -164,7 +166,11 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n \tif (exif.generate() != 0)\n \t\tLOG(JPEG, Error) << \"Failed to generate valid EXIF data\";\n \n-\tint jpeg_size = encoder_->encode(source, destination, exif.data());\n+\tret = requestMetadata.getEntry(ANDROID_JPEG_QUALITY, &entry);\n+\tconst uint32_t jpeg_quality = ret ? *entry.data.u8 : 95;\n+\tresultMetadata->addEntry(ANDROID_JPEG_QUALITY, &jpeg_quality, 1);\n+\n+\tint jpeg_size = encoder_->encode(source, destination, exif.data(), jpeg_quality);\n \tif (jpeg_size < 0) {\n \t\tLOG(JPEG, Error) << \"Failed to encode stream image\";\n \t\treturn jpeg_size;\n@@ -192,10 +198,5 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n \t/* Update the JPEG result Metadata. */\n \tresultMetadata->addEntry(ANDROID_JPEG_SIZE, &jpeg_size, 1);\n \n-\t/* \\todo Configure JPEG encoder with this */\n-\tret = requestMetadata.getEntry(ANDROID_JPEG_QUALITY, &entry);\n-\tconst uint32_t jpeg_quality = ret ? *entry.data.u8 : 95;\n-\tresultMetadata->addEntry(ANDROID_JPEG_QUALITY, &jpeg_quality, 1);\n-\n \treturn 0;\n }\ndiff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\nindex 660b79b4..d2dfa450 100644\n--- a/src/android/jpeg/post_processor_jpeg.h\n+++ b/src/android/jpeg/post_processor_jpeg.h\n@@ -32,6 +32,7 @@ public:\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 *thumbnail);\n \n \tCameraDevice *const cameraDevice_;\n","prefixes":["libcamera-devel","v3","8/8"]}