On Mon, 2017-02-13 at 10:40 +0100, Hans Verkuil wrote:
> On 02/13/2017 10:33 AM, Philipp Zabel wrote:
> > media-ctl can be used to propagate v4l2 subdevice pad formats from
> > source pads of one subdevice to another one's sink pads. These formats
> > include colorimetry information, so media-ctl should be able to print
> > or change it using the --set/get-v4l2 option.
> >
> > Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> > Acked-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
>
> Just one small comment:
>
> > ---
> > utils/media-ctl/libv4l2subdev.c | 263 ++++++++++++++++++++++++++++++++++++++++
> > utils/media-ctl/media-ctl.c | 17 +++
> > utils/media-ctl/options.c | 22 +++-
> > utils/media-ctl/v4l2subdev.h | 80 ++++++++++++
> > 4 files changed, 381 insertions(+), 1 deletion(-)
> >
> > diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c
> > index 7f9ef48..c918777 100644
> > --- a/utils/media-ctl/libv4l2subdev.c
> > +++ b/utils/media-ctl/libv4l2subdev.c
> > @@ -511,6 +511,118 @@ static struct media_pad *v4l2_subdev_parse_pad_format(
> > continue;
> > }
> >
> > + if (strhazit("colorspace:", &p)) {
> > + enum v4l2_colorspace colorspace;
> > + char *strfield;
> > +
> > + for (end = (char *)p; isalnum(*end) || *end == '-';
> > + ++end);
> > +
> > + strfield = strndup(p, end - p);
> > + if (!strfield) {
> > + *endp = (char *)p;
> > + return NULL;
> > + }
> > +
> > + colorspace = v4l2_subdev_string_to_colorspace(strfield);
> > + free(strfield);
> > + if (colorspace == (enum v4l2_colorspace)-1) {
> > + media_dbg(media, "Invalid colorspace value '%*s'\n",
> > + end - p, p);
> > + *endp = (char *)p;
> > + return NULL;
> > + }
> > +
> > + format->colorspace = colorspace;
> > +
> > + p = end;
> > + continue;
> > + }
> > +
> > + if (strhazit("xfer:", &p)) {
> > + enum v4l2_xfer_func xfer_func;
> > + char *strfield;
> > +
> > + for (end = (char *)p; isalnum(*end) || *end == '-';
> > + ++end);
> > +
> > + strfield = strndup(p, end - p);
> > + if (!strfield) {
> > + *endp = (char *)p;
> > + return NULL;
> > + }
> > +
> > + xfer_func = v4l2_subdev_string_to_xfer_func(strfield);
> > + free(strfield);
> > + if (xfer_func == (enum v4l2_xfer_func)-1) {
> > + media_dbg(media, "Invalid transfer function value '%*s'\n",
> > + end - p, p);
> > + *endp = (char *)p;
> > + return NULL;
> > + }
> > +
> > + format->xfer_func = xfer_func;
> > +
> > + p = end;
> > + continue;
> > + }
> > +
> > + if (strhazit("ycbcr:", &p)) {
> > + enum v4l2_ycbcr_encoding ycbcr_enc;
> > + char *strfield;
> > +
> > + for (end = (char *)p; isalnum(*end) || *end == '-';
> > + ++end);
> > +
> > + strfield = strndup(p, end - p);
> > + if (!strfield) {
> > + *endp = (char *)p;
> > + return NULL;
> > + }
> > +
> > + ycbcr_enc = v4l2_subdev_string_to_ycbcr_encoding(strfield);
> > + free(strfield);
> > + if (ycbcr_enc == (enum v4l2_ycbcr_encoding)-1) {
> > + media_dbg(media, "Invalid YCbCr encoding value '%*s'\n",
> > + end - p, p);
> > + *endp = (char *)p;
> > + return NULL;
> > + }
> > +
> > + format->ycbcr_enc = ycbcr_enc;
> > +
> > + p = end;
> > + continue;
> > + }
> > +
> > + if (strhazit("quantization:", &p)) {
> > + enum v4l2_quantization quantization;
> > + char *strfield;
> > +
> > + for (end = (char *)p; isalnum(*end) || *end == '-';
> > + ++end);
> > +
> > + strfield = strndup(p, end - p);
> > + if (!strfield) {
> > + *endp = (char *)p;
> > + return NULL;
> > + }
> > +
> > + quantization = v4l2_subdev_string_to_quantization(strfield);
> > + free(strfield);
> > + if (quantization == (enum v4l2_quantization)-1) {
> > + media_dbg(media, "Invalid quantization value '%*s'\n",
> > + end - p, p);
> > + *endp = (char *)p;
> > + return NULL;
> > + }
> > +
> > + format->quantization = quantization;
> > +
> > + p = end;
> > + continue;
> > + }
> > +
> > /*
> > * Backward compatibility: crop rectangles can be specified
> > * implicitly without the 'crop:' property name.
> > @@ -839,6 +951,157 @@ enum v4l2_field v4l2_subdev_string_to_field(const char *string)
> > return (enum v4l2_field)-1;
> > }
> >
> > +static struct {
> > + const char *name;
> > + enum v4l2_colorspace colorspace;
> > +} colorspaces[] = {
> > + { "default", V4L2_COLORSPACE_DEFAULT },
> > + { "smpte170m", V4L2_COLORSPACE_SMPTE170M },
> > + { "smpte240m", V4L2_COLORSPACE_SMPTE240M },
> > + { "rec709", V4L2_COLORSPACE_REC709 },
> > + { "bt878", V4L2_COLORSPACE_BT878 },
>
> Drop this, it's no longer used in the kernel.
Done, thanks.
regards
Philipp
