UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] vivid: add new checkboard patterns 

Add a 2x2 checker patterns and 1x1 and 2x2 red/blue checker patterns.

Useful for testing 4:2:2 and 4:2:0 formats.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-03-07 12:49:57 -03:00 committed by Mauro Carvalho Chehab
parent 43047f6b74
commit 1a05d3133f
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/media/platform/vivid/vivid-tpg.c
View File

@ -35,7 +35,10 @@ const char * const tpg_pattern_strings[] = {
"100% Green", "100% Green",
"100% Blue", "100% Blue",
"16x16 Checkers", "16x16 Checkers",
"2x2 Checkers",
"1x1 Checkers", "1x1 Checkers",
"2x2 Red/Green Checkers",
"1x1 Red/Green Checkers",
"Alternating Hor Lines", "Alternating Hor Lines",
"Alternating Vert Lines", "Alternating Vert Lines",
"One Pixel Wide Cross", "One Pixel Wide Cross",
@ -744,11 +747,14 @@ static void gen_twopix(struct tpg_data *tpg,
} }
/* Return how many pattern lines are used by the current pattern. */ /* Return how many pattern lines are used by the current pattern. */
static unsigned tpg_get_pat_lines(struct tpg_data *tpg) static unsigned tpg_get_pat_lines(const struct tpg_data *tpg)
{ {
switch (tpg->pattern) { switch (tpg->pattern) {
case TPG_PAT_CHECKERS_16X16: case TPG_PAT_CHECKERS_16X16:
case TPG_PAT_CHECKERS_2X2:
case TPG_PAT_CHECKERS_1X1: case TPG_PAT_CHECKERS_1X1:
case TPG_PAT_COLOR_CHECKERS_2X2:
case TPG_PAT_COLOR_CHECKERS_1X1:
case TPG_PAT_ALTERNATING_HLINES: case TPG_PAT_ALTERNATING_HLINES:
case TPG_PAT_CROSS_1_PIXEL: case TPG_PAT_CROSS_1_PIXEL:
case TPG_PAT_CROSS_2_PIXELS: case TPG_PAT_CROSS_2_PIXELS:
@ -763,14 +769,18 @@ static unsigned tpg_get_pat_lines(struct tpg_data *tpg)
} }
/* Which pattern line should be used for the given frame line. */ /* Which pattern line should be used for the given frame line. */
static unsigned tpg_get_pat_line(struct tpg_data *tpg, unsigned line) static unsigned tpg_get_pat_line(const struct tpg_data *tpg, unsigned line)
{ {
switch (tpg->pattern) { switch (tpg->pattern) {
case TPG_PAT_CHECKERS_16X16: case TPG_PAT_CHECKERS_16X16:
return (line >> 4) & 1; return (line >> 4) & 1;
case TPG_PAT_CHECKERS_1X1: case TPG_PAT_CHECKERS_1X1:
case TPG_PAT_COLOR_CHECKERS_1X1:
case TPG_PAT_ALTERNATING_HLINES: case TPG_PAT_ALTERNATING_HLINES:
return line & 1; return line & 1;
case TPG_PAT_CHECKERS_2X2:
case TPG_PAT_COLOR_CHECKERS_2X2:
return (line & 2) >> 1;
case TPG_PAT_100_COLORSQUARES: case TPG_PAT_100_COLORSQUARES:
case TPG_PAT_100_HCOLORBAR: case TPG_PAT_100_HCOLORBAR:
return (line * 8) / tpg->src_height; return (line * 8) / tpg->src_height;
@ -789,7 +799,8 @@ static unsigned tpg_get_pat_line(struct tpg_data *tpg, unsigned line)
* Which color should be used for the given pattern line and X coordinate. * Which color should be used for the given pattern line and X coordinate.
* Note: x is in the range 0 to 2 * tpg->src_width. * Note: x is in the range 0 to 2 * tpg->src_width.
*/ */
static enum tpg_color tpg_get_color(struct tpg_data *tpg, unsigned pat_line, unsigned x) static enum tpg_color tpg_get_color(const struct tpg_data *tpg,
unsigned pat_line, unsigned x)
{ {
/* Maximum number of bars are TPG_COLOR_MAX - otherwise, the input print code /* Maximum number of bars are TPG_COLOR_MAX - otherwise, the input print code
should be modified */ should be modified */
@ -836,6 +847,15 @@ static enum tpg_color tpg_get_color(struct tpg_data *tpg, unsigned pat_line, uns
case TPG_PAT_CHECKERS_1X1: case TPG_PAT_CHECKERS_1X1:
return ((x & 1) ^ (pat_line & 1)) ? return ((x & 1) ^ (pat_line & 1)) ?
TPG_COLOR_100_WHITE : TPG_COLOR_100_BLACK; TPG_COLOR_100_WHITE : TPG_COLOR_100_BLACK;
case TPG_PAT_COLOR_CHECKERS_1X1:
return ((x & 1) ^ (pat_line & 1)) ?
TPG_COLOR_100_RED : TPG_COLOR_100_BLUE;
case TPG_PAT_CHECKERS_2X2:
return (((x >> 1) & 1) ^ (pat_line & 1)) ?
TPG_COLOR_100_WHITE : TPG_COLOR_100_BLACK;
case TPG_PAT_COLOR_CHECKERS_2X2:
return (((x >> 1) & 1) ^ (pat_line & 1)) ?
TPG_COLOR_100_RED : TPG_COLOR_100_BLUE;
case TPG_PAT_ALTERNATING_HLINES: case TPG_PAT_ALTERNATING_HLINES:
return pat_line ? TPG_COLOR_100_WHITE : TPG_COLOR_100_BLACK; return pat_line ? TPG_COLOR_100_WHITE : TPG_COLOR_100_BLACK;
case TPG_PAT_ALTERNATING_VLINES: case TPG_PAT_ALTERNATING_VLINES:

3
drivers/media/platform/vivid/vivid-tpg.h
View File

@ -41,7 +41,10 @@ enum tpg_pattern {
TPG_PAT_GREEN, TPG_PAT_GREEN,
TPG_PAT_BLUE, TPG_PAT_BLUE,
TPG_PAT_CHECKERS_16X16, TPG_PAT_CHECKERS_16X16,
TPG_PAT_CHECKERS_2X2,
TPG_PAT_CHECKERS_1X1, TPG_PAT_CHECKERS_1X1,
TPG_PAT_COLOR_CHECKERS_2X2,
TPG_PAT_COLOR_CHECKERS_1X1,
TPG_PAT_ALTERNATING_HLINES, TPG_PAT_ALTERNATING_HLINES,
TPG_PAT_ALTERNATING_VLINES, TPG_PAT_ALTERNATING_VLINES,
TPG_PAT_CROSS_1_PIXEL, TPG_PAT_CROSS_1_PIXEL,