diff options
| author | Michael H. Schimek <mschimek@gmx.at> | 2005-12-01 00:51:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:48:58 -0800 |
| commit | 13c72805b3d922d85d5c470e851c93e8f8c076d8 (patch) | |
| tree | f8ceb2a43f52b1cdf8da7ab429963dca16a2482a /drivers/media | |
| parent | 943a49027b6d9829b737e6da3d72b867a7a6f832 (diff) | |
| download | op-kernel-dev-13c72805b3d922d85d5c470e851c93e8f8c076d8.zip op-kernel-dev-13c72805b3d922d85d5c470e851c93e8f8c076d8.tar.gz | |
[PATCH] V4L: Fixes Bttv raw format to fix VIDIOCSPICT ioctl
Fixes Bttv raw format to fix VIDIOCSPICT ioctl.
Signed-off-by: Michael H. Schimek <mschimek@gmx.at>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/bttv-driver.c | 9 | ||||
| -rw-r--r-- | drivers/media/video/video-buf.c | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c index fdaff5b..6fcc20d 100644 --- a/drivers/media/video/bttv-driver.c +++ b/drivers/media/video/bttv-driver.c @@ -2290,6 +2290,15 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, retval = -EINVAL; goto fh_unlock_and_return; } + if (fmt->flags & FORMAT_FLAGS_RAW) { + /* VIDIOCMCAPTURE uses gbufsize, not RAW_BPL * + RAW_LINES * 2. F1 is stored at offset 0, F2 + at buffer size / 2. */ + fh->width = RAW_BPL; + fh->height = gbufsize / RAW_BPL; + btv->init.width = RAW_BPL; + btv->init.height = gbufsize / RAW_BPL; + } fh->ovfmt = fmt; fh->fmt = fmt; btv->init.ovfmt = fmt; diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c index bd34f81..9a6bf28 100644 --- a/drivers/media/video/video-buf.c +++ b/drivers/media/video/video-buf.c @@ -816,6 +816,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q, if (NULL == q->read_buf) goto done; q->read_buf->memory = V4L2_MEMORY_USERPTR; + q->read_buf->bsize = count; /* preferred size */ field = videobuf_next_field(q); retval = q->ops->buf_prepare(q,q->read_buf,field); if (0 != retval) { |
