diff options
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | yavta.c | 251 |
2 files changed, 223 insertions, 49 deletions
diff --git a/Makefile b/Makefile deleted file mode 100644 index 8965ad7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -CROSS_COMPILE ?= - -CC := $(CROSS_COMPILE)gcc -CFLAGS ?= -O2 -W -Wall -Iinclude -LDFLAGS ?= -LIBS := -lrt - -$(warning WARNING: Makefile support is deprecated, please switch to meson) - -%.o : %.c - $(CC) $(CFLAGS) -c -o $@ $< - -all: yavta - -yavta: yavta.o - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - -clean: - -rm -f *.o - -rm -f yavta - @@ -185,6 +185,80 @@ static int pause_init(void) } /* ----------------------------------------------------------------------------- + * Key-value pairs handling + */ + +struct key_value { + const char *name; + unsigned int value; +}; + +static int __key_value_get(const struct key_value *values, + unsigned int count, const char *name) +{ + unsigned int i; + + for (i = 0; i < count; ++i) { + if (!strcasecmp(values[i].name, name)) + return values[i].value; + } + + return -EINVAL; +} + +static void __key_value_list(const struct key_value *values, + unsigned int count, const char *type) +{ + unsigned int chars; + unsigned int i; + bool first = true; + + chars = printf("%s: ", type); + + for (i = 0; i < count; ++i) { + unsigned int len = strlen(values[i].name); + + if (chars + len >= 80) { + printf(",\n\t"); + chars = 8; + first = true; + } + + if (first) + first = false; + else + chars += printf(", "); + + chars += printf("%s", values[i].name); + } + + printf("\n"); +} + +static const char *__key_value_name(const struct key_value *values, + unsigned int count, unsigned int value, + const char *def_value) +{ + unsigned int i; + + for (i = 0; i < count; ++i) { + if (values[i].value == value) + return values[i].name; + } + + return def_value; +} + +#define key_value_get(values, name) \ + __key_value_get(values, ARRAY_SIZE(values), name) + +#define key_value_list(values, type) \ + __key_value_list(values, ARRAY_SIZE(values), type) + +#define key_value_name(values, value, def_value) \ + __key_value_name(values, ARRAY_SIZE(values), value, def_value) + +/* ----------------------------------------------------------------------------- * Format handling */ @@ -409,10 +483,7 @@ static const char *v4l2_format_name(unsigned int fourcc) return name; } -static const struct { - const char *name; - enum v4l2_field field; -} fields[] = { +static const struct key_value v4l2_fields[] = { { "any", V4L2_FIELD_ANY }, { "none", V4L2_FIELD_NONE }, { "top", V4L2_FIELD_TOP }, @@ -425,29 +496,78 @@ static const struct { { "interlaced-bt", V4L2_FIELD_INTERLACED_BT }, }; -static enum v4l2_field v4l2_field_from_string(const char *name) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(fields); ++i) { - if (strcasecmp(fields[i].name, name) == 0) - return fields[i].field; - } +#define v4l2_field_from_string(name) \ + key_value_get(v4l2_fields, name) + +#define v4l2_field_name(field) \ + key_value_name(v4l2_fields, field, "unknown") + +static const struct key_value v4l2_colorspaces[] = { + { "DEFAULT", V4L2_COLORSPACE_DEFAULT }, + { "SMPTE170M", V4L2_COLORSPACE_SMPTE170M }, + { "SMPTE240M", V4L2_COLORSPACE_SMPTE240M }, + { "REC709", V4L2_COLORSPACE_REC709 }, + { "BT878", V4L2_COLORSPACE_BT878 }, + { "470_SYSTEM_M", V4L2_COLORSPACE_470_SYSTEM_M }, + { "470_SYSTEM_BG", V4L2_COLORSPACE_470_SYSTEM_BG }, + { "JPEG", V4L2_COLORSPACE_JPEG }, + { "SRGB", V4L2_COLORSPACE_SRGB }, + { "OPRGB", V4L2_COLORSPACE_OPRGB }, + { "BT2020", V4L2_COLORSPACE_BT2020 }, + { "RAW", V4L2_COLORSPACE_RAW }, + { "DCI_P3", V4L2_COLORSPACE_DCI_P3 }, +}; - return -1; -} +static const struct key_value v4l2_xfer_funcs[] = { + { "DEFAULT", V4L2_COLORSPACE_DEFAULT }, + { "709", V4L2_XFER_FUNC_709 }, + { "SRGB", V4L2_XFER_FUNC_SRGB }, + { "OPRGB", V4L2_XFER_FUNC_OPRGB }, + { "SMPTE240M", V4L2_XFER_FUNC_SMPTE240M }, + { "NONE", V4L2_XFER_FUNC_NONE }, + { "DCI_P3", V4L2_XFER_FUNC_DCI_P3 }, + { "SMPTE2084", V4L2_XFER_FUNC_SMPTE2084 }, +}; -static const char *v4l2_field_name(enum v4l2_field field) -{ - unsigned int i; +static const struct key_value v4l2_encodings[] = { + /* enum v4l2_ycbcr_encoding */ + { "DEFAULT", V4L2_YCBCR_ENC_DEFAULT }, + { "601", V4L2_YCBCR_ENC_601 }, + { "709", V4L2_YCBCR_ENC_709 }, + { "XV601", V4L2_YCBCR_ENC_XV601 }, + { "XV709", V4L2_YCBCR_ENC_XV709 }, + { "SYCC", V4L2_YCBCR_ENC_SYCC }, + { "BT2020", V4L2_YCBCR_ENC_BT2020 }, + { "BT2020_CONST_LUM", V4L2_YCBCR_ENC_BT2020_CONST_LUM }, + { "SMPTE240M", V4L2_YCBCR_ENC_SMPTE240M }, + /* enum v4l2_hsv_encoding */ + { "HSV180", V4L2_HSV_ENC_180 }, + { "HSV256", V4L2_HSV_ENC_256 }, +}; - for (i = 0; i < ARRAY_SIZE(fields); ++i) { - if (fields[i].field == field) - return fields[i].name; - } +static const struct key_value v4l2_quantizations[] = { + { "DEFAULT", V4L2_QUANTIZATION_DEFAULT }, + { "FULL_RANGE", V4L2_QUANTIZATION_FULL_RANGE }, + { "LIM_RANGE", V4L2_QUANTIZATION_LIM_RANGE }, +}; - return "unknown"; -} +#define v4l2_colorspace_from_string(name) \ + key_value_get(v4l2_colorspaces, name) +#define v4l2_xfer_func_from_string(name) \ + key_value_get(v4l2_xfer_funcs, name) +#define v4l2_encoding_from_string(name) \ + key_value_get(v4l2_encodings, name) +#define v4l2_quantization_from_string(name) \ + key_value_get(v4l2_quantizations, name) + +#define list_colorspaces() \ + key_value_list(v4l2_colorspaces, "colorspace") +#define list_xfer_funcs() \ + key_value_list(v4l2_xfer_funcs, "xfer-func") +#define list_encodings() \ + key_value_list(v4l2_encodings, "encoding") +#define list_quantizations() \ + key_value_list(v4l2_quantizations, "quantization") /* ----------------------------------------------------------------------------- * @@ -797,6 +917,10 @@ static int video_get_format(struct device *dev) static int video_set_format(struct device *dev, unsigned int w, unsigned int h, unsigned int format, unsigned int stride, unsigned int buffer_size, enum v4l2_field field, + enum v4l2_colorspace colorspace, + enum v4l2_xfer_func xfer_func, + enum v4l2_ycbcr_encoding encoding, + enum v4l2_quantization quantization, unsigned int flags) { struct v4l2_format fmt; @@ -814,7 +938,11 @@ static int video_set_format(struct device *dev, unsigned int w, unsigned int h, fmt.fmt.pix_mp.pixelformat = format; fmt.fmt.pix_mp.field = field; fmt.fmt.pix_mp.num_planes = info->n_planes; + fmt.fmt.pix_mp.colorspace = colorspace; fmt.fmt.pix_mp.flags = flags; + fmt.fmt.pix_mp.ycbcr_enc = encoding; + fmt.fmt.pix_mp.quantization = quantization; + fmt.fmt.pix_mp.xfer_func = xfer_func; for (i = 0; i < fmt.fmt.pix_mp.num_planes; i++) { fmt.fmt.pix_mp.plane_fmt[i].bytesperline = stride; @@ -830,8 +958,12 @@ static int video_set_format(struct device *dev, unsigned int w, unsigned int h, fmt.fmt.pix.field = field; fmt.fmt.pix.bytesperline = stride; fmt.fmt.pix.sizeimage = buffer_size; + fmt.fmt.pix.colorspace = colorspace; fmt.fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC; fmt.fmt.pix.flags = flags; + fmt.fmt.pix.ycbcr_enc = encoding; + fmt.fmt.pix.quantization = quantization; + fmt.fmt.pix.xfer_func = xfer_func; } ret = ioctl(dev->fd, VIDIOC_S_FMT, &fmt); @@ -1308,8 +1440,8 @@ static void video_query_menu(struct device *dev, printf(" %u: %.32s%s\n", menu.index, menu.name, menu.index == value ? " (*)" : ""); else - printf(" %u: %" PRId64 "%s\n", menu.index, - (int64_t)menu.value, + printf(" %u: %" PRId64 " (0x%" PRIx64 ")%s\n", menu.index, + (int64_t)menu.value, (int64_t)menu.value, menu.index == value ? " (*)" : ""); }; } @@ -2298,6 +2430,8 @@ static void usage(const char *argv0) printf(" --buffer-size Buffer size in bytes\n"); printf(" --enum-formats Enumerate formats\n"); printf(" --enum-inputs Enumerate inputs\n"); + printf(" --colorspace colorspace Set the colorspace\n"); + printf(" --encoding encoding Set the YCbCr encoding\n"); printf(" --fd Use a numeric file descriptor insted of a device\n"); printf(" --field field Set the format field order\n"); printf("\tValid values for field are none, top, bottom, interlaced, seq-tb, seq-bt,\n"); @@ -2306,6 +2440,7 @@ static void usage(const char *argv0) printf(" --no-query Don't query capabilities on open\n"); printf(" --offset User pointer buffer offset from page start\n"); printf(" --premultiplied Color components are premultiplied by alpha value\n"); + printf(" --quantization quantization Set the quantization\n"); printf(" --queue-late Queue buffers after streamon, not before\n"); printf(" --requeue-last Requeue the last buffers before streamoff\n"); printf(" --reset-controls Reset all available controls to their default value\n"); @@ -2313,6 +2448,13 @@ static void usage(const char *argv0) printf(" --skip n Skip the first n frames\n"); printf(" --sleep-forever Sleep forever after configuring the device\n"); printf(" --stride value Line stride in bytes\n"); + printf(" --xfer-func xfer-func Set the transfer function\n"); + + printf("\nValid fields values:\n"); + list_colorspaces(); + list_encodings(); + list_quantizations(); + list_xfer_funcs(); } #define OPT_ENUM_FORMATS 256 @@ -2332,14 +2474,20 @@ static void usage(const char *argv0) #define OPT_QUEUE_LATE 270 #define OPT_DATA_PREFIX 271 #define OPT_RESET_CONTROLS 272 +#define OPT_COLORSPACE 273 +#define OPT_XFER_FUNC 274 +#define OPT_ENCODING 275 +#define OPT_QUANTIZATION 276 static const struct option opts[] = { {"buffer-size", 1, 0, OPT_BUFFER_SIZE}, {"buffer-type", 1, 0, 'B'}, {"capture", 2, 0, 'c'}, {"check-overrun", 0, 0, 'C'}, + {"colorspace", 1, 0, OPT_COLORSPACE}, {"data-prefix", 0, 0, OPT_DATA_PREFIX}, {"delay", 1, 0, 'd'}, + {"encoding", 1, 0, OPT_ENCODING}, {"enum-formats", 0, 0, OPT_ENUM_FORMATS}, {"enum-inputs", 0, 0, OPT_ENUM_INPUTS}, {"fd", 1, 0, OPT_FD}, @@ -2357,6 +2505,7 @@ static const struct option opts[] = { {"pause", 2, 0, 'p'}, {"premultiplied", 0, 0, OPT_PREMULTIPLIED}, {"quality", 1, 0, 'q'}, + {"quantization", 1, 0, OPT_QUANTIZATION}, {"queue-late", 0, 0, OPT_QUEUE_LATE}, {"get-control", 1, 0, 'r'}, {"requeue-last", 0, 0, OPT_REQUEUE_LAST}, @@ -2370,6 +2519,7 @@ static const struct option opts[] = { {"time-per-frame", 1, 0, 't'}, {"timestamp-source", 1, 0, OPT_TSTAMP_SRC}, {"userptr", 0, 0, 'u'}, + {"xfer-func", 1, 0, OPT_XFER_FUNC}, {0, 0, 0, 0} }; @@ -2392,6 +2542,7 @@ int main(int argc, char *argv[]) int do_sleep_forever = 0, do_requeue_last = 0; int do_rt = 0, do_log_status = 0; int no_query = 0, do_queue_late = 0; + int do_csc = 0; char *endptr; int c; @@ -2415,6 +2566,10 @@ int main(int argc, char *argv[]) unsigned int pause_count = (unsigned int)-1; struct v4l2_fract time_per_frame = {1, 25}; enum v4l2_field field = V4L2_FIELD_ANY; + enum v4l2_colorspace colorspace = V4L2_COLORSPACE_DEFAULT; + enum v4l2_xfer_func xfer_func = V4L2_XFER_FUNC_DEFAULT; + enum v4l2_ycbcr_encoding encoding = V4L2_YCBCR_ENC_DEFAULT; + enum v4l2_quantization quantization = V4L2_QUANTIZATION_DEFAULT; /* Capture loop */ enum buffer_fill_mode fill_mode = BUFFER_FILL_NONE; @@ -2547,6 +2702,27 @@ int main(int argc, char *argv[]) case OPT_BUFFER_SIZE: buffer_size = atoi(optarg); break; + case OPT_COLORSPACE: + ret = v4l2_colorspace_from_string(optarg); + if (ret < 0) { + printf("Invalid colorspace value '%s'\n", optarg); + return 1; + } + colorspace = ret; + do_csc = 1; + break; + case OPT_DATA_PREFIX: + dev.write_data_prefix = true; + break; + case OPT_ENCODING: + ret = v4l2_encoding_from_string(optarg); + if (ret < 0) { + printf("Invalid encoding value '%s'\n", optarg); + return 1; + } + encoding = ret; + do_csc = 1; + break; case OPT_ENUM_FORMATS: do_enum_formats = 1; break; @@ -2578,6 +2754,15 @@ int main(int argc, char *argv[]) case OPT_PREMULTIPLIED: fmt_flags |= V4L2_PIX_FMT_FLAG_PREMUL_ALPHA; break; + case OPT_QUANTIZATION: + ret = v4l2_quantization_from_string(optarg); + if (ret < 0) { + printf("Invalid quantization value '%s'\n", optarg); + return 1; + } + quantization = ret; + do_csc = 1; + break; case OPT_QUEUE_LATE: do_queue_late = 1; break; @@ -2609,8 +2794,14 @@ int main(int argc, char *argv[]) case OPT_USERPTR_OFFSET: userptr_offset = atoi(optarg); break; - case OPT_DATA_PREFIX: - dev.write_data_prefix = true; + case OPT_XFER_FUNC: + ret = v4l2_xfer_func_from_string(optarg); + if (ret < 0) { + printf("Invalid xfer-func value '%s'\n", optarg); + return 1; + } + xfer_func = ret; + do_csc = 1; break; default: printf("Invalid option -%c\n", c); @@ -2702,8 +2893,12 @@ int main(int argc, char *argv[]) /* Set the video format. */ if (do_set_format) { + if (do_csc && video_is_capture(&dev)) + fmt_flags |= V4L2_PIX_FMT_FLAG_SET_CSC; + if (video_set_format(&dev, width, height, pixelformat, stride, - buffer_size, field, fmt_flags) < 0) { + buffer_size, field, colorspace, xfer_func, + encoding, quantization, fmt_flags) < 0) { video_close(&dev); return 1; } |