Commit bb2e0339 authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab

V4L/DVB (5888): zr36067: Driver was not returning correct image size

The driver was returning the size of the (fixed) buffer it allocated as the
sizeimage field in the v4l2 pixel format, rather than the actual size of the
image.  For example, a 192x128 YUYV image is 49152 bytes but the driver would
always return 131072 bytes since if that was the size of the v4l buffer.

This violates the v4l2 spec, which says that sizeimage should be the actual
size of the image for uncompressed formats.  It also caused mplayer to crash.
Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Acked-by: default avatarRonald S. Bultje <rbultje@ronald.bitfreak.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent e42af83f
...@@ -2737,7 +2737,8 @@ zoran_do_ioctl (struct inode *inode, ...@@ -2737,7 +2737,8 @@ zoran_do_ioctl (struct inode *inode,
fmt->fmt.pix.height = fmt->fmt.pix.height =
fh->v4l_settings.height; fh->v4l_settings.height;
fmt->fmt.pix.sizeimage = fmt->fmt.pix.sizeimage =
fh->v4l_buffers.buffer_size; fh->v4l_settings.bytesperline *
fh->v4l_settings.height;
fmt->fmt.pix.pixelformat = fmt->fmt.pix.pixelformat =
fh->v4l_settings.format->fourcc; fh->v4l_settings.format->fourcc;
fmt->fmt.pix.colorspace = fmt->fmt.pix.colorspace =
...@@ -2984,8 +2985,9 @@ zoran_do_ioctl (struct inode *inode, ...@@ -2984,8 +2985,9 @@ zoran_do_ioctl (struct inode *inode,
/* tell the user the /* tell the user the
* results/missing stuff */ * results/missing stuff */
fmt->fmt.pix.sizeimage = fh->v4l_buffers.buffer_size /*zr->gbpl * zr->gheight */ fmt->fmt.pix.sizeimage =
; fh->v4l_settings.height *
fh->v4l_settings.bytesperline;
if (BUZ_MAX_HEIGHT < if (BUZ_MAX_HEIGHT <
(fh->v4l_settings.height * 2)) (fh->v4l_settings.height * 2))
fmt->fmt.pix.field = fmt->fmt.pix.field =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment