Skip to content

Commit

Permalink
[media] documentation: update some files to reflect the V4L1 compat r…
Browse files Browse the repository at this point in the history
…emoval

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Dec 29, 2010
1 parent 41d9931 commit e4ea644
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
10 changes: 2 additions & 8 deletions Documentation/video4linux/meye.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ module argument syntax (<param>=<value> when passing the option to the
module or meye.<param>=<value> on the kernel boot line when meye is
statically linked into the kernel). Those options are:

forcev4l1: force use of V4L1 API instead of V4L2

gbuffers: number of capture buffers, default is 2 (32 max)

gbufsize: size of each capture buffer, default is 614400
Expand Down Expand Up @@ -79,9 +77,8 @@ Usage:
Private API:
------------

The driver supports frame grabbing with the video4linux API
(either v4l1 or v4l2), so all video4linux tools (like xawtv)
should work with this driver.
The driver supports frame grabbing with the video4linux API,
so all video4linux tools (like xawtv) should work with this driver.

Besides the video4linux interface, the driver has a private interface
for accessing the Motion Eye extended parameters (camera sharpness,
Expand Down Expand Up @@ -123,7 +120,4 @@ Private API:
Bugs / Todo:
------------

- the driver could be much cleaned up by removing the v4l1 support.
However, this means all v4l1-only applications will stop working.

- 'motioneye' still uses the meye private v4l1 API extensions.
7 changes: 1 addition & 6 deletions Documentation/video4linux/videobuf
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,6 @@ calls. The relevant helper functions are:
int nonblocking);
int videobuf_streamon(struct videobuf_queue *q);
int videobuf_streamoff(struct videobuf_queue *q);
int videobuf_cgmbuf(struct videobuf_queue *q, struct video_mbuf *mbuf,
int count);

So, for example, a VIDIOC_REQBUFS call turns into a call to the driver's
vidioc_reqbufs() callback which, in turn, usually only needs to locate the
Expand All @@ -258,10 +256,7 @@ boilerplate in a lot of V4L2 drivers.

The vidioc_streamon() and vidioc_streamoff() functions will be a bit more
complex, of course, since they will also need to deal with starting and
stopping the capture engine. videobuf_cgmbuf(), called from the driver's
vidiocgmbuf() function, only exists if the V4L1 compatibility module has
been selected with CONFIG_VIDEO_V4L1_COMPAT, so its use must be surrounded
with #ifdef directives.
stopping the capture engine.

Buffer allocation

Expand Down

0 comments on commit e4ea644

Please sign in to comment.