{"id":17007,"url":"https://patchwork.libcamera.org/api/patches/17007/?format=json","web_url":"https://patchwork.libcamera.org/patch/17007/","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":"<20220807021718.9789-4-laurent.pinchart@ideasonboard.com>","date":"2022-08-07T02:17:17","name":"[libcamera-devel,3/4] cam: sdl_sink: Support multi-planar formats","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"59e0a4177020c325d75c1cc6e7321705f4f2215d","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17007/mbox/","series":[{"id":3381,"url":"https://patchwork.libcamera.org/api/series/3381/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3381","date":"2022-08-07T02:17:14","name":"cam: Add support for NV12 in the SDL sink","version":1,"mbox":"https://patchwork.libcamera.org/series/3381/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17007/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17007/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 C6181BE173\n\tfor ;\n\tSun, 7 Aug 2022 02:17:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 54EAB63331;\n\tSun, 7 Aug 2022 04:17:33 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E76946332A\n\tfor ;\n\tSun, 7 Aug 2022 04:17:30 +0200 (CEST)","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 83EDF896;\n\tSun, 7 Aug 2022 04:17:30 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659838653;\n\tbh=KywZ2FwG3Kb8AKYbTiz4EFReY9hHPxCG4Lx3eN52FWE=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=WttK2fA6+W9EhC6tPfj82VrHE5Be27ZtK4+VY8MMB0++7oe9qMycxcID8cwBkyra8\n\tR3HYKcdIJlYlR1ojpXDJgiaIaVJFCLY6Sx27tWc081TJLi0u4lmixO7+cVDH7skVmZ\n\t+L0dKEgqALCPZ901+0JXoNTpgnIGc25dOrrXn+3X7dGz8QvrwBQo//TTpQhX3zeUDF\n\tkatgqKEJBnFbsQijn94pHUrAkNmvN2znITBoW75c0lDWhfmtz8Q5WKC4EqJiKf2Nj+\n\t5XTW92aP0t6H0zEGZQfhVTuUKELZuDs0B6qU94zsrRP6NjmNcWTEzu33kfnchaBjuf\n\tgDD+vh/UP6wNA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1659838650;\n\tbh=KywZ2FwG3Kb8AKYbTiz4EFReY9hHPxCG4Lx3eN52FWE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=KkKL70kGNNAPFHdniT18NyWo2w3h0MeU0/C0P3eMTt+tjtMXMtYAiEXGaEkPTxa+6\n\tphHfSUF5tEIazg5EPowXFeL8kMZ93jC3X3SxXWMbP9ipIn2MJHByCYlHD49f2+NbbL\n\tcOPtJZrqGPfLB/WI1yn+OLlWr/mBLzKKbWQMatRE="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"KkKL70kG\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 7 Aug 2022 05:17:17 +0300","Message-Id":"<20220807021718.9789-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220807021718.9789-1-laurent.pinchart@ideasonboard.com>","References":"<20220807021718.9789-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 3/4] cam: sdl_sink: Support multi-planar\n\tformats","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":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In order to prepare for NV12 support, implement support for multi-planar\nformats in the SDL sink. This mainly consists in passing a vector of\nplane data to the SDLTexture::update() function instead of a single\nvalue.\n\nSigned-off-by: Laurent Pinchart \n---\n src/cam/sdl_sink.cpp | 21 +++++++++++++--------\n src/cam/sdl_texture.h | 4 +++-\n src/cam/sdl_texture_mjpg.cpp | 4 ++--\n src/cam/sdl_texture_mjpg.h | 2 +-\n src/cam/sdl_texture_yuv.cpp | 4 ++--\n src/cam/sdl_texture_yuv.h | 2 +-\n 6 files changed, 22 insertions(+), 15 deletions(-)","diff":"diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp\nindex 04350bd5365b..9675cf275186 100644\n--- a/src/cam/sdl_sink.cpp\n+++ b/src/cam/sdl_sink.cpp\n@@ -185,16 +185,21 @@ void SDLSink::renderBuffer(FrameBuffer *buffer)\n {\n \tImage *image = mappedBuffers_[buffer].get();\n \n-\t/* \\todo Implement support for multi-planar formats. */\n-\tconst FrameMetadata::Plane &meta = buffer->metadata().planes()[0];\n+\tstd::vector> planes;\n+\tunsigned int i = 0;\n \n-\tSpan data = image->data(0);\n-\tif (meta.bytesused > data.size())\n-\t\tstd::cerr << \"payload size \" << meta.bytesused\n-\t\t\t << \" larger than plane size \" << data.size()\n-\t\t\t << std::endl;\n+\tfor (const FrameMetadata::Plane &meta : buffer->metadata().planes()) {\n+\t\tSpan data = image->data(i);\n+\t\tif (meta.bytesused > data.size())\n+\t\t\tstd::cerr << \"payload size \" << meta.bytesused\n+\t\t\t\t << \" larger than plane size \" << data.size()\n+\t\t\t\t << std::endl;\n \n-\ttexture_->update(data);\n+\t\tplanes.push_back(data);\n+\t\ti++;\n+\t}\n+\n+\ttexture_->update(planes);\n \n \tSDL_RenderClear(renderer_);\n \tSDL_RenderCopy(renderer_, texture_->get(), nullptr, nullptr);\ndiff --git a/src/cam/sdl_texture.h b/src/cam/sdl_texture.h\nindex f523fa5ebf51..e4d3fb2bcf39 100644\n--- a/src/cam/sdl_texture.h\n+++ b/src/cam/sdl_texture.h\n@@ -7,6 +7,8 @@\n \n #pragma once\n \n+#include \n+\n #include \n \n #include \"image.h\"\n@@ -17,7 +19,7 @@ public:\n \tSDLTexture(const SDL_Rect &rect, uint32_t pixelFormat, const int pitch);\n \tvirtual ~SDLTexture();\n \tint create(SDL_Renderer *renderer);\n-\tvirtual void update(libcamera::Span data) = 0;\n+\tvirtual void update(const std::vector> &data) = 0;\n \tSDL_Texture *get() const { return ptr_; }\n \n protected:\ndiff --git a/src/cam/sdl_texture_mjpg.cpp b/src/cam/sdl_texture_mjpg.cpp\nindex 7542efd75d96..8dd5ee3eb6bc 100644\n--- a/src/cam/sdl_texture_mjpg.cpp\n+++ b/src/cam/sdl_texture_mjpg.cpp\n@@ -76,8 +76,8 @@ int SDLTextureMJPG::decompress(Span data)\n \treturn 0;\n }\n \n-void SDLTextureMJPG::update(Span data)\n+void SDLTextureMJPG::update(const std::vector> &data)\n {\n-\tdecompress(data);\n+\tdecompress(data[0]);\n \tSDL_UpdateTexture(ptr_, nullptr, rgb_.get(), pitch_);\n }\ndiff --git a/src/cam/sdl_texture_mjpg.h b/src/cam/sdl_texture_mjpg.h\nindex 5141ed73bf70..814ca79ac193 100644\n--- a/src/cam/sdl_texture_mjpg.h\n+++ b/src/cam/sdl_texture_mjpg.h\n@@ -14,7 +14,7 @@ class SDLTextureMJPG : public SDLTexture\n public:\n \tSDLTextureMJPG(const SDL_Rect &rect);\n \n-\tvoid update(libcamera::Span data) override;\n+\tvoid update(const std::vector> &data) override;\n \n private:\n \tint decompress(libcamera::Span data);\ndiff --git a/src/cam/sdl_texture_yuv.cpp b/src/cam/sdl_texture_yuv.cpp\nindex 07df4961a1ab..a5721182a68b 100644\n--- a/src/cam/sdl_texture_yuv.cpp\n+++ b/src/cam/sdl_texture_yuv.cpp\n@@ -14,7 +14,7 @@ SDLTextureYUYV::SDLTextureYUYV(const SDL_Rect &rect, unsigned int stride)\n {\n }\n \n-void SDLTextureYUYV::update(Span data)\n+void SDLTextureYUYV::update(const std::vector> &data)\n {\n-\tSDL_UpdateTexture(ptr_, &rect_, data.data(), pitch_);\n+\tSDL_UpdateTexture(ptr_, &rect_, data[0].data(), pitch_);\n }\ndiff --git a/src/cam/sdl_texture_yuv.h b/src/cam/sdl_texture_yuv.h\nindex 81e51381ec62..c9130298b91d 100644\n--- a/src/cam/sdl_texture_yuv.h\n+++ b/src/cam/sdl_texture_yuv.h\n@@ -13,5 +13,5 @@ class SDLTextureYUYV : public SDLTexture\n {\n public:\n \tSDLTextureYUYV(const SDL_Rect &rect, unsigned int stride);\n-\tvoid update(libcamera::Span data) override;\n+\tvoid update(const std::vector> &data) override;\n };\n","prefixes":["libcamera-devel","3/4"]}