diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2014-11-18 00:27:00 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-04 09:38:09 -0500 |
commit | 8af0345926c8cdbbf80102aa3eab8a6519c23272 (patch) | |
tree | 9a763447244fe650e5046862efc17907a31666c2 | |
parent | 0b4bc768dc289731983ba5223555ffabe08eefdd (diff) |
[media] v4l: Add input and output capability flags for native size setting
Add input and output capability flags for setting native size of the device,
and document them.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enuminput.xml | 8 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enumoutput.xml | 8 | ||||
-rw-r--r-- | include/uapi/linux/videodev2.h | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-enuminput.xml b/Documentation/DocBook/media/v4l/vidioc-enuminput.xml index 493a39a8ef21..603fecef9083 100644 --- a/Documentation/DocBook/media/v4l/vidioc-enuminput.xml +++ b/Documentation/DocBook/media/v4l/vidioc-enuminput.xml | |||
@@ -287,6 +287,14 @@ input/output interface to linux-media@vger.kernel.org on 19 Oct 2009. | |||
287 | <entry>0x00000004</entry> | 287 | <entry>0x00000004</entry> |
288 | <entry>This input supports setting the TV standard by using VIDIOC_S_STD.</entry> | 288 | <entry>This input supports setting the TV standard by using VIDIOC_S_STD.</entry> |
289 | </row> | 289 | </row> |
290 | <row> | ||
291 | <entry><constant>V4L2_IN_CAP_NATIVE_SIZE</constant></entry> | ||
292 | <entry>0x00000008</entry> | ||
293 | <entry>This input supports setting the native size using | ||
294 | the <constant>V4L2_SEL_TGT_NATIVE_SIZE</constant> | ||
295 | selection target, see <xref | ||
296 | linkend="v4l2-selections-common"/>.</entry> | ||
297 | </row> | ||
290 | </tbody> | 298 | </tbody> |
291 | </tgroup> | 299 | </tgroup> |
292 | </table> | 300 | </table> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml b/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml index 2654e097df39..773fb1258c24 100644 --- a/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml +++ b/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml | |||
@@ -172,6 +172,14 @@ input/output interface to linux-media@vger.kernel.org on 19 Oct 2009. | |||
172 | <entry>0x00000004</entry> | 172 | <entry>0x00000004</entry> |
173 | <entry>This output supports setting the TV standard by using VIDIOC_S_STD.</entry> | 173 | <entry>This output supports setting the TV standard by using VIDIOC_S_STD.</entry> |
174 | </row> | 174 | </row> |
175 | <row> | ||
176 | <entry><constant>V4L2_OUT_CAP_NATIVE_SIZE</constant></entry> | ||
177 | <entry>0x00000008</entry> | ||
178 | <entry>This output supports setting the native size using | ||
179 | the <constant>V4L2_SEL_TGT_NATIVE_SIZE</constant> | ||
180 | selection target, see <xref | ||
181 | linkend="v4l2-selections-common"/>.</entry> | ||
182 | </row> | ||
175 | </tbody> | 183 | </tbody> |
176 | </tgroup> | 184 | </tgroup> |
177 | </table> | 185 | </table> |
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index ced659e1b9f6..d279c1b75cf7 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h | |||
@@ -1324,6 +1324,7 @@ struct v4l2_input { | |||
1324 | #define V4L2_IN_CAP_DV_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ | 1324 | #define V4L2_IN_CAP_DV_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ |
1325 | #define V4L2_IN_CAP_CUSTOM_TIMINGS V4L2_IN_CAP_DV_TIMINGS /* For compatibility */ | 1325 | #define V4L2_IN_CAP_CUSTOM_TIMINGS V4L2_IN_CAP_DV_TIMINGS /* For compatibility */ |
1326 | #define V4L2_IN_CAP_STD 0x00000004 /* Supports S_STD */ | 1326 | #define V4L2_IN_CAP_STD 0x00000004 /* Supports S_STD */ |
1327 | #define V4L2_IN_CAP_NATIVE_SIZE 0x00000008 /* Supports setting native size */ | ||
1327 | 1328 | ||
1328 | /* | 1329 | /* |
1329 | * V I D E O O U T P U T S | 1330 | * V I D E O O U T P U T S |
@@ -1347,6 +1348,7 @@ struct v4l2_output { | |||
1347 | #define V4L2_OUT_CAP_DV_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ | 1348 | #define V4L2_OUT_CAP_DV_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ |
1348 | #define V4L2_OUT_CAP_CUSTOM_TIMINGS V4L2_OUT_CAP_DV_TIMINGS /* For compatibility */ | 1349 | #define V4L2_OUT_CAP_CUSTOM_TIMINGS V4L2_OUT_CAP_DV_TIMINGS /* For compatibility */ |
1349 | #define V4L2_OUT_CAP_STD 0x00000004 /* Supports S_STD */ | 1350 | #define V4L2_OUT_CAP_STD 0x00000004 /* Supports S_STD */ |
1351 | #define V4L2_OUT_CAP_NATIVE_SIZE 0x00000008 /* Supports setting native size */ | ||
1350 | 1352 | ||
1351 | /* | 1353 | /* |
1352 | * C O N T R O L S | 1354 | * C O N T R O L S |