| Message ID | 20220808155605.7925-2-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
On Mon, 8 Aug 2022 at 16:56, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > The SDL_UpdateNVTexture() function, used for NV12 texture support, has > been introduced in SDL2 2.0.16. Compiling against older SDL versions > fails with > > ../src/cam/sdl_texture_yuv.cpp: In member function ‘virtual void SDLTextureNV12::update(const std::vector<libcamera::Span<const unsigned char> >&)’: > ../src/cam/sdl_texture_yuv.cpp:19:2: error: ‘SDL_UpdateNVTexture’ was not declared in this scope; did you mean ‘SDL_UpdateYUVTexture’? > 19 | SDL_UpdateNVTexture(ptr_, &rect_, data[0].data(), pitch_, > | ^~~~~~~~~~~~~~~~~~~ > | SDL_UpdateYUVTexture > > Fix it with conditional compilation based on the SDL version. > > Fixes: 7b8df9fe6b3e ("cam: sdl_sink: Add NV12 texture support") > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> LGTM. Reviewed-by: Eric Curtin <ecurtin@redhat.com> > --- > src/cam/sdl_sink.cpp | 2 ++ > src/cam/sdl_texture_yuv.cpp | 2 ++ > src/cam/sdl_texture_yuv.h | 2 ++ > 3 files changed, 6 insertions(+) > > diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp > index 5f2583721419..ee177227dbca 100644 > --- a/src/cam/sdl_sink.cpp > +++ b/src/cam/sdl_sink.cpp > @@ -67,9 +67,11 @@ int SDLSink::configure(const libcamera::CameraConfiguration &config) > texture_ = std::make_unique<SDLTextureMJPG>(rect_); > break; > #endif > +#if SDL_VERSION_ATLEAST(2, 0, 16) > case libcamera::formats::NV12: > texture_ = std::make_unique<SDLTextureNV12>(rect_, cfg.stride); > break; > +#endif > case libcamera::formats::YUYV: > texture_ = std::make_unique<SDLTextureYUYV>(rect_, cfg.stride); > break; > diff --git a/src/cam/sdl_texture_yuv.cpp b/src/cam/sdl_texture_yuv.cpp > index 431e836d2d2c..aa424559abd7 100644 > --- a/src/cam/sdl_texture_yuv.cpp > +++ b/src/cam/sdl_texture_yuv.cpp > @@ -9,6 +9,7 @@ > > using namespace libcamera; > > +#if SDL_VERSION_ATLEAST(2, 0, 16) > SDLTextureNV12::SDLTextureNV12(const SDL_Rect &rect, unsigned int stride) > : SDLTexture(rect, SDL_PIXELFORMAT_NV12, stride) > { > @@ -19,6 +20,7 @@ void SDLTextureNV12::update(const std::vector<libcamera::Span<const uint8_t>> &d > SDL_UpdateNVTexture(ptr_, &rect_, data[0].data(), pitch_, > data[1].data(), pitch_); > } > +#endif > > 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 633ab510259b..310e4e5046f4 100644 > --- a/src/cam/sdl_texture_yuv.h > +++ b/src/cam/sdl_texture_yuv.h > @@ -9,12 +9,14 @@ > > #include "sdl_texture.h" > > +#if SDL_VERSION_ATLEAST(2, 0, 16) > 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; > }; > +#endif > > class SDLTextureYUYV : public SDLTexture > { > -- > Regards, > > Laurent Pinchart >
diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp index 5f2583721419..ee177227dbca 100644 --- a/src/cam/sdl_sink.cpp +++ b/src/cam/sdl_sink.cpp @@ -67,9 +67,11 @@ int SDLSink::configure(const libcamera::CameraConfiguration &config) texture_ = std::make_unique<SDLTextureMJPG>(rect_); break; #endif +#if SDL_VERSION_ATLEAST(2, 0, 16) case libcamera::formats::NV12: texture_ = std::make_unique<SDLTextureNV12>(rect_, cfg.stride); break; +#endif case libcamera::formats::YUYV: texture_ = std::make_unique<SDLTextureYUYV>(rect_, cfg.stride); break; diff --git a/src/cam/sdl_texture_yuv.cpp b/src/cam/sdl_texture_yuv.cpp index 431e836d2d2c..aa424559abd7 100644 --- a/src/cam/sdl_texture_yuv.cpp +++ b/src/cam/sdl_texture_yuv.cpp @@ -9,6 +9,7 @@ using namespace libcamera; +#if SDL_VERSION_ATLEAST(2, 0, 16) SDLTextureNV12::SDLTextureNV12(const SDL_Rect &rect, unsigned int stride) : SDLTexture(rect, SDL_PIXELFORMAT_NV12, stride) { @@ -19,6 +20,7 @@ void SDLTextureNV12::update(const std::vector<libcamera::Span<const uint8_t>> &d SDL_UpdateNVTexture(ptr_, &rect_, data[0].data(), pitch_, data[1].data(), pitch_); } +#endif 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 633ab510259b..310e4e5046f4 100644 --- a/src/cam/sdl_texture_yuv.h +++ b/src/cam/sdl_texture_yuv.h @@ -9,12 +9,14 @@ #include "sdl_texture.h" +#if SDL_VERSION_ATLEAST(2, 0, 16) 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; }; +#endif class SDLTextureYUYV : public SDLTexture {
The SDL_UpdateNVTexture() function, used for NV12 texture support, has been introduced in SDL2 2.0.16. Compiling against older SDL versions fails with ../src/cam/sdl_texture_yuv.cpp: In member function ‘virtual void SDLTextureNV12::update(const std::vector<libcamera::Span<const unsigned char> >&)’: ../src/cam/sdl_texture_yuv.cpp:19:2: error: ‘SDL_UpdateNVTexture’ was not declared in this scope; did you mean ‘SDL_UpdateYUVTexture’? 19 | SDL_UpdateNVTexture(ptr_, &rect_, data[0].data(), pitch_, | ^~~~~~~~~~~~~~~~~~~ | SDL_UpdateYUVTexture Fix it with conditional compilation based on the SDL version. Fixes: 7b8df9fe6b3e ("cam: sdl_sink: Add NV12 texture support") Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- src/cam/sdl_sink.cpp | 2 ++ src/cam/sdl_texture_yuv.cpp | 2 ++ src/cam/sdl_texture_yuv.h | 2 ++ 3 files changed, 6 insertions(+)