From 3e0b3a10779debd7f55f594e4b2c18f1acdb2d55 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 6 Aug 2022 17:18:37 +0300 Subject: cam: Rename sdl_texture_yuyv.{cpp,h} to sdl_texture_yuv.{cpp,h} In preparation for the addition of NV12 support in the SDL sink, rename the sdl_texture_yuyv.{cpp,h} files to just "yuv". Separate sdl_texture_nv12.{cpp,h} files could be added instead, but given how short the implementation will be, grouping all YUV formats in a single file is better. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi Reviewed-by: Eric Curtin Tested-by: Kieran Bingham --- src/cam/meson.build | 2 +- src/cam/sdl_sink.cpp | 2 +- src/cam/sdl_texture_yuv.cpp | 20 ++++++++++++++++++++ src/cam/sdl_texture_yuv.h | 17 +++++++++++++++++ src/cam/sdl_texture_yuyv.cpp | 20 -------------------- src/cam/sdl_texture_yuyv.h | 17 ----------------- 6 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 src/cam/sdl_texture_yuv.cpp create mode 100644 src/cam/sdl_texture_yuv.h delete mode 100644 src/cam/sdl_texture_yuyv.cpp delete mode 100644 src/cam/sdl_texture_yuyv.h (limited to 'src/cam') diff --git a/src/cam/meson.build b/src/cam/meson.build index 4dfa7b22..8259239f 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -40,7 +40,7 @@ if libsdl2.found() cam_sources += files([ 'sdl_sink.cpp', 'sdl_texture.cpp', - 'sdl_texture_yuyv.cpp' + 'sdl_texture_yuv.cpp', ]) if libjpeg.found() diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp index a59d0751..04350bd5 100644 --- a/src/cam/sdl_sink.cpp +++ b/src/cam/sdl_sink.cpp @@ -24,7 +24,7 @@ #ifdef HAVE_LIBJPEG #include "sdl_texture_mjpg.h" #endif -#include "sdl_texture_yuyv.h" +#include "sdl_texture_yuv.h" using namespace libcamera; diff --git a/src/cam/sdl_texture_yuv.cpp b/src/cam/sdl_texture_yuv.cpp new file mode 100644 index 00000000..07df4961 --- /dev/null +++ b/src/cam/sdl_texture_yuv.cpp @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2022, Ideas on Board Oy + * + * sdl_texture_yuv.cpp - SDL Texture YUYV + */ + +#include "sdl_texture_yuv.h" + +using namespace libcamera; + +SDLTextureYUYV::SDLTextureYUYV(const SDL_Rect &rect, unsigned int stride) + : SDLTexture(rect, SDL_PIXELFORMAT_YUY2, stride) +{ +} + +void SDLTextureYUYV::update(Span data) +{ + SDL_UpdateTexture(ptr_, &rect_, data.data(), pitch_); +} diff --git a/src/cam/sdl_texture_yuv.h b/src/cam/sdl_texture_yuv.h new file mode 100644 index 00000000..223453a0 --- /dev/null +++ b/src/cam/sdl_texture_yuv.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2022, Ideas on Board Oy + * + * sdl_texture_yuv.h - SDL Texture YUYV + */ + +#pragma once + +#include "sdl_texture.h" + +class SDLTextureYUYV : public SDLTexture +{ +public: + SDLTextureYUYV(const SDL_Rect &rect, unsigned int stride); + void update(libcamera::Span data) override; +}; diff --git a/src/cam/sdl_texture_yuyv.cpp b/src/cam/sdl_texture_yuyv.cpp deleted file mode 100644 index cb51fb0e..00000000 --- a/src/cam/sdl_texture_yuyv.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright (C) 2022, Ideas on Board Oy - * - * sdl_texture_yuyv.cpp - SDL Texture YUYV - */ - -#include "sdl_texture_yuyv.h" - -using namespace libcamera; - -SDLTextureYUYV::SDLTextureYUYV(const SDL_Rect &rect, unsigned int stride) - : SDLTexture(rect, SDL_PIXELFORMAT_YUY2, stride) -{ -} - -void SDLTextureYUYV::update(Span data) -{ - SDL_UpdateTexture(ptr_, &rect_, data.data(), pitch_); -} diff --git a/src/cam/sdl_texture_yuyv.h b/src/cam/sdl_texture_yuyv.h deleted file mode 100644 index 81e51381..00000000 --- a/src/cam/sdl_texture_yuyv.h +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright (C) 2022, Ideas on Board Oy - * - * sdl_texture_yuyv.h - SDL Texture YUYV - */ - -#pragma once - -#include "sdl_texture.h" - -class SDLTextureYUYV : public SDLTexture -{ -public: - SDLTextureYUYV(const SDL_Rect &rect, unsigned int stride); - void update(libcamera::Span data) override; -}; -- cgit v1.2.1