{"id":10918,"url":"https://patchwork.libcamera.org/api/patches/10918/?format=json","web_url":"https://patchwork.libcamera.org/patch/10918/","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":"<20210121101549.134574-7-paul.elder@ideasonboard.com>","date":"2021-01-21T10:15:46","name":"[libcamera-devel,v2,6/9] android: jpeg: Factor out thumbnailer configuration","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"961a09de45c96f03ee950030b13843369cf1c7b8","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/10918/mbox/","series":[{"id":1590,"url":"https://patchwork.libcamera.org/api/series/1590/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1590","date":"2021-01-21T10:15:40","name":"Fill in android result metadata and EXIF tags","version":2,"mbox":"https://patchwork.libcamera.org/series/1590/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10918/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10918/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 4614AC0F2A\n\tfor ;\n\tThu, 21 Jan 2021 10:16:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0E3F1681DB;\n\tThu, 21 Jan 2021 11:16:15 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 86728681BF\n\tfor ;\n\tThu, 21 Jan 2021 11:16:13 +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 1317250E;\n\tThu, 21 Jan 2021 11:16:11 +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=\"f1kl0s6Z\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611224173;\n\tbh=F/tN+HFLOCrpsc36gpPO2GSxl8oIkGUu1Uzx1eMt0PY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=f1kl0s6Zy4ubzYKguFA0mr5PrcncH/gh3n86GvjdwI+t1MN+ZVeBIeTADVVlM14oc\n\tpxGKCytpozv1ADx1L7gxXaX+f8DQ685bCyR+x7JYfCWirdz7korpButL+OylA1Qv+5\n\t0ogRSVp7/1RrquzXIfmhDNC++M4fzVsUjz4ooGdc=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 21 Jan 2021 19:15:46 +0900","Message-Id":"<20210121101549.134574-7-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210121101549.134574-1-paul.elder@ideasonboard.com>","References":"<20210121101549.134574-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 6/9] android: jpeg: Factor out\n\tthumbnailer configuration","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":"Move configuration of the thumbnailer into a function so that it can be\ncalled later in post-processing if a different size thumbnail is\nrequested.\n\nSigned-off-by: Paul Elder \n\n---\nNew in v2\n---\n src/android/jpeg/post_processor_jpeg.cpp | 26 ++++++++++++++++--------\n src/android/jpeg/post_processor_jpeg.h | 2 ++\n src/android/jpeg/thumbnailer.h | 1 +\n 3 files changed, 21 insertions(+), 8 deletions(-)","diff":"diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex 436a50f8..0c1226ad 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -25,6 +25,21 @@ PostProcessorJpeg::PostProcessorJpeg(CameraDevice *const device)\n {\n }\n \n+int PostProcessorJpeg::configureThumbnailer(const Size &size,\n+\t\t\t\t\t const PixelFormat &pixelFormat)\n+{\n+\tthumbnailer_.configure(size, pixelFormat);\n+\tStreamConfiguration thCfg;\n+\tthCfg.size = thumbnailer_.size();\n+\tthCfg.pixelFormat = pixelFormat;\n+\tif (thumbnailEncoder_.configure(thCfg) != 0) {\n+\t\tLOG(JPEG, Error) << \"Failed to configure thumbnail encoder\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n int PostProcessorJpeg::configure(const StreamConfiguration &inCfg,\n \t\t\t\t const StreamConfiguration &outCfg)\n {\n@@ -40,16 +55,11 @@ int PostProcessorJpeg::configure(const StreamConfiguration &inCfg,\n \n \tstreamSize_ = outCfg.size;\n \n-\tthumbnailer_.configure(inCfg.size, inCfg.pixelFormat);\n-\tStreamConfiguration thCfg = inCfg;\n-\tthCfg.size = thumbnailer_.size();\n-\tif (thumbnailEncoder_.configure(thCfg) != 0) {\n-\t\tLOG(JPEG, Error) << \"Failed to configure thumbnail encoder\";\n-\t\treturn -EINVAL;\n-\t}\n+\tint ret = configureThumbnailer(inCfg.size, inCfg.pixelFormat);\n+\tif (ret)\n+\t\treturn ret;\n \n \tencoder_ = std::make_unique();\n-\n \treturn encoder_->configure(inCfg);\n }\n \ndiff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\nindex 5afa831c..c545c29c 100644\n--- a/src/android/jpeg/post_processor_jpeg.h\n+++ b/src/android/jpeg/post_processor_jpeg.h\n@@ -31,6 +31,8 @@ public:\n private:\n \tvoid generateThumbnail(const libcamera::FrameBuffer &source,\n \t\t\t std::vector *thumbnail);\n+\tint configureThumbnailer(const libcamera::Size &size,\n+\t\t\t\t const libcamera::PixelFormat &pixelFormat);\n \n \tCameraDevice *const cameraDevice_;\n \tstd::unique_ptr encoder_;\ndiff --git a/src/android/jpeg/thumbnailer.h b/src/android/jpeg/thumbnailer.h\nindex 98f11833..f393db47 100644\n--- a/src/android/jpeg/thumbnailer.h\n+++ b/src/android/jpeg/thumbnailer.h\n@@ -22,6 +22,7 @@ public:\n \tvoid createThumbnail(const libcamera::FrameBuffer &source,\n \t\t\t std::vector *dest);\n \tconst libcamera::Size &size() const { return targetSize_; }\n+\tconst libcamera::PixelFormat &pixelFormat() const { return pixelFormat_; }\n \n private:\n \tlibcamera::Size computeThumbnailSize() const;\n","prefixes":["libcamera-devel","v2","6/9"]}