From 3c7bccfb2b5412383849c4796a99855256241a7e Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 8 May 2024 19:40:38 +0200 Subject: [PATCH] camera: clean up format table some more Move the common formats outside of the ifdef --- src/camera/pipewire/SDL_camera_pipewire.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/camera/pipewire/SDL_camera_pipewire.c b/src/camera/pipewire/SDL_camera_pipewire.c index 461a27b6d4..4ad45240d9 100644 --- a/src/camera/pipewire/SDL_camera_pipewire.c +++ b/src/camera/pipewire/SDL_camera_pipewire.c @@ -448,15 +448,6 @@ static struct { { SDL_PIXELFORMAT_ARGB8888, SPA_VIDEO_FORMAT_ARGB,}, { SDL_PIXELFORMAT_BGRA8888, SPA_VIDEO_FORMAT_BGRA,}, { SDL_PIXELFORMAT_ABGR8888, SPA_VIDEO_FORMAT_ABGR,}, - { SDL_PIXELFORMAT_YV12, SPA_VIDEO_FORMAT_YV12,}, - { SDL_PIXELFORMAT_IYUV, SPA_VIDEO_FORMAT_I420,}, - { SDL_PIXELFORMAT_YUY2, SPA_VIDEO_FORMAT_YUY2,}, - { SDL_PIXELFORMAT_UYVY, SPA_VIDEO_FORMAT_UYVY,}, - { SDL_PIXELFORMAT_YVYU, SPA_VIDEO_FORMAT_YVYU,}, -#if SDL_VERSION_ATLEAST(2,0,4) - { SDL_PIXELFORMAT_NV12, SPA_VIDEO_FORMAT_NV12,}, - { SDL_PIXELFORMAT_NV21, SPA_VIDEO_FORMAT_NV21,}, -#endif #else { SDL_PIXELFORMAT_RGB24, SPA_VIDEO_FORMAT_BGR,}, { SDL_PIXELFORMAT_RGBX8888, SPA_VIDEO_FORMAT_xBGR,}, @@ -466,6 +457,7 @@ static struct { { SDL_PIXELFORMAT_ARGB8888, SPA_VIDEO_FORMAT_BGRA,}, { SDL_PIXELFORMAT_BGRA8888, SPA_VIDEO_FORMAT_ARGB,}, { SDL_PIXELFORMAT_ABGR8888, SPA_VIDEO_FORMAT_RGBA,}, +#endif { SDL_PIXELFORMAT_YV12, SPA_VIDEO_FORMAT_YV12,}, { SDL_PIXELFORMAT_IYUV, SPA_VIDEO_FORMAT_I420,}, { SDL_PIXELFORMAT_YUY2, SPA_VIDEO_FORMAT_YUY2,}, @@ -475,7 +467,6 @@ static struct { { SDL_PIXELFORMAT_NV12, SPA_VIDEO_FORMAT_NV12,}, { SDL_PIXELFORMAT_NV21, SPA_VIDEO_FORMAT_NV21,}, #endif -#endif }; static inline uint32_t sdl_format_to_id(Uint32 format)