[{"id":24836,"web_url":"https://patchwork.libcamera.org/comment/24836/","msgid":"<53ed064e-3376-aee5-3f6d-a3bd3004d866@ideasonboard.com>","date":"2022-08-30T10:43:44","subject":"Re: [libcamera-devel] [PATCH 2/3] qcam: Pass color space to\n\tViewFinder::setFormat()","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Laurent,\n\nThank you for the patch.\n\nOn 8/29/22 3:34 PM, Laurent Pinchart via libcamera-devel wrote:\n> To prepare for color space support in the viewfinder, pass the color\n> space to the setFormat() function.\n>\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/qcam/main_window.cpp | 6 +++++-\n> src/qcam/viewfinder.h | 2 ++\n> src/qcam/viewfinder_gl.cpp | 5 +++--\n> src/qcam/viewfinder_gl.h | 1 +\n> src/qcam/viewfinder_qt.cpp | 5 +++--\n> src/qcam/viewfinder_qt.h | 1 +\n> 6 files changed, 15 insertions(+), 5 deletions(-)\n>\n> diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\n> index 7433d647e8a0..addf0d96daf4 100644\n> --- a/src/qcam/main_window.cpp\n> +++ b/src/qcam/main_window.cpp\n> @@ -447,9 +447,13 @@ int MainWindow::startCapture()\n> \telse\n> \t\trawStream_ = nullptr;\n> \n> -\t/* Configure the viewfinder. */\n> +\t/*\n> +\t * Configure the viewfinder. If no color space is reported, default to\n> +\t * sYCC.\n> +\t */\n\nIf there's a mismatch between the pixelformat and sYCC default, we can \nbe sure - it will be adjusted accordingly, provided we will have logic \nfor adjustment merged in.. soonish.\n\nGood to see..\n\nReviewed-by: Umang Jain \n> \tret = viewfinder_->setFormat(vfConfig.pixelFormat,\n> \t\t\t\t QSize(vfConfig.size.width, vfConfig.size.height),\n> +\t\t\t\t vfConfig.colorSpace.value_or(ColorSpace::Sycc),\n> \t\t\t\t vfConfig.stride);\n> \tif (ret < 0) {\n> \t\tqInfo() << \"Failed to set viewfinder format\";\n> diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\n> index 260074aed440..a57446e85951 100644\n> --- a/src/qcam/viewfinder.h\n> +++ b/src/qcam/viewfinder.h\n> @@ -11,6 +11,7 @@\n> #include \n> #include \n> \n> +#include \n> #include \n> #include \n> \n> @@ -24,6 +25,7 @@ public:\n> \tvirtual const QList &nativeFormats() const = 0;\n> \n> \tvirtual int setFormat(const libcamera::PixelFormat &format, const QSize &size,\n> +\t\t\t const libcamera::ColorSpace &colorSpace,\n> \t\t\t unsigned int stride) = 0;\n> \tvirtual void render(libcamera::FrameBuffer *buffer, Image *image) = 0;\n> \tvirtual void stop() = 0;\n> diff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\n> index 3ae8b03accb5..ec295b6de0dd 100644\n> --- a/src/qcam/viewfinder_gl.cpp\n> +++ b/src/qcam/viewfinder_gl.cpp\n> @@ -71,8 +71,9 @@ const QList &ViewFinderGL::nativeFormats() const\n> \treturn supportedFormats;\n> }\n> \n> -int ViewFinderGL::setFormat(const libcamera::PixelFormat &format,\n> -\t\t\t const QSize &size, unsigned int stride)\n> +int ViewFinderGL::setFormat(const libcamera::PixelFormat &format, const QSize &size,\n> +\t\t\t [[maybe_unused]] const libcamera::ColorSpace &colorSpace,\n> +\t\t\t unsigned int stride)\n> {\n> \tif (format != format_) {\n> \t\t/*\n> diff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\n> index 0a9275baf9b9..798830a31cd2 100644\n> --- a/src/qcam/viewfinder_gl.h\n> +++ b/src/qcam/viewfinder_gl.h\n> @@ -39,6 +39,7 @@ public:\n> \tconst QList &nativeFormats() const override;\n> \n> \tint setFormat(const libcamera::PixelFormat &format, const QSize &size,\n> +\t\t const libcamera::ColorSpace &colorSpace,\n> \t\t unsigned int stride) override;\n> \tvoid render(libcamera::FrameBuffer *buffer, Image *image) override;\n> \tvoid stop() override;\n> diff --git a/src/qcam/viewfinder_qt.cpp b/src/qcam/viewfinder_qt.cpp\n> index 7a6a60c96393..c20fd6bc8fc2 100644\n> --- a/src/qcam/viewfinder_qt.cpp\n> +++ b/src/qcam/viewfinder_qt.cpp\n> @@ -54,8 +54,9 @@ const QList &ViewFinderQt::nativeFormats() const\n> \treturn formats;\n> }\n> \n> -int ViewFinderQt::setFormat(const libcamera::PixelFormat &format,\n> -\t\t\t const QSize &size, unsigned int stride)\n> +int ViewFinderQt::setFormat(const libcamera::PixelFormat &format, const QSize &size,\n> +\t\t\t [[maybe_unused]] const libcamera::ColorSpace &colorSpace,\n> +\t\t\t unsigned int stride)\n> {\n> \timage_ = QImage();\n> \n> diff --git a/src/qcam/viewfinder_qt.h b/src/qcam/viewfinder_qt.h\n> index 8c62145211d1..eb3a99882d19 100644\n> --- a/src/qcam/viewfinder_qt.h\n> +++ b/src/qcam/viewfinder_qt.h\n> @@ -32,6 +32,7 @@ public:\n> \tconst QList &nativeFormats() const override;\n> \n> \tint setFormat(const libcamera::PixelFormat &format, const QSize &size,\n> +\t\t const libcamera::ColorSpace &colorSpace,\n> \t\t unsigned int stride) override;\n> \tvoid render(libcamera::FrameBuffer *buffer, Image *image) override;\n> \tvoid stop() override;","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 8CF8EC0DA4\n\tfor ;\n\tTue, 30 Aug 2022 10:43:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C0C8E61FBD;\n\tTue, 30 Aug 2022 12:43:53 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4F20561F9C\n\tfor ;\n\tTue, 30 Aug 2022 12:43:52 +0200 (CEST)","from [IPV6:2401:4900:1f3f:1548:78ac:4a3:edc3:c28a] (unknown\n\t[IPv6:2401:4900:1f3f:1548:78ac:4a3:edc3:c28a])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C8698481;\n\tTue, 30 Aug 2022 12:43:50 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1661856233;\n\tbh=2CxXxg9n6uU3rtPzU7Yub8v8XWHMJ+1sEQgyL+vtAhs=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=oa0lBq33BIIIdTLWCjragJD71nrYG9NZPO7xAUHujTRj+zy1LZHgVuiItc96R+XNF\n\ty8rgfWG4plOI6z8UsnPYsc8TYD+dcog3FjlYtlh23FFqWzH5ARCgPPcT52v1q2M1Rf\n\tf1ylaqkskab1NE7rZj3DmckudS6bm5zXpMWlVAixNVAOxyr5TYlVOLEOYsr9xaqBF2\n\tl3XeTIHfW5FupfYJ50iz2mL6fvbUwD5QBrMmVR+X6hqZ33C5cShIwWc69yOmIdkL+J\n\t4qUeCXbpuuzUXmJcL6ynPhdFTXazxl+AkWvet23oavx33Lkupe8YkMc3WUtO14OzeF\n\tfW/1XlJ/rDerA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1661856231;\n\tbh=2CxXxg9n6uU3rtPzU7Yub8v8XWHMJ+1sEQgyL+vtAhs=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=VgU8aa8GWzpQJWBc+CsHDx6RAQL7OM2CUd5kDnBREy1LEuu+b+DNOrE9BO2d1WD1K\n\t9SxZ82CMtbv2/TZQkfDOeuaKx+SH6b89bdOGhRUU1dlgvT+QGySgkSosT9IV5lYDTf\n\tw7Jz4+iklT2PxF2vILvJ3xGmbAT9Fo40W2spFYVQ="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"VgU8aa8G\"; dkim-atps=neutral","Message-ID":"<53ed064e-3376-aee5-3f6d-a3bd3004d866@ideasonboard.com>","Date":"Tue, 30 Aug 2022 16:13:44 +0530","MIME-Version":"1.0","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101\n\tThunderbird/91.12.0","Content-Language":"en-US","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20220829100414.28404-1-laurent.pinchart@ideasonboard.com>\n\t<20220829100414.28404-3-laurent.pinchart@ideasonboard.com>","In-Reply-To":"<20220829100414.28404-3-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 2/3] qcam: Pass color space to\n\tViewFinder::setFormat()","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":"Umang Jain via libcamera-devel ","Reply-To":"Umang Jain ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]