diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-24 01:33:08 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-24 01:33:08 -0300 |
commit | 005392231f73c7f7781c04eebf5869c0174f503e (patch) | |
tree | a261d186361d85d130fe033cc63d575421800727 /v4l2-spec | |
parent | 59964b28e0205cdf0a4465194f40867b7c7f5aa6 (diff) | |
parent | 2da45c822154d03cd7db86ac11b52385f1fac384 (diff) | |
download | mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.gz mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.bz2 |
merge: http://jusst.de/hg/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l2-spec')
-rw-r--r-- | v4l2-spec/Makefile | 1 | ||||
-rw-r--r-- | v4l2-spec/pixfmt.sgml | 5 | ||||
-rw-r--r-- | v4l2-spec/vidioc-enuminput.sgml | 19 |
3 files changed, 24 insertions, 1 deletions
diff --git a/v4l2-spec/Makefile b/v4l2-spec/Makefile index 41dba1cdd..e39136569 100644 --- a/v4l2-spec/Makefile +++ b/v4l2-spec/Makefile @@ -1,5 +1,6 @@ # Also update in v4l2.sgml! VERSION = 0.25 +SHELL=/bin/bash SGMLS = \ biblio.sgml \ diff --git a/v4l2-spec/pixfmt.sgml b/v4l2-spec/pixfmt.sgml index f1a36d396..3f39b408e 100644 --- a/v4l2-spec/pixfmt.sgml +++ b/v4l2-spec/pixfmt.sgml @@ -729,6 +729,11 @@ kernel sources in the file <filename>Documentation/video4linux/cx2341x/README.hm <entry>'PJPG'</entry> <entry>Pixart 73xx JPEG format used by the gspca driver.</entry> </row> + <row id="V4L2-PIX-FMT-SQ905C"> + <entry><constant>V4L2_PIX_FMT_SQ905C</constant></entry> + <entry>'905C'</entry> + <entry>Compressed RGGB bayer format used by the gspca driver.</entry> + </row> <row id="V4L2-PIX-FMT-MJPEG"> <entry><constant>V4L2_PIX_FMT_MJPEG</constant></entry> <entry>'MJPG'</entry> diff --git a/v4l2-spec/vidioc-enuminput.sgml b/v4l2-spec/vidioc-enuminput.sgml index 1c1486b43..824b47e5f 100644 --- a/v4l2-spec/vidioc-enuminput.sgml +++ b/v4l2-spec/vidioc-enuminput.sgml @@ -119,7 +119,7 @@ linkend="standard">.</entry> <entry><structfield>status</structfield></entry> <entry>This field provides status information about the input. See <xref linkend="input-status"> for flags. -<structfield>status</structfield> is only valid when this is the +With the exception of the sensor orientation bits <structfield>status</structfield> is only valid when this is the current input.</entry> </row> <row> @@ -188,6 +188,23 @@ is OK." --> detect color modulation in the signal.</entry> </row> <row> + <entry spanname="hspan">Sensor Orientation</entry> + </row> + <row> + <entry><constant>V4L2_IN_ST_HFLIP</constant></entry> + <entry>0x00000010</entry> + <entry>The input is connected to a device that produces a signal +that is flipped horizontally and does not correct this before passing the +signal to userspace.</entry> + </row> + <row> + <entry><constant>V4L2_IN_ST_VFLIP</constant></entry> + <entry>0x00000020</entry> + <entry>The input is connected to a device that produces a signal +that is flipped vertically and does not correct this before passing the +signal to userspace. Note that a 180 degree rotation is the same as HFLIP | VFLIP</entry> + </row> + <row> <entry spanname="hspan">Analog Video</entry> </row> <row> |