From 81dd81b739b06360305a9ef2ec8d6d1c7e43925f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 11 Aug 2019 14:16:51 +0100 Subject: [PATCH] video-color: keep UNKNOWN colorimetry define automatically up-to-date Follow-up to !310 and helps with backport commits like !360 --- gst-libs/gst/video/video-color.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gst-libs/gst/video/video-color.c b/gst-libs/gst/video/video-color.c index 9952266041..cf8c0876c1 100644 --- a/gst-libs/gst/video/video-color.c +++ b/gst-libs/gst/video/video-color.c @@ -63,10 +63,6 @@ typedef struct #define GST_VIDEO_COLORIMETRY_NONAME NULL -#define DEFAULT_UNKNOWN 9 - -/* NOTE: If you add an entry below, don't forget to update DEFAULT_UNKNOWN - * above */ static const ColorimetryInfo colorimetry[] = { MAKE_COLORIMETRY (BT601, _16_235, BT601, BT709, SMPTE170M), MAKE_COLORIMETRY (BT709, _16_235, BT709, BT709, BT709), @@ -77,12 +73,10 @@ static const ColorimetryInfo colorimetry[] = { MAKE_COLORIMETRY (BT2100_PQ, _16_235, BT2020, SMPTE2084, BT2020), MAKE_COLORIMETRY (BT2100_HLG, _16_235, BT2020, ARIB_STD_B67, BT2020), MAKE_COLORIMETRY (NONAME, _0_255, BT601, UNKNOWN, UNKNOWN), - MAKE_COLORIMETRY (NONAME, _UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN), + MAKE_COLORIMETRY (NONAME, _UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN), /* Keep last! */ }; -/* Ensure that DEFAULT_UNKNOWN is indeed updated */ -G_STATIC_ASSERT (sizeof (colorimetry) == - (sizeof (gchar *) + sizeof (GstVideoColorimetry)) * (DEFAULT_UNKNOWN + 1)); +#define DEFAULT_UNKNOWN (G_N_ELEMENTS(colorimetry)-1) static const ColorimetryInfo * gst_video_get_colorimetry (const gchar * s)