From 7b8df9fe6b3eedc46667d07ad2c90c89ca823e0c Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 6 Aug 2022 17:35:56 +0300 Subject: cam: sdl_sink: Add NV12 texture support Extend the SDL sink with support for NV12 textures, useful on platforms that don't support packed YUYV formats. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi Reviewed-by: Eric Curtin Tested-by: Kieran Bingham --- src/cam/sdl_sink.cpp | 5 ++++- src/cam/sdl_texture_yuv.cpp | 13 ++++++++++++- src/cam/sdl_texture_yuv.h | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp index 4ca97576..5f258372 100644 --- a/src/cam/sdl_sink.cpp +++ b/src/cam/sdl_sink.cpp @@ -67,6 +67,9 @@ int SDLSink::configure(const libcamera::CameraConfiguration &config) texture_ = std::make_unique(rect_); break; #endif + case libcamera::formats::NV12: + texture_ = std::make_unique(rect_, cfg.stride); + break; case libcamera::formats::YUYV: texture_ = std::make_unique(rect_, cfg.stride); break; @@ -188,7 +191,7 @@ void SDLSink::renderBuffer(FrameBuffer *buffer) std::vector> planes; unsigned int i = 0; - planes.reserve(buffer->metadata()->planes().size()); + planes.reserve(buffer->metadata().planes().size()); for (const FrameMetadata::Plane &meta : buffer->metadata().planes()) { Span data = image->data(i); diff --git a/src/cam/sdl_texture_yuv.cpp b/src/cam/sdl_texture_yuv.cpp index a5721182..431e836d 100644 --- a/src/cam/sdl_texture_yuv.cpp +++ b/src/cam/sdl_texture_yuv.cpp @@ -2,13 +2,24 @@ /* * Copyright (C) 2022, Ideas on Board Oy * - * sdl_texture_yuv.cpp - SDL Texture YUYV + * sdl_texture_yuv.cpp - SDL YUV Textures */ #include "sdl_texture_yuv.h" using namespace libcamera; +SDLTextureNV12::SDLTextureNV12(const SDL_Rect &rect, unsigned int stride) + : SDLTexture(rect, SDL_PIXELFORMAT_NV12, stride) +{ +} + +void SDLTextureNV12::update(const std::vector> &data) +{ + SDL_UpdateNVTexture(ptr_, &rect_, data[0].data(), pitch_, + data[1].data(), pitch_); +} + SDLTextureYUYV::SDLTextureYUYV(const SDL_Rect &rect, unsigned int stride) : SDLTexture(rect, SDL_PIXELFORMAT_YUY2, stride) { diff --git a/src/cam/sdl_texture_yuv.h b/src/cam/sdl_texture_yuv.h index 137b01f8..633ab510 100644 --- a/src/cam/sdl_texture_yuv.h +++ b/src/cam/sdl_texture_yuv.h @@ -2,13 +2,20 @@ /* * Copyright (C) 2022, Ideas on Board Oy * - * sdl_texture_yuv.h - SDL Texture YUYV + * sdl_texture_yuv.h - SDL YUV Textures */ #pragma once #include "sdl_texture.h" +class SDLTextureNV12 : public SDLTexture +{ +public: + SDLTextureNV12(const SDL_Rect &rect, unsigned int stride); + void update(const std::vector> &data) override; +}; + class SDLTextureYUYV : public SDLTexture { public: -- cgit v1.2.1