提交 b29fd563 编写于 作者: M Mauro Carvalho Chehab

media: v4l2-tpg.h: rename color structs

The color structs right now are just "color" and "color16".
That may lead into conflicts, and don't define precisely what
they meant. As those are used by two drivers (vivid and vimc),
this is even on a somewhat public header!

So rename them to:
	color ->  tpg_rbg_color8
	color16 ->  tpg_rbg_color16
Acked-by: NHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>
上级 1beb623b
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <media/tpg/v4l2-tpg.h> #include <media/tpg/v4l2-tpg.h>
/* sRGB colors with range [0-255] */ /* sRGB colors with range [0-255] */
const struct color tpg_colors[TPG_COLOR_MAX] = { const struct tpg_rbg_color8 tpg_colors[TPG_COLOR_MAX] = {
/* /*
* Colors to test colorspace conversion: converting these colors * Colors to test colorspace conversion: converting these colors
* to other colorspaces will never lead to out-of-gamut colors. * to other colorspaces will never lead to out-of-gamut colors.
...@@ -597,7 +597,7 @@ const unsigned short tpg_linear_to_rec709[255 * 16 + 1] = { ...@@ -597,7 +597,7 @@ const unsigned short tpg_linear_to_rec709[255 * 16 + 1] = {
}; };
/* Generated table */ /* Generated table */
const struct color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFER_FUNC_SMPTE2084 + 1][TPG_COLOR_CSC_BLACK + 1] = { const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFER_FUNC_SMPTE2084 + 1][TPG_COLOR_CSC_BLACK + 1] = {
[V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_709][0] = { 2939, 2939, 2939 }, [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_709][0] = { 2939, 2939, 2939 },
[V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_709][1] = { 2953, 2963, 586 }, [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_709][1] = { 2953, 2963, 586 },
[V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_709][2] = { 0, 2967, 2937 }, [V4L2_COLORSPACE_SMPTE170M][V4L2_XFER_FUNC_709][2] = { 0, 2967, 2937 },
...@@ -1392,7 +1392,7 @@ int main(int argc, char **argv) ...@@ -1392,7 +1392,7 @@ int main(int argc, char **argv)
printf("\n};\n\n"); printf("\n};\n\n");
printf("/* Generated table */\n"); printf("/* Generated table */\n");
printf("const struct color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFER_FUNC_SMPTE2084 + 1][TPG_COLOR_CSC_BLACK + 1] = {\n"); printf("const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1][V4L2_XFER_FUNC_SMPTE2084 + 1][TPG_COLOR_CSC_BLACK + 1] = {\n");
for (c = 0; c <= V4L2_COLORSPACE_DCI_P3; c++) { for (c = 0; c <= V4L2_COLORSPACE_DCI_P3; c++) {
for (x = 1; x <= V4L2_XFER_FUNC_SMPTE2084; x++) { for (x = 1; x <= V4L2_XFER_FUNC_SMPTE2084; x++) {
for (i = 0; i <= TPG_COLOR_CSC_BLACK; i++) { for (i = 0; i <= TPG_COLOR_CSC_BLACK; i++) {
......
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
struct color { struct tpg_rbg_color8 {
unsigned char r, g, b; unsigned char r, g, b;
}; };
struct color16 { struct tpg_rbg_color16 {
int r, g, b; int r, g, b;
}; };
...@@ -65,10 +65,10 @@ enum tpg_color { ...@@ -65,10 +65,10 @@ enum tpg_color {
TPG_COLOR_MAX = TPG_COLOR_RAMP + 256 TPG_COLOR_MAX = TPG_COLOR_RAMP + 256
}; };
extern const struct color tpg_colors[TPG_COLOR_MAX]; extern const struct tpg_rbg_color8 tpg_colors[TPG_COLOR_MAX];
extern const unsigned short tpg_rec709_to_linear[255 * 16 + 1]; extern const unsigned short tpg_rec709_to_linear[255 * 16 + 1];
extern const unsigned short tpg_linear_to_rec709[255 * 16 + 1]; extern const unsigned short tpg_linear_to_rec709[255 * 16 + 1];
extern const struct color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1] extern const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1]
[V4L2_XFER_FUNC_SMPTE2084 + 1] [V4L2_XFER_FUNC_SMPTE2084 + 1]
[TPG_COLOR_CSC_BLACK + 1]; [TPG_COLOR_CSC_BLACK + 1];
enum tpg_pattern { enum tpg_pattern {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册