diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-08-06 17:35:56 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-08-08 17:53:42 +0300 |
| commit | 7b8df9fe6b3eedc46667d07ad2c90c89ca823e0c (patch) | |
| tree | 39261ca154738392910ea944dbe38beb1b977863 | |
| parent | d4a42894b158f5f248ca94a8331bb8a40e051e3c (diff) | |
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Eric Curtin <ecurtin@redhat.com>
Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
| -rw-r--r-- | src/cam/sdl_sink.cpp | 5 | ||||
| -rw-r--r-- | src/cam/sdl_texture_yuv.cpp | 13 | ||||
| -rw-r--r-- | src/cam/sdl_texture_yuv.h | 9 |
3 files changed, 24 insertions, 3 deletions
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<SDLTextureMJPG>(rect_); break; #endif + case libcamera::formats::NV12: + texture_ = std::make_unique<SDLTextureNV12>(rect_, cfg.stride); + break; case libcamera::formats::YUYV: texture_ = std::make_unique<SDLTextureYUYV>(rect_, cfg.stride); break; @@ -188,7 +191,7 @@ void SDLSink::renderBuffer(FrameBuffer *buffer) std::vector<Span<const uint8_t>> 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<uint8_t> 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<libcamera::Span<const uint8_t>> &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<libcamera::Span<const uint8_t>> &data) override; +}; + class SDLTextureYUYV : public SDLTexture { public: |