From f6d6181d3c91efa526b5027319331db9ac75f65b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 20 Jul 2022 14:47:33 +0300 Subject: cam: sdl_sink: Pass a Span to SDLTexture::update() The SDLTexture::update() function isn't meant to modify the data it receives. Make the Span type const to ensure this at compile time. While at it, pass the Span by value instead of reference, as a Span is only a pointer and size, which will fit in registers and will avoid pointer dereferences in the callee. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/cam/sdl_texture.h | 2 +- src/cam/sdl_texture_mjpg.cpp | 4 ++-- src/cam/sdl_texture_mjpg.h | 4 ++-- src/cam/sdl_texture_yuyv.cpp | 2 +- src/cam/sdl_texture_yuyv.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/cam/sdl_texture.h b/src/cam/sdl_texture.h index 1d8b0928..f523fa5e 100644 --- a/src/cam/sdl_texture.h +++ b/src/cam/sdl_texture.h @@ -17,7 +17,7 @@ public: SDLTexture(const SDL_Rect &rect, uint32_t pixelFormat, const int pitch); virtual ~SDLTexture(); int create(SDL_Renderer *renderer); - virtual void update(const libcamera::Span &data) = 0; + virtual void update(libcamera::Span data) = 0; SDL_Texture *get() const { return ptr_; } protected: diff --git a/src/cam/sdl_texture_mjpg.cpp b/src/cam/sdl_texture_mjpg.cpp index 7eddc00c..7542efd7 100644 --- a/src/cam/sdl_texture_mjpg.cpp +++ b/src/cam/sdl_texture_mjpg.cpp @@ -43,7 +43,7 @@ SDLTextureMJPG::SDLTextureMJPG(const SDL_Rect &rect) { } -int SDLTextureMJPG::decompress(const Span &data) +int SDLTextureMJPG::decompress(Span data) { struct jpeg_decompress_struct cinfo; @@ -76,7 +76,7 @@ int SDLTextureMJPG::decompress(const Span &data) return 0; } -void SDLTextureMJPG::update(const Span &data) +void SDLTextureMJPG::update(Span data) { decompress(data); SDL_UpdateTexture(ptr_, nullptr, rgb_.get(), pitch_); diff --git a/src/cam/sdl_texture_mjpg.h b/src/cam/sdl_texture_mjpg.h index 328c45a9..5141ed73 100644 --- a/src/cam/sdl_texture_mjpg.h +++ b/src/cam/sdl_texture_mjpg.h @@ -14,10 +14,10 @@ class SDLTextureMJPG : public SDLTexture public: SDLTextureMJPG(const SDL_Rect &rect); - void update(const libcamera::Span &data) override; + void update(libcamera::Span data) override; private: - int decompress(const libcamera::Span &data); + int decompress(libcamera::Span data); std::unique_ptr rgb_; }; diff --git a/src/cam/sdl_texture_yuyv.cpp b/src/cam/sdl_texture_yuyv.cpp index cc161b2c..637c0900 100644 --- a/src/cam/sdl_texture_yuyv.cpp +++ b/src/cam/sdl_texture_yuyv.cpp @@ -14,7 +14,7 @@ SDLTextureYUYV::SDLTextureYUYV(const SDL_Rect &rect) { } -void SDLTextureYUYV::update(const Span &data) +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 index 9f7c72f0..529a72d6 100644 --- a/src/cam/sdl_texture_yuyv.h +++ b/src/cam/sdl_texture_yuyv.h @@ -13,5 +13,5 @@ class SDLTextureYUYV : public SDLTexture { public: SDLTextureYUYV(const SDL_Rect &rect); - void update(const libcamera::Span &data) override; + void update(libcamera::Span data) override; }; -- cgit v1.2.1