aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2012-07-26 08:30:00 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 18:31:53 -0400
commitf0476a83d61a8004eb535a0b65721ca405421fe8 (patch)
tree090e739691637494b9438412914ae91598ee017d /Documentation/DocBook
parent6126b912c84240692e26c1b820a7097610eddf34 (diff)
[media] V4L: Add capability flags for memory-to-memory devices
This patch adds new V4L2_CAP_VIDEO_M2M and V4L2_CAP_VIDEO_M2M_MPLANE capability flags that are intended to be used for memory-to-memory (M2M) devices, instead of ORed V4L2_CAP_VIDEO_CAPTURE and V4L2_CAP_VIDEO_OUTPUT. V4L2_CAP_VIDEO_M2M flag is added at the drivers, CAPTURE and OUTPUT capability flags are left untouched and will be removed in future, after a transition period required for existing applications to be adapted to check only for V4L2_CAP_VIDEO_M2M. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Kamil Debski <k.debski@samsung.com> Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r--Documentation/DocBook/media/v4l/compat.xml9
-rw-r--r--Documentation/DocBook/media/v4l/vidioc-querycap.xml13
2 files changed, 22 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index 97b895151bb0..4559a6f8a5f0 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2471,6 +2471,15 @@ that used it. It was originally scheduled for removal in 2.6.35.
2471 </orderedlist> 2471 </orderedlist>
2472 </section> 2472 </section>
2473 2473
2474 <section>
2475 <title>V4L2 in Linux 3.6</title>
2476 <orderedlist>
2477 <listitem>
2478 <para>Added V4L2_CAP_VIDEO_M2M and V4L2_CAP_VIDEO_M2M_MPLANE capabilities.</para>
2479 </listitem>
2480 </orderedlist>
2481 </section>
2482
2474 <section id="other"> 2483 <section id="other">
2475 <title>Relation of V4L2 to other Linux multimedia APIs</title> 2484 <title>Relation of V4L2 to other Linux multimedia APIs</title>
2476 2485
diff --git a/Documentation/DocBook/media/v4l/vidioc-querycap.xml b/Documentation/DocBook/media/v4l/vidioc-querycap.xml
index 4643505cd4ca..f33dd746b66b 100644
--- a/Documentation/DocBook/media/v4l/vidioc-querycap.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-querycap.xml
@@ -192,6 +192,19 @@ linkend="output">Video Output</link> interface.</entry>
192 <link linkend="output">Video Output</link> interface.</entry> 192 <link linkend="output">Video Output</link> interface.</entry>
193 </row> 193 </row>
194 <row> 194 <row>
195 <entry><constant>V4L2_CAP_VIDEO_M2M</constant></entry>
196 <entry>0x00004000</entry>
197 <entry>The device supports the single-planar API through the
198 Video Memory-To-Memory interface.</entry>
199 </row>
200 <row>
201 <entry><constant>V4L2_CAP_VIDEO_M2M_MPLANE</constant></entry>
202 <entry>0x00008000</entry>
203 <entry>The device supports the
204 <link linkend="planar-apis">multi-planar API</link> through the
205 Video Memory-To-Memory interface.</entry>
206 </row>
207 <row>
195 <entry><constant>V4L2_CAP_VIDEO_OVERLAY</constant></entry> 208 <entry><constant>V4L2_CAP_VIDEO_OVERLAY</constant></entry>
196 <entry>0x00000004</entry> 209 <entry>0x00000004</entry>
197 <entry>The device supports the <link 210 <entry>The device supports the <link