aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r--Documentation/DocBook/media/v4l/controls.xml11
-rw-r--r--Documentation/DocBook/media/v4l/pixfmt-srggb10.xml2
-rw-r--r--Documentation/DocBook/media/v4l/pixfmt-srggb10alaw8.xml2
-rw-r--r--Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml2
-rw-r--r--Documentation/DocBook/media/v4l/pixfmt-srggb10p.xml99
-rw-r--r--Documentation/DocBook/media/v4l/pixfmt-srggb12.xml2
-rw-r--r--Documentation/DocBook/media/v4l/pixfmt.xml1
-rw-r--r--Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml8
-rw-r--r--Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml8
9 files changed, 109 insertions, 26 deletions
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index e013e4bf244c..4e9462f1ab4c 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -2692,12 +2692,11 @@ in the S5P family of SoCs by Samsung.
2692 <row><entry></entry></row> 2692 <row><entry></entry></row>
2693 <row> 2693 <row>
2694 <entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE</constant>&nbsp;</entry> 2694 <entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE</constant>&nbsp;</entry>
2695 <entry>integer</entry> 2695 <entry>boolean</entry>
2696 </row><row><entry spanname="descr">If the display delay is enabled then the decoder has to return a 2696 </row><row><entry spanname="descr">If the display delay is enabled then the decoder is forced to return a
2697CAPTURE buffer after processing a certain number of OUTPUT buffers. If this number is low, then it may result in 2697CAPTURE buffer (decoded frame) after processing a certain number of OUTPUT buffers. The delay can be set through
2698buffers not being dequeued in display order. In addition hardware may still use those buffers as reference, thus 2698<constant>V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY</constant>. This feature can be used for example
2699application should not write to those buffers. This feature can be used for example for generating thumbnails of videos. 2699for generating thumbnails of videos. Applicable to the H264 decoder.
2700Applicable to the H264 decoder.
2701 </entry> 2700 </entry>
2702 </row> 2701 </row>
2703 <row><entry></entry></row> 2702 <row><entry></entry></row>
diff --git a/Documentation/DocBook/media/v4l/pixfmt-srggb10.xml b/Documentation/DocBook/media/v4l/pixfmt-srggb10.xml
index c1c62a9acc2a..f34d03ebda3a 100644
--- a/Documentation/DocBook/media/v4l/pixfmt-srggb10.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt-srggb10.xml
@@ -17,7 +17,7 @@
17 <refsect1> 17 <refsect1>
18 <title>Description</title> 18 <title>Description</title>
19 19
20 <para>The following four pixel formats are raw sRGB / Bayer formats with 20 <para>These four pixel formats are raw sRGB / Bayer formats with
2110 bits per colour. Each colour component is stored in a 16-bit word, with 6 2110 bits per colour. Each colour component is stored in a 16-bit word, with 6
22unused high bits filled with zeros. Each n-pixel row contains n/2 green samples 22unused high bits filled with zeros. Each n-pixel row contains n/2 green samples
23and n/2 blue or red samples, with alternating red and blue rows. Bytes are 23and n/2 blue or red samples, with alternating red and blue rows. Bytes are
diff --git a/Documentation/DocBook/media/v4l/pixfmt-srggb10alaw8.xml b/Documentation/DocBook/media/v4l/pixfmt-srggb10alaw8.xml
index 29acc2098cc2..d2e5845e57fb 100644
--- a/Documentation/DocBook/media/v4l/pixfmt-srggb10alaw8.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt-srggb10alaw8.xml
@@ -25,7 +25,7 @@
25 </refnamediv> 25 </refnamediv>
26 <refsect1> 26 <refsect1>
27 <title>Description</title> 27 <title>Description</title>
28 <para>The following four pixel formats are raw sRGB / Bayer 28 <para>These four pixel formats are raw sRGB / Bayer
29 formats with 10 bits per color compressed to 8 bits each, 29 formats with 10 bits per color compressed to 8 bits each,
30 using the A-LAW algorithm. Each color component consumes 8 30 using the A-LAW algorithm. Each color component consumes 8
31 bits of memory. In other respects this format is similar to 31 bits of memory. In other respects this format is similar to
diff --git a/Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml b/Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml
index 2d3f0b1aefe0..bde89878c5c5 100644
--- a/Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml
@@ -18,7 +18,7 @@
18 <refsect1> 18 <refsect1>
19 <title>Description</title> 19 <title>Description</title>
20 20
21 <para>The following four pixel formats are raw sRGB / Bayer formats 21 <para>These four pixel formats are raw sRGB / Bayer formats
22 with 10 bits per colour compressed to 8 bits each, using DPCM 22 with 10 bits per colour compressed to 8 bits each, using DPCM
23 compression. DPCM, differential pulse-code modulation, is lossy. 23 compression. DPCM, differential pulse-code modulation, is lossy.
24 Each colour component consumes 8 bits of memory. In other respects 24 Each colour component consumes 8 bits of memory. In other respects
diff --git a/Documentation/DocBook/media/v4l/pixfmt-srggb10p.xml b/Documentation/DocBook/media/v4l/pixfmt-srggb10p.xml
new file mode 100644
index 000000000000..30aa63581fe3
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/pixfmt-srggb10p.xml
@@ -0,0 +1,99 @@
1 <refentry id="pixfmt-srggb10p">
2 <refmeta>
3 <refentrytitle>V4L2_PIX_FMT_SRGGB10P ('pRAA'),
4 V4L2_PIX_FMT_SGRBG10P ('pgAA'),
5 V4L2_PIX_FMT_SGBRG10P ('pGAA'),
6 V4L2_PIX_FMT_SBGGR10P ('pBAA'),
7 </refentrytitle>
8 &manvol;
9 </refmeta>
10 <refnamediv>
11 <refname id="V4L2-PIX-FMT-SRGGB10P"><constant>V4L2_PIX_FMT_SRGGB10P</constant></refname>
12 <refname id="V4L2-PIX-FMT-SGRBG10P"><constant>V4L2_PIX_FMT_SGRBG10P</constant></refname>
13 <refname id="V4L2-PIX-FMT-SGBRG10P"><constant>V4L2_PIX_FMT_SGBRG10P</constant></refname>
14 <refname id="V4L2-PIX-FMT-SBGGR10P"><constant>V4L2_PIX_FMT_SBGGR10P</constant></refname>
15 <refpurpose>10-bit packed Bayer formats</refpurpose>
16 </refnamediv>
17 <refsect1>
18 <title>Description</title>
19
20 <para>These four pixel formats are packed raw sRGB /
21 Bayer formats with 10 bits per colour. Every four consecutive
22 colour components are packed into 5 bytes. Each of the first 4
23 bytes contain the 8 high order bits of the pixels, and the
24 fifth byte contains the two least significants bits of each
25 pixel, in the same order.</para>
26
27 <para>Each n-pixel row contains n/2 green samples and n/2 blue
28 or red samples, with alternating green-red and green-blue
29 rows. They are conventionally described as GRGR... BGBG...,
30 RGRG... GBGB..., etc. Below is an example of one of these
31 formats:</para>
32
33 <example>
34 <title><constant>V4L2_PIX_FMT_SBGGR10P</constant> 4 &times; 4
35 pixel image</title>
36
37 <formalpara>
38 <title>Byte Order.</title>
39 <para>Each cell is one byte.
40 <informaltable frame="topbot" colsep="1" rowsep="1">
41 <tgroup cols="5" align="center" border="1">
42 <colspec align="left" colwidth="2*" />
43 <tbody valign="top">
44 <row>
45 <entry>start&nbsp;+&nbsp;0:</entry>
46 <entry>B<subscript>00high</subscript></entry>
47 <entry>G<subscript>01high</subscript></entry>
48 <entry>B<subscript>02high</subscript></entry>
49 <entry>G<subscript>03high</subscript></entry>
50 <entry>B<subscript>00low</subscript>(bits 7--6)
51 G<subscript>01low</subscript>(bits 5--4)
52 B<subscript>02low</subscript>(bits 3--2)
53 G<subscript>03low</subscript>(bits 1--0)
54 </entry>
55 </row>
56 <row>
57 <entry>start&nbsp;+&nbsp;5:</entry>
58 <entry>G<subscript>10high</subscript></entry>
59 <entry>R<subscript>11high</subscript></entry>
60 <entry>G<subscript>12high</subscript></entry>
61 <entry>R<subscript>13high</subscript></entry>
62 <entry>G<subscript>10low</subscript>(bits 7--6)
63 R<subscript>11low</subscript>(bits 5--4)
64 G<subscript>12low</subscript>(bits 3--2)
65 R<subscript>13low</subscript>(bits 1--0)
66 </entry>
67 </row>
68 <row>
69 <entry>start&nbsp;+&nbsp;10:</entry>
70 <entry>B<subscript>20high</subscript></entry>
71 <entry>G<subscript>21high</subscript></entry>
72 <entry>B<subscript>22high</subscript></entry>
73 <entry>G<subscript>23high</subscript></entry>
74 <entry>B<subscript>20low</subscript>(bits 7--6)
75 G<subscript>21low</subscript>(bits 5--4)
76 B<subscript>22low</subscript>(bits 3--2)
77 G<subscript>23low</subscript>(bits 1--0)
78 </entry>
79 </row>
80 <row>
81 <entry>start&nbsp;+&nbsp;15:</entry>
82 <entry>G<subscript>30high</subscript></entry>
83 <entry>R<subscript>31high</subscript></entry>
84 <entry>G<subscript>32high</subscript></entry>
85 <entry>R<subscript>33high</subscript></entry>
86 <entry>G<subscript>30low</subscript>(bits 7--6)
87 R<subscript>31low</subscript>(bits 5--4)
88 G<subscript>32low</subscript>(bits 3--2)
89 R<subscript>33low</subscript>(bits 1--0)
90 </entry>
91 </row>
92 </tbody>
93 </tgroup>
94 </informaltable>
95 </para>
96 </formalpara>
97 </example>
98 </refsect1>
99</refentry>
diff --git a/Documentation/DocBook/media/v4l/pixfmt-srggb12.xml b/Documentation/DocBook/media/v4l/pixfmt-srggb12.xml
index 96947f17fca1..0c8e4adf417f 100644
--- a/Documentation/DocBook/media/v4l/pixfmt-srggb12.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt-srggb12.xml
@@ -17,7 +17,7 @@
17 <refsect1> 17 <refsect1>
18 <title>Description</title> 18 <title>Description</title>
19 19
20 <para>The following four pixel formats are raw sRGB / Bayer formats with 20 <para>These four pixel formats are raw sRGB / Bayer formats with
2112 bits per colour. Each colour component is stored in a 16-bit word, with 4 2112 bits per colour. Each colour component is stored in a 16-bit word, with 4
22unused high bits filled with zeros. Each n-pixel row contains n/2 green samples 22unused high bits filled with zeros. Each n-pixel row contains n/2 green samples
23and n/2 blue or red samples, with alternating red and blue rows. Bytes are 23and n/2 blue or red samples, with alternating red and blue rows. Bytes are
diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml
index d5eca4b8f74b..5e0352c50324 100644
--- a/Documentation/DocBook/media/v4l/pixfmt.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt.xml
@@ -1405,6 +1405,7 @@ access the palette, this must be done with ioctls of the Linux framebuffer API.<
1405 &sub-srggb8; 1405 &sub-srggb8;
1406 &sub-sbggr16; 1406 &sub-sbggr16;
1407 &sub-srggb10; 1407 &sub-srggb10;
1408 &sub-srggb10p;
1408 &sub-srggb10alaw8; 1409 &sub-srggb10alaw8;
1409 &sub-srggb10dpcm8; 1410 &sub-srggb10dpcm8;
1410 &sub-srggb12; 1411 &sub-srggb12;
diff --git a/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml b/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml
index 28a8c1e1c705..a2017bfcaed2 100644
--- a/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml
@@ -212,11 +212,3 @@ standards set in the <structfield>standards</structfield> field.
212 &return-value; 212 &return-value;
213 </refsect1> 213 </refsect1>
214</refentry> 214</refentry>
215
216<!--
217Local Variables:
218mode: sgml
219sgml-parent-document: "v4l2.sgml"
220indent-tabs-mode: nil
221End:
222-->
diff --git a/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml b/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml
index b9fdfeacdbcb..6e3cadd4e1f9 100644
--- a/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml
@@ -131,11 +131,3 @@ is out of bounds or the <structfield>pad</structfield> number is invalid.</para>
131 </variablelist> 131 </variablelist>
132 </refsect1> 132 </refsect1>
133</refentry> 133</refentry>
134
135<!--
136Local Variables:
137mode: sgml
138sgml-parent-document: "v4l2.sgml"
139indent-tabs-mode: nil
140End:
141-->