From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: laurent.pinchart@ideasonboard.com, hverkuil@xs4all.nl
Subject: [v4l-utils PATCH v2 1/3] libv4l2subdev: Use generated format definitions in libv4l2subdev
Date: Tue, 8 Dec 2015 17:15:14 +0200 [thread overview]
Message-ID: <1449587716-22954-2-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1449587716-22954-1-git-send-email-sakari.ailus@linux.intel.com>
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(+)
diff --git a/utils/media-ctl/.gitignore b/utils/media-ctl/.gitignore
index 95b6a57..8c7d576 100644
--- a/utils/media-ctl/.gitignore
+++ b/utils/media-ctl/.gitignore
@@ -1 +1,2 @@
media-ctl
+media-bus-formats.h
diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am
index a3931fb..a1a9225 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-formats.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-formats.h
+CLEANFILES = media-bus-formats.h
+
+nodist_libv4l2subdev_la_SOURCES = media-bus-formats.h
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 33c1ee6..5bcfe34 100644
--- a/utils/media-ctl/libv4l2subdev.c
+++ b/utils/media-ctl/libv4l2subdev.c
@@ -719,6 +719,7 @@ static struct {
const char *name;
enum v4l2_mbus_pixelcode code;
} mbus_formats[] = {
+#include "media-bus-formats.h"
{ "Y8", MEDIA_BUS_FMT_Y8_1X8},
{ "Y10", MEDIA_BUS_FMT_Y10_1X10 },
{ "Y12", MEDIA_BUS_FMT_Y12_1X12 },
--
2.1.0.231.g7484e3b
next prev parent reply other threads:[~2015-12-08 15:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-08 15:15 [v4l-utils PATCH v2 0/3] List supported formats in libv4l2subdev Sakari Ailus
2015-12-08 15:15 ` Sakari Ailus [this message]
2015-12-13 21:36 ` [v4l-utils PATCH v2 1/3] libv4l2subdev: Use generated format definitions " Laurent Pinchart
2015-12-08 15:15 ` [v4l-utils PATCH v2 2/3] libv4l2subdev: Add a function to list library supported pixel codes Sakari Ailus
2015-12-13 21:39 ` Laurent Pinchart
2016-01-22 12:23 ` Sakari Ailus
2016-01-22 13:36 ` Sakari Ailus
2016-01-24 20:27 ` Laurent Pinchart
2015-12-08 15:15 ` [v4l-utils PATCH v2 3/3] media-ctl: List supported media bus formats Sakari Ailus
2016-01-22 12:15 ` [v4l-utils PATCH v2 0/3] List supported formats in libv4l2subdev Hans Verkuil
2016-01-22 12:26 ` Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449587716-22954-2-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox