{"id":13626,"url":"https://patchwork.libcamera.org/api/1.1/patches/13626/?format=json","web_url":"https://patchwork.libcamera.org/patch/13626/","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":"<20210906020100.14430-28-laurent.pinchart@ideasonboard.com>","date":"2021-09-06T02:01:00","name":"[libcamera-devel,v2,27/27] qcam: viewfinder_qt: Support multi-planar buffers","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"775487a5e7305f5d2ddde2d290548b1a8b959512","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13626/mbox/","series":[{"id":2446,"url":"https://patchwork.libcamera.org/api/1.1/series/2446/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2446","date":"2021-09-06T02:00:33","name":"libcamera: Handle fallout of FrameBuffer offset support","version":2,"mbox":"https://patchwork.libcamera.org/series/2446/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13626/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13626/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 DE120C3255\n\tfor ;\n\tMon, 6 Sep 2021 02:01:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 65D9F6919A;\n\tMon, 6 Sep 2021 04:01:46 +0200 (CEST)","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 81AEB69168\n\tfor ;\n\tMon, 6 Sep 2021 04:01:31 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1B1EB8D7;\n\tMon, 6 Sep 2021 04:01:31 +0200 (CEST)"],"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=\"OXd8D5y0\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630893691;\n\tbh=nU44O2CRh0Z7L7TY3mzq8q94t1OYxvVKQ6Xr8p9WQGM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=OXd8D5y0tb/+SBQ0npZRv4wq3yG5ohcj9xjOduIxj7UxtVkd9whSVKHJmDQ7Me1F3\n\t2g/IbqhzFnZEq6MAwa38bG86FZOm4V/otcKu2Wo/jx70RX7pRYuoXMum1zOwbYXwbj\n\ttTicQOnKh6vm+aIw6Lp5basE4pNj2VqD66UUFdmc=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 6 Sep 2021 05:01:00 +0300","Message-Id":"<20210906020100.14430-28-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20210906020100.14430-1-laurent.pinchart@ideasonboard.com>","References":"<20210906020100.14430-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 27/27] qcam: viewfinder_qt: Support\n\tmulti-planar buffers","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Now that the ViewFinderQt receives an Image, move the Converter API to\ntake an Image as well, and enable multi-planar buffer support.\n\nSigned-off-by: Laurent Pinchart \n---\n src/qcam/format_converter.cpp | 18 +++++++++++-------\n src/qcam/format_converter.h | 9 +++++----\n src/qcam/viewfinder_qt.cpp | 14 +++++---------\n 3 files changed, 21 insertions(+), 20 deletions(-)","diff":"diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp\nindex 973966f6afc1..673ad33e141d 100644\n--- a/src/qcam/format_converter.cpp\n+++ b/src/qcam/format_converter.cpp\n@@ -13,6 +13,8 @@\n \n #include \n \n+#include \"../cam/image.h\"\n+\n #define RGBSHIFT\t\t8\n #ifndef MAX\n #define MAX(a,b)\t\t((a)>(b)?(a):(b))\n@@ -154,12 +156,11 @@ int FormatConverter::configure(const libcamera::PixelFormat &format,\n \treturn 0;\n }\n \n-void FormatConverter::convert(const unsigned char *src, size_t size,\n-\t\t\t QImage *dst)\n+void FormatConverter::convert(const Image *src, size_t size, QImage *dst)\n {\n \tswitch (formatFamily_) {\n \tcase MJPEG:\n-\t\tdst->loadFromData(src, size, \"JPEG\");\n+\t\tdst->loadFromData(src->data(0).data(), size, \"JPEG\");\n \t\tbreak;\n \tcase YUV:\n \t\tconvertYUV(src, dst->bits());\n@@ -183,13 +184,14 @@ static void yuv_to_rgb(int y, int u, int v, int *r, int *g, int *b)\n \t*b = CLIP(( 298 * c + 516 * d + 128) >> RGBSHIFT);\n }\n \n-void FormatConverter::convertNV(const unsigned char *src, unsigned char *dst)\n+void FormatConverter::convertNV(const Image *srcImage, unsigned char *dst)\n {\n \tunsigned int c_stride = width_ * (2 / horzSubSample_);\n \tunsigned int c_inc = horzSubSample_ == 1 ? 2 : 0;\n \tunsigned int cb_pos = nvSwap_ ? 1 : 0;\n \tunsigned int cr_pos = nvSwap_ ? 0 : 1;\n-\tconst unsigned char *src_c = src + width_ * height_;\n+\tconst unsigned char *src = srcImage->data(0).data();\n+\tconst unsigned char *src_c = srcImage->data(1).data();\n \tint r, g, b;\n \n \tfor (unsigned int y = 0; y < height_; y++) {\n@@ -223,8 +225,9 @@ void FormatConverter::convertNV(const unsigned char *src, unsigned char *dst)\n \t}\n }\n \n-void FormatConverter::convertRGB(const unsigned char *src, unsigned char *dst)\n+void FormatConverter::convertRGB(const Image *srcImage, unsigned char *dst)\n {\n+\tconst unsigned char *src = srcImage->data(0).data();\n \tunsigned int x, y;\n \tint r, g, b;\n \n@@ -245,8 +248,9 @@ void FormatConverter::convertRGB(const unsigned char *src, unsigned char *dst)\n \t}\n }\n \n-void FormatConverter::convertYUV(const unsigned char *src, unsigned char *dst)\n+void FormatConverter::convertYUV(const Image *srcImage, unsigned char *dst)\n {\n+\tconst unsigned char *src = srcImage->data(0).data();\n \tunsigned int src_x, src_y, dst_x, dst_y;\n \tunsigned int src_stride;\n \tunsigned int dst_stride;\ndiff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h\nindex e389b24a69f7..2220a62b5f11 100644\n--- a/src/qcam/format_converter.h\n+++ b/src/qcam/format_converter.h\n@@ -13,6 +13,7 @@\n \n #include \n \n+class Image;\n class QImage;\n \n class FormatConverter\n@@ -20,7 +21,7 @@ class FormatConverter\n public:\n \tint configure(const libcamera::PixelFormat &format, const QSize &size);\n \n-\tvoid convert(const unsigned char *src, size_t size, QImage *dst);\n+\tvoid convert(const Image *src, size_t size, QImage *dst);\n \n private:\n \tenum FormatFamily {\n@@ -30,9 +31,9 @@ private:\n \t\tYUV,\n \t};\n \n-\tvoid convertNV(const unsigned char *src, unsigned char *dst);\n-\tvoid convertRGB(const unsigned char *src, unsigned char *dst);\n-\tvoid convertYUV(const unsigned char *src, unsigned char *dst);\n+\tvoid convertNV(const Image *src, unsigned char *dst);\n+\tvoid convertRGB(const Image *src, unsigned char *dst);\n+\tvoid convertYUV(const Image *src, unsigned char *dst);\n \n \tlibcamera::PixelFormat format_;\n \tunsigned int width_;\ndiff --git a/src/qcam/viewfinder_qt.cpp b/src/qcam/viewfinder_qt.cpp\nindex fef6d53eef5e..0d357d860014 100644\n--- a/src/qcam/viewfinder_qt.cpp\n+++ b/src/qcam/viewfinder_qt.cpp\n@@ -7,6 +7,7 @@\n \n #include \"viewfinder_qt.h\"\n \n+#include \n #include \n #include \n \n@@ -81,12 +82,6 @@ int ViewFinderQt::setFormat(const libcamera::PixelFormat &format,\n \n void ViewFinderQt::render(libcamera::FrameBuffer *buffer, Image *image)\n {\n-\tif (buffer->planes().size() != 1) {\n-\t\tqWarning() << \"Multi-planar buffers are not supported\";\n-\t\treturn;\n-\t}\n-\n-\tunsigned char *memory = image->data(0).data();\n \tsize_t size = buffer->metadata().planes()[0].bytesused;\n \n \t{\n@@ -103,8 +98,9 @@ void ViewFinderQt::render(libcamera::FrameBuffer *buffer, Image *image)\n \t\t\t * \\todo Get the stride from the buffer instead of\n \t\t\t * computing it naively\n \t\t\t */\n-\t\t\timage_ = QImage(memory, size_.width(), size_.height(),\n-\t\t\t\t\tsize / size_.height(),\n+\t\t\tassert(buffer->planes().size() == 1);\n+\t\t\timage_ = QImage(image->data(0).data(), size_.width(),\n+\t\t\t\t\tsize_.height(), size / size_.height(),\n \t\t\t\t\t::nativeFormats[format_]);\n \t\t\tstd::swap(buffer, buffer_);\n \t\t} else {\n@@ -112,7 +108,7 @@ void ViewFinderQt::render(libcamera::FrameBuffer *buffer, Image *image)\n \t\t\t * Otherwise, convert the format and release the frame\n \t\t\t * buffer immediately.\n \t\t\t */\n-\t\t\tconverter_.convert(memory, size, &image_);\n+\t\t\tconverter_.convert(image, size, &image_);\n \t\t}\n \t}\n \n","prefixes":["libcamera-devel","v2","27/27"]}