From 842651e1bc8c808532adde77610cbb868dd20b96 Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Tue, 23 Mar 2021 15:42:46 -0400 Subject: [PATCH] common: add more pixel formats to genicam helper file --- common/genicampixelformat.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/common/genicampixelformat.h b/common/genicampixelformat.h index c68f5bb..a7f561d 100644 --- a/common/genicampixelformat.h +++ b/common/genicampixelformat.h @@ -67,8 +67,14 @@ GstGenicamPixelFormatInfo gst_genicam_pixel_format_infos[] = { , {"RGB8", "RGB 8", 0, GST_VIDEO_CAPS_MAKE ("RGB"), 24, 24, 4} , + // RGB8Packed deprecated in favor of RGB8 + {"RGB8Packed", "RGB 8 Packed", 0, GST_VIDEO_CAPS_MAKE("RGB"), 24, 24, 4} + , {"BGR8", "BGR 8", 0, GST_VIDEO_CAPS_MAKE ("BGR"), 24, 24, 4} , + // BGR8Packed deprecated in favor of BGR8 + {"BGR8Packed", "BGR 8 Packed", 0, GST_VIDEO_CAPS_MAKE("BGR"), 24, 24, 4} + , {"RGBa8", "RGBa 8", 0, GST_VIDEO_CAPS_MAKE ("RGBA"), 32, 32, 4} , {"BGRa8", "BGRa 8", 0, GST_VIDEO_CAPS_MAKE ("BGRA"), 32, 32, 4} @@ -77,6 +83,11 @@ GstGenicamPixelFormatInfo gst_genicam_pixel_format_infos[] = { , {"YUV422Packed", "YUV 422 Packed", 0, GST_VIDEO_CAPS_MAKE ("UYVY"), 16, 16, 4} , + {"YUV8_UYV", "YUV8 UYV", 0, GST_VIDEO_CAPS_MAKE("IYU2"), 24, 24, 4} + , + // YUV444Packed deprecated in favor of YUV8_UYV + {"YUV444Packed", "YUV 444 Packed", 0, GST_VIDEO_CAPS_MAKE("IYU2"), 24, 24, 4} + , {"YCbCr422_8", "YCbCr422_8", 0, GST_VIDEO_CAPS_MAKE ("YUY2"), 16, 16, 4} , {"BayerBG8", "Bayer BG 8", 0, GST_GENICAM_PIXEL_FORMAT_MAKE_BAYER8 ("bggr"), 8, 8, 1} @@ -124,6 +135,9 @@ GstGenicamPixelFormatInfo gst_genicam_pixel_format_infos[] = { , /* Formats from Basler */ {"YUV422_YUYV_Packed", "YUV422_YUYV_Packed", 0, GST_VIDEO_CAPS_MAKE ("YUY2"), 16, 16, 4} + , + /* Formats from Kaya */ + {"YUV422_8", "YUV422_8", 0, GST_VIDEO_CAPS_MAKE("UYVY"), 16, 16, 4} }; int strcmp_ignore_whitespace (const char *s1, const char *s2) @@ -186,7 +200,7 @@ gst_genicam_pixel_format_get_info (const char *pixel_format, int endianness) for (i = 0; i < G_N_ELEMENTS (gst_genicam_pixel_format_infos); i++) { GstGenicamPixelFormatInfo *info = &gst_genicam_pixel_format_infos[i]; - if (strcmp_ignore_whitespace (pixel_format, info->pixel_format_spaced) == 0 && + if (strncasecmp_ignore_whitespace (pixel_format, info->pixel_format_spaced) == 0 && (info->endianness == endianness || info->endianness == 0)) return info; }