scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 01:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Testcard: option to set arbitrary color as pattern

Browse Source
This commit is contained in:
Martin Pulec
2019-03-07 21:29:21 +01:00
committed by Martin Pulec
parent 0b7dd5a1b7
commit 6995b6c2c8
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/video_capture/testcard.cpp
View File

@@ -96,7 +96,7 @@ enum class image_pattern : int {
NOISE
};
#define BLANK_PATTERN 0xff000000
#define DEFAULT_BLANK_COLOR 0xff000000
struct testcard_state {
std::chrono::steady_clock::time_point last_frame_time;
@@ -121,6 +121,7 @@ struct testcard_state {
unsigned int still_image;
enum image_pattern pattern;
uint32_t blank_color = DEFAULT_BLANK_COLOR;
};
static void testcard_fillRect(struct testcard_pixmap *s, struct testcard_rect *r, int color)
@@ -305,7 +306,7 @@ static int vidcap_testcard_init(const struct vidcap_params *params, void **state
if (vidcap_params_get_fmt(params) == NULL || strcmp(vidcap_params_get_fmt(params), "help") == 0) {
printf("testcard options:\n");
printf("\t-t testcard:<width>:<height>:<fps>:<codec>[:filename=<filename>][:p][:s=<X>x<Y>][:i|:sf][:still][:pattern=bars|blank|noise]\n");
printf("\t-t testcard:<width>:<height>:<fps>:<codec>[:filename=<filename>][:p][:s=<X>x<Y>][:i|:sf][:still][:pattern=bars|blank|noise|0x<AAGGBBRR>]\n");
printf("\t<filename> - use file named filename instead of default bars\n");
printf("\tp - pan with frame\n");
printf("\ts - split the frames into XxY separate tiles\n");
@@ -470,6 +471,12 @@ static int vidcap_testcard_init(const struct vidcap_params *params, void **state
s->pattern = image_pattern::BLANK;
} else if (strcmp(pattern, "noise") == 0) {
s->pattern = image_pattern::NOISE;
} else if (strstr(pattern, "0x") == pattern) {
s->pattern = image_pattern::BLANK;
if (sscanf(pattern + 2, "%x", &s->blank_color) != 1) {
LOG(LOG_LEVEL_ERROR) << "[testcard] Wrong color!\n";
goto error;
}
} else {
fprintf(stderr, "[testcard] Unknown pattern!\n");;
goto error;
@@ -491,7 +498,7 @@ static int vidcap_testcard_init(const struct vidcap_params *params, void **state
if (s->pattern == image_pattern::BLANK) {
for (int i = 0; i < pixmap_len / 4; ++i) {
((uint32_t *) s->pixmap.data)[i] = BLANK_PATTERN;
((uint32_t *) s->pixmap.data)[i] = s->blank_color;
}
} else if (s->pattern == image_pattern::NOISE) {