On Fri, Oct 23, 2015 at 12:18:21PM +0300, Laurent Pinchart wrote:
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> utils/media-ctl/libv4l2subdev.c | 62 +++++++++++++++++++++++++++++++++++++++++
> utils/media-ctl/media-ctl.c | 3 ++
> utils/media-ctl/v4l2subdev.h | 25 ++++++++++++++++-
> 3 files changed, 89 insertions(+), 1 deletion(-)
>
> Old patch that was dying of boredom alone in my tree. As Sakari needs this
> features it seems to be a good time to remove the dust and submit it.
>
> diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c
> index 8015330ddb3c..ad3bb727aa07 100644
> --- a/utils/media-ctl/libv4l2subdev.c
> +++ b/utils/media-ctl/libv4l2subdev.c
> @@ -473,6 +473,24 @@ static struct media_pad *v4l2_subdev_parse_pad_format(
> continue;
> }
>
> + if (strhazit("field:", &p)) {
> + enum v4l2_field field;
> +
> + for (end = (char *)p; isalpha(*end) || *end == '-'; ++end);
> +
> + field = v4l2_subdev_string_to_field(p, end - p);
> + if (field == (enum v4l2_field)-1) {
> + media_dbg(media, "Invalid field value '%*s'\n", end - p, p);
Hmm. Also the field: documentation is missing and, well, it always must be
specified with the format. A separate configuration for it suggests it's
different.
I might actually favour the approach I took, but perhaps including some
aspects of your patch. I'll send mine...
> + *endp = (char *)p;
> + return NULL;
> + }
> +
> + format->field = field;
> +
> + p = end;
> + continue;
> + }
> +
> /*
> * Backward compatibility: crop rectangles can be specified
> * implicitly without the 'crop:' property name.
> @@ -755,3 +773,47 @@ enum v4l2_mbus_pixelcode v4l2_subdev_string_to_pixelcode(const char *string,
>
> return mbus_formats[i].code;
> }
> +
> +static struct {
> + const char *name;
> + enum v4l2_field field;
> +} fields[] = {
> + { "any", V4L2_FIELD_ANY },
> + { "none", V4L2_FIELD_NONE },
> + { "top", V4L2_FIELD_TOP },
> + { "bottom", V4L2_FIELD_BOTTOM },
> + { "interlaced", V4L2_FIELD_INTERLACED },
> + { "seq-tb", V4L2_FIELD_SEQ_TB },
> + { "seq-bt", V4L2_FIELD_SEQ_BT },
> + { "alternate", V4L2_FIELD_ALTERNATE },
> + { "interlaced-tb", V4L2_FIELD_INTERLACED_TB },
> + { "interlaced-bt", V4L2_FIELD_INTERLACED_BT },
> +};
> +
> +const char *v4l2_subdev_field_to_string(enum v4l2_field field)
> +{
> + unsigned int i;
> +
> + for (i = 0; i < ARRAY_SIZE(fields); ++i) {
> + if (fields[i].field == field)
> + return fields[i].name;
> + }
> +
> + return "unknown";
> +}
> +
> +enum v4l2_field v4l2_subdev_string_to_field(const char *string,
> + unsigned int length)
> +{
> + unsigned int i;
> +
> + for (i = 0; i < ARRAY_SIZE(fields); ++i) {
> + if (strncmp(fields[i].name, string, length) == 0)
> + break;
> + }
> +
> + if (i == ARRAY_SIZE(fields))
> + return (enum v4l2_field)-1;
> +
> + return fields[i].field;
> +}
> diff --git a/utils/media-ctl/media-ctl.c b/utils/media-ctl/media-ctl.c
> index d3f6e041db7b..3002fb7e4e12 100644
> --- a/utils/media-ctl/media-ctl.c
> +++ b/utils/media-ctl/media-ctl.c
> @@ -90,6 +90,9 @@ static void v4l2_subdev_print_format(struct media_entity *entity,
> v4l2_subdev_pixelcode_to_string(format.code),
> format.width, format.height);
>
> + if (format.field)
> + printf(" field:%s", v4l2_subdev_field_to_string(format.field));
> +
> ret = v4l2_subdev_get_selection(entity, &rect, pad,
> V4L2_SEL_TGT_CROP_BOUNDS,
> which);
> diff --git a/utils/media-ctl/v4l2subdev.h b/utils/media-ctl/v4l2subdev.h
> index 1cb53ffbcfab..9138b87e0976 100644
> --- a/utils/media-ctl/v4l2subdev.h
> +++ b/utils/media-ctl/v4l2subdev.h
> @@ -247,7 +247,7 @@ const char *v4l2_subdev_pixelcode_to_string(enum v4l2_mbus_pixelcode code);
> /**
> * @brief Parse string to media bus pixel code.
> * @param string - input string
> - * @param lenght - length of the string
> + * @param length - length of the string
> *
> * Parse human readable string @a string to an media bus pixel code.
> *
> @@ -255,4 +255,27 @@ const char *v4l2_subdev_pixelcode_to_string(enum v4l2_mbus_pixelcode code);
> */
> enum v4l2_mbus_pixelcode v4l2_subdev_string_to_pixelcode(const char *string,
> unsigned int length);
> +
> +/**
> + * @brief Convert a field order to string.
> + * @param field - field order
> + *
> + * Convert field order @a field to a human-readable string.
> + *
> + * @return A pointer to a string on success, NULL on failure.
> + */
> +const char *v4l2_subdev_field_to_string(enum v4l2_field field);
> +
> +/**
> + * @brief Parse string to field order.
> + * @param string - input string
> + * @param length - length of the string
> + *
> + * Parse human readable string @a string to field order.
> + *
> + * @return field order on success, -1 on failure.
> + */
> +enum v4l2_field v4l2_subdev_string_to_field(const char *string,
> + unsigned int length);
> +
> #endif
--
Sakari Ailus
e-mail: sakari.ailus@xxxxxx XMPP: sailus@xxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
