From d1eb5f6d2042eb2b138d079905b90587b79f98d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Sat, 12 Jul 2025 18:28:23 +0200 Subject: [PATCH] spa: libcamera: source: use enum types Use the appropriate enum types instead of bare `uint32_t`, this provides better type safety in C++. (cherry picked from commit 0ea7dc9f191a229a9417f0526f9cfa135d6400e7) --- spa/plugins/libcamera/libcamera-source.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spa/plugins/libcamera/libcamera-source.cpp b/spa/plugins/libcamera/libcamera-source.cpp index e423d07b9..5c8394d7e 100644 --- a/spa/plugins/libcamera/libcamera-source.cpp +++ b/spa/plugins/libcamera/libcamera-source.cpp @@ -71,7 +71,7 @@ struct port { struct spa_fraction rate = {}; StreamConfiguration streamConfig; - uint32_t memtype = 0; + spa_data_type memtype = SPA_DATA_Invalid; uint32_t buffers_blocks = 1; struct buffer buffers[MAX_BUFFERS]; @@ -375,9 +375,9 @@ static int spa_libcamera_clear_buffers(struct impl *impl, struct port *port) struct format_info { PixelFormat pix; - uint32_t format; - uint32_t media_type; - uint32_t media_subtype; + spa_video_format format; + spa_media_type media_type; + spa_media_subtype media_subtype; }; #define MAKE_FMT(pix,fmt,mt,mst) { pix, SPA_VIDEO_FORMAT_ ##fmt, SPA_MEDIA_TYPE_ ##mt, SPA_MEDIA_SUBTYPE_ ##mst } @@ -433,7 +433,7 @@ static const struct format_info *find_format_info_by_media_type(uint32_t type, for (i = startidx; i < SPA_N_ELEMENTS(format_info); i++) { if ((format_info[i].media_type == type) && (format_info[i].media_subtype == subtype) && - (format == 0 || format_info[i].format == format)) + (format == SPA_VIDEO_FORMAT_UNKNOWN || format_info[i].format == format)) return &format_info[i]; } return NULL;