diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-25 05:15:22 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:17:07 -0500 |
commit | e4ea644d3e59436f12e43df5d17fdf4fcf7c5fa7 (patch) | |
tree | 78d4f583577b74ea5a3fe8d84b7c86dbe0ab47dd | |
parent | 41d9931c5ae014fbab8bf612c70b8e7ff16f4641 (diff) |
[media] documentation: update some files to reflect the V4L1 compat removal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/video4linux/meye.txt | 10 | ||||
-rw-r--r-- | Documentation/video4linux/videobuf | 7 |
2 files changed, 3 insertions, 14 deletions
diff --git a/Documentation/video4linux/meye.txt b/Documentation/video4linux/meye.txt index bf3af5fe558f..34e2842c70ae 100644 --- a/Documentation/video4linux/meye.txt +++ b/Documentation/video4linux/meye.txt | |||
@@ -45,8 +45,6 @@ module argument syntax (<param>=<value> when passing the option to the | |||
45 | module or meye.<param>=<value> on the kernel boot line when meye is | 45 | module or meye.<param>=<value> on the kernel boot line when meye is |
46 | statically linked into the kernel). Those options are: | 46 | statically linked into the kernel). Those options are: |
47 | 47 | ||
48 | forcev4l1: force use of V4L1 API instead of V4L2 | ||
49 | |||
50 | gbuffers: number of capture buffers, default is 2 (32 max) | 48 | gbuffers: number of capture buffers, default is 2 (32 max) |
51 | 49 | ||
52 | gbufsize: size of each capture buffer, default is 614400 | 50 | gbufsize: size of each capture buffer, default is 614400 |
@@ -79,9 +77,8 @@ Usage: | |||
79 | Private API: | 77 | Private API: |
80 | ------------ | 78 | ------------ |
81 | 79 | ||
82 | The driver supports frame grabbing with the video4linux API | 80 | The driver supports frame grabbing with the video4linux API, |
83 | (either v4l1 or v4l2), so all video4linux tools (like xawtv) | 81 | so all video4linux tools (like xawtv) should work with this driver. |
84 | should work with this driver. | ||
85 | 82 | ||
86 | Besides the video4linux interface, the driver has a private interface | 83 | Besides the video4linux interface, the driver has a private interface |
87 | for accessing the Motion Eye extended parameters (camera sharpness, | 84 | for accessing the Motion Eye extended parameters (camera sharpness, |
@@ -123,7 +120,4 @@ Private API: | |||
123 | Bugs / Todo: | 120 | Bugs / Todo: |
124 | ------------ | 121 | ------------ |
125 | 122 | ||
126 | - the driver could be much cleaned up by removing the v4l1 support. | ||
127 | However, this means all v4l1-only applications will stop working. | ||
128 | |||
129 | - 'motioneye' still uses the meye private v4l1 API extensions. | 123 | - 'motioneye' still uses the meye private v4l1 API extensions. |
diff --git a/Documentation/video4linux/videobuf b/Documentation/video4linux/videobuf index 17a1f9abf260..1d00d7f15b8f 100644 --- a/Documentation/video4linux/videobuf +++ b/Documentation/video4linux/videobuf | |||
@@ -247,8 +247,6 @@ calls. The relevant helper functions are: | |||
247 | int nonblocking); | 247 | int nonblocking); |
248 | int videobuf_streamon(struct videobuf_queue *q); | 248 | int videobuf_streamon(struct videobuf_queue *q); |
249 | int videobuf_streamoff(struct videobuf_queue *q); | 249 | int videobuf_streamoff(struct videobuf_queue *q); |
250 | int videobuf_cgmbuf(struct videobuf_queue *q, struct video_mbuf *mbuf, | ||
251 | int count); | ||
252 | 250 | ||
253 | So, for example, a VIDIOC_REQBUFS call turns into a call to the driver's | 251 | So, for example, a VIDIOC_REQBUFS call turns into a call to the driver's |
254 | vidioc_reqbufs() callback which, in turn, usually only needs to locate the | 252 | vidioc_reqbufs() callback which, in turn, usually only needs to locate the |
@@ -258,10 +256,7 @@ boilerplate in a lot of V4L2 drivers. | |||
258 | 256 | ||
259 | The vidioc_streamon() and vidioc_streamoff() functions will be a bit more | 257 | The vidioc_streamon() and vidioc_streamoff() functions will be a bit more |
260 | complex, of course, since they will also need to deal with starting and | 258 | complex, of course, since they will also need to deal with starting and |
261 | stopping the capture engine. videobuf_cgmbuf(), called from the driver's | 259 | stopping the capture engine. |
262 | vidiocgmbuf() function, only exists if the V4L1 compatibility module has | ||
263 | been selected with CONFIG_VIDEO_V4L1_COMPAT, so its use must be surrounded | ||
264 | with #ifdef directives. | ||
265 | 260 | ||
266 | Buffer allocation | 261 | Buffer allocation |
267 | 262 | ||