| Message ID | 1453725585-4165-3-git-send-email-sakari.ailus@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Sakari, Thank you for the patch. On Monday 25 January 2016 14:39:43 Sakari Ailus wrote: > Instead of manually adding each and every new media bus pixel code to > libv4l2subdev, generate the list automatically. The pre-existing formats > that do not match the list are not modified so that existing users are > unaffected by this change, with the exception of converting codes to > strings, which will use the new definitions. > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > utils/media-ctl/.gitignore | 1 + > utils/media-ctl/Makefile.am | 8 ++++++++ > utils/media-ctl/libv4l2subdev.c | 1 + > 3 files changed, 10 insertions(+) > > diff --git a/utils/media-ctl/.gitignore b/utils/media-ctl/.gitignore > index 95b6a57..799ab33 100644 > --- a/utils/media-ctl/.gitignore > +++ b/utils/media-ctl/.gitignore > @@ -1 +1,2 @@ > media-ctl > +media-bus-format-names.h > diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am > index a3931fb..23ad90b 100644 > --- a/utils/media-ctl/Makefile.am > +++ b/utils/media-ctl/Makefile.am > @@ -4,6 +4,14 @@ libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h > libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) > libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) > > +media-bus-format-names.h: ../../include/linux/media-bus-format.h > + sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; > s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ + < $< > $@ > + > +BUILT_SOURCES = media-bus-format-names.h > +CLEANFILES = $(BUILT_SOURCES) > + > +nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) > libv4l2subdev_la_SOURCES = libv4l2subdev.c > libv4l2subdev_la_LIBADD = libmediactl.la > libv4l2subdev_la_CFLAGS = -static > diff --git a/utils/media-ctl/libv4l2subdev.c > b/utils/media-ctl/libv4l2subdev.c index e45834f..f3c0a9a 100644 > --- a/utils/media-ctl/libv4l2subdev.c > +++ b/utils/media-ctl/libv4l2subdev.c > @@ -719,6 +719,7 @@ static const struct { > const char *name; > enum v4l2_mbus_pixelcode code; > } mbus_formats[] = { > +#include "media-bus-format-names.h" > { "Y8", MEDIA_BUS_FMT_Y8_1X8}, > { "Y10", MEDIA_BUS_FMT_Y10_1X10 }, > { "Y12", MEDIA_BUS_FMT_Y12_1X12 },
diff --git a/utils/media-ctl/.gitignore b/utils/media-ctl/.gitignore index 95b6a57..799ab33 100644 --- a/utils/media-ctl/.gitignore +++ b/utils/media-ctl/.gitignore @@ -1 +1,2 @@ media-ctl +media-bus-format-names.h diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am index a3931fb..23ad90b 100644 --- a/utils/media-ctl/Makefile.am +++ b/utils/media-ctl/Makefile.am @@ -4,6 +4,14 @@ libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) +media-bus-format-names.h: ../../include/linux/media-bus-format.h + sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ + < $< > $@ + +BUILT_SOURCES = media-bus-format-names.h +CLEANFILES = $(BUILT_SOURCES) + +nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) libv4l2subdev_la_SOURCES = libv4l2subdev.c libv4l2subdev_la_LIBADD = libmediactl.la libv4l2subdev_la_CFLAGS = -static diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c index e45834f..f3c0a9a 100644 --- a/utils/media-ctl/libv4l2subdev.c +++ b/utils/media-ctl/libv4l2subdev.c @@ -719,6 +719,7 @@ static const struct { const char *name; enum v4l2_mbus_pixelcode code; } mbus_formats[] = { +#include "media-bus-format-names.h" { "Y8", MEDIA_BUS_FMT_Y8_1X8}, { "Y10", MEDIA_BUS_FMT_Y10_1X10 }, { "Y12", MEDIA_BUS_FMT_Y12_1X12 },
Instead of manually adding each and every new media bus pixel code to libv4l2subdev, generate the list automatically. The pre-existing formats that do not match the list are not modified so that existing users are unaffected by this change, with the exception of converting codes to strings, which will use the new definitions. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- utils/media-ctl/.gitignore | 1 + utils/media-ctl/Makefile.am | 8 ++++++++ utils/media-ctl/libv4l2subdev.c | 1 + 3 files changed, 10 insertions(+)