[{"id":14666,"web_url":"https://patchwork.libcamera.org/comment/14666/","msgid":"","date":"2021-01-21T20:36:43","subject":"Re: [libcamera-devel] [PATCH v2 6/9] android: jpeg: Factor out\n\tthumbnailer configuration","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Thu, Jan 21, 2021 at 07:15:46PM +0900, Paul Elder wrote:\n> Move configuration of the thumbnailer into a function so that it can be\n> called later in post-processing if a different size thumbnail is\n> requested.\n> \n> Signed-off-by: Paul Elder \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> New 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(-)\n> \n> diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> index 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> \n> diff --git a/src/android/jpeg/post_processor_jpeg.h b/src/android/jpeg/post_processor_jpeg.h\n> index 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_;\n> diff --git a/src/android/jpeg/thumbnailer.h b/src/android/jpeg/thumbnailer.h\n> index 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;","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 7F1FEC0F2A\n\tfor ;\n\tThu, 21 Jan 2021 20:37:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C83F668216;\n\tThu, 21 Jan 2021 21:37:02 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 91A5968204\n\tfor ;\n\tThu, 21 Jan 2021 21:37:01 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1259C50E;\n\tThu, 21 Jan 2021 21:37:00 +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=\"JGDPDHNI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611261421;\n\tbh=WrEDLEmfOleauQjsPn3NENHuA7rXg7O0yogQoBnzscE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=JGDPDHNIZ48XvSCs8j18vMT1NB9Bhb9hv333jK9QixTTiLSlN2zzRC7n9j7AeG5MH\n\toeENK1HWm7PHJaJihnTy56nCyucXA+qT1D7koJ19MhKaUy0wonZmPBjGknf9azVdpr\n\tUKClPeqnc99NA9paNmLl5oFb18L5QafBHF8ntPag=","Date":"Thu, 21 Jan 2021 22:36:43 +0200","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"","References":"<20210121101549.134574-1-paul.elder@ideasonboard.com>\n\t<20210121101549.134574-7-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210121101549.134574-7-paul.elder@ideasonboard.com>","Subject":"Re: [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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]