Skip to content

L
linux
Commit 96b8e145 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (10703): zoran: convert to video_ioctl2 and remove 'ready_to_be_freed' hack. 

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 17bdd9dd
Show whitespace changes
Inline Side-by-side
Showing with 1114 additions and 1445 deletions
drivers/media/video/zoran/zoran.h
View file @ 96b8e145
...@@ -312,7 +312,6 @@ struct zoran_jpg_struct { ...@@ -312,7 +312,6 @@ struct zoran_jpg_struct {
struct zoran_jpg_buffer buffer[BUZ_MAX_FRAME]; /* buffers */ struct zoran_jpg_buffer buffer[BUZ_MAX_FRAME]; /* buffers */
int num_buffers, buffer_size; int num_buffers, buffer_size;
u8 allocated; /* Flag if buffers are allocated */ u8 allocated; /* Flag if buffers are allocated */
u8 ready_to_be_freed; /* hack - see zoran_driver.c */
u8 need_contiguous; /* Flag if contiguous buffers are needed */ u8 need_contiguous; /* Flag if contiguous buffers are needed */
}; };
...@@ -321,7 +320,6 @@ struct zoran_v4l_struct { ...@@ -321,7 +320,6 @@ struct zoran_v4l_struct {
struct zoran_v4l_buffer buffer[VIDEO_MAX_FRAME]; /* buffers */ struct zoran_v4l_buffer buffer[VIDEO_MAX_FRAME]; /* buffers */
int num_buffers, buffer_size; int num_buffers, buffer_size;
u8 allocated; /* Flag if buffers are allocated */ u8 allocated; /* Flag if buffers are allocated */
u8 ready_to_be_freed; /* hack - see zoran_driver.c */
}; };
struct zoran; struct zoran;
......
drivers/media/video/zoran/zoran_driver.c
View file @ 96b8e145
...@@ -309,11 +309,6 @@ v4l_fbuffer_alloc (struct file *file) ...@@ -309,11 +309,6 @@ v4l_fbuffer_alloc (struct file *file)
unsigned char *mem; unsigned char *mem;
unsigned long pmem = 0; unsigned long pmem = 0;
/* we might have old buffers lying around... */
if (fh->v4l_buffers.ready_to_be_freed) {
v4l_fbuffer_free(file);
}
for (i = 0; i < fh->v4l_buffers.num_buffers; i++) { for (i = 0; i < fh->v4l_buffers.num_buffers; i++) {
if (fh->v4l_buffers.buffer[i].fbuffer) if (fh->v4l_buffers.buffer[i].fbuffer)
dprintk(2, dprintk(2,
...@@ -421,7 +416,6 @@ v4l_fbuffer_free (struct file *file) ...@@ -421,7 +416,6 @@ v4l_fbuffer_free (struct file *file)
} }
fh->v4l_buffers.allocated = 0; fh->v4l_buffers.allocated = 0;
fh->v4l_buffers.ready_to_be_freed = 0;
} }
/* /*
...@@ -466,11 +460,6 @@ jpg_fbuffer_alloc (struct file *file) ...@@ -466,11 +460,6 @@ jpg_fbuffer_alloc (struct file *file)
int i, j, off; int i, j, off;
unsigned long mem; unsigned long mem;
/* we might have old buffers lying around */
if (fh->jpg_buffers.ready_to_be_freed) {
jpg_fbuffer_free(file);
}
for (i = 0; i < fh->jpg_buffers.num_buffers; i++) { for (i = 0; i < fh->jpg_buffers.num_buffers; i++) {
if (fh->jpg_buffers.buffer[i].frag_tab) if (fh->jpg_buffers.buffer[i].frag_tab)
dprintk(2, dprintk(2,
...@@ -613,7 +602,6 @@ jpg_fbuffer_free (struct file *file) ...@@ -613,7 +602,6 @@ jpg_fbuffer_free (struct file *file)
} }
fh->jpg_buffers.allocated = 0; fh->jpg_buffers.allocated = 0;
fh->jpg_buffers.ready_to_be_freed = 0;
} }
/* /*
...@@ -657,7 +645,7 @@ zoran_v4l_set_format (struct file *file, ...@@ -657,7 +645,7 @@ zoran_v4l_set_format (struct file *file,
if ((bpp == 2 && (width & 1)) || (bpp == 3 && (width & 3))) { if ((bpp == 2 && (width & 1)) || (bpp == 3 && (width & 3))) {
dprintk(1, dprintk(1,
KERN_ERR KERN_ERR
"%s: v4l_set_format() - wrong frame alingment\n", "%s: v4l_set_format() - wrong frame alignment\n",
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
return -EINVAL; return -EINVAL;
} }
...@@ -1122,7 +1110,6 @@ zoran_open_init_session (struct file *file) ...@@ -1122,7 +1110,6 @@ zoran_open_init_session (struct file *file)
fh->v4l_buffers.buffer[i].bs.frame = i; fh->v4l_buffers.buffer[i].bs.frame = i;
} }
fh->v4l_buffers.allocated = 0; fh->v4l_buffers.allocated = 0;
fh->v4l_buffers.ready_to_be_freed = 0;
fh->v4l_buffers.active = ZORAN_FREE; fh->v4l_buffers.active = ZORAN_FREE;
fh->v4l_buffers.buffer_size = v4l_bufsize; fh->v4l_buffers.buffer_size = v4l_bufsize;
fh->v4l_buffers.num_buffers = v4l_nbufs; fh->v4l_buffers.num_buffers = v4l_nbufs;
...@@ -1138,7 +1125,6 @@ zoran_open_init_session (struct file *file) ...@@ -1138,7 +1125,6 @@ zoran_open_init_session (struct file *file)
} }
fh->jpg_buffers.need_contiguous = zr->jpg_buffers.need_contiguous; fh->jpg_buffers.need_contiguous = zr->jpg_buffers.need_contiguous;
fh->jpg_buffers.allocated = 0; fh->jpg_buffers.allocated = 0;
fh->jpg_buffers.ready_to_be_freed = 0;
fh->jpg_buffers.active = ZORAN_FREE; fh->jpg_buffers.active = ZORAN_FREE;
fh->jpg_buffers.buffer_size = jpg_bufsize; fh->jpg_buffers.buffer_size = jpg_bufsize;
fh->jpg_buffers.num_buffers = jpg_nbufs; fh->jpg_buffers.num_buffers = jpg_nbufs;
...@@ -1172,10 +1158,8 @@ zoran_close_end_session (struct file *file) ...@@ -1172,10 +1158,8 @@ zoran_close_end_session (struct file *file)
} }
/* v4l buffers */ /* v4l buffers */
if (fh->v4l_buffers.allocated || if (fh->v4l_buffers.allocated)
fh->v4l_buffers.ready_to_be_freed) {
v4l_fbuffer_free(file); v4l_fbuffer_free(file);
}
/* jpg capture */ /* jpg capture */
if (fh->jpg_buffers.active != ZORAN_FREE) { if (fh->jpg_buffers.active != ZORAN_FREE) {
...@@ -1186,10 +1170,8 @@ zoran_close_end_session (struct file *file) ...@@ -1186,10 +1170,8 @@ zoran_close_end_session (struct file *file)
} }
/* jpg buffers */ /* jpg buffers */
if (fh->jpg_buffers.allocated || if (fh->jpg_buffers.allocated)
fh->jpg_buffers.ready_to_be_freed) {
jpg_fbuffer_free(file); jpg_fbuffer_free(file);
}
} }
/* /*
...@@ -1903,38 +1885,13 @@ zoran_set_input (struct zoran *zr, ...@@ -1903,38 +1885,13 @@ zoran_set_input (struct zoran *zr,
* ioctl routine * ioctl routine
*/ */
static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) static long zoran_default(struct file *file, void *__fh, int cmd, void *arg)
{ {
struct zoran_fh *fh = file->private_data; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr; struct zoran *zr = fh->zr;
/* CAREFUL: used in multiple places here */
struct zoran_jpg_settings settings; struct zoran_jpg_settings settings;
/* we might have older buffers lying around... We don't want
* to wait, but we do want to try cleaning them up ASAP. So
* we try to obtain the lock and free them. If that fails, we
* don't do anything and wait for the next turn. In the end,
* zoran_close() or a new allocation will still free them...
* This is just a 'the sooner the better' extra 'feature'
*
* We don't free the buffers right on munmap() because that
* causes oopses (kfree() inside munmap() oopses for no
* apparent reason - it's also not reproduceable in any way,
* but moving the free code outside the munmap() handler fixes
* all this... If someone knows why, please explain me (Ronald)
*/
if (mutex_trylock(&zr->resource_lock)) {
/* we obtained it! Let's try to free some things */
if (fh->jpg_buffers.ready_to_be_freed)
jpg_fbuffer_free(file);
if (fh->v4l_buffers.ready_to_be_freed)
v4l_fbuffer_free(file);
mutex_unlock(&zr->resource_lock);
}
switch (cmd) { switch (cmd) {
case VIDIOCGCAP: case VIDIOCGCAP:
{ {
struct video_capability *vcap = arg; struct video_capability *vcap = arg;
...@@ -1956,7 +1913,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -1956,7 +1913,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return 0; return 0;
} }
break;
case VIDIOCGCHAN: case VIDIOCGCHAN:
{ {
...@@ -1987,7 +1943,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -1987,7 +1943,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return 0; return 0;
} }
break;
/* RJ: the documentation at http://roadrunner.swansea.linux.org.uk/v4lapi.shtml says: /* RJ: the documentation at http://roadrunner.swansea.linux.org.uk/v4lapi.shtml says:
* *
...@@ -2017,11 +1972,10 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2017,11 +1972,10 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
/* Make sure the changes come into effect */ /* Make sure the changes come into effect */
res = wait_grab_pending(zr); res = wait_grab_pending(zr);
schan_unlock_and_return: schan_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOCGPICT: case VIDIOCGPICT:
{ {
...@@ -2045,7 +1999,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2045,7 +1999,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return 0; return 0;
} }
break;
case VIDIOCSPICT: case VIDIOCSPICT:
{ {
...@@ -2091,7 +2044,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2091,7 +2044,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return 0; return 0;
} }
break;
case VIDIOCCAPTURE: case VIDIOCCAPTURE:
{ {
...@@ -2106,7 +2058,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2106,7 +2058,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return res; return res;
} }
break;
case VIDIOCGWIN: case VIDIOCGWIN:
{ {
...@@ -2124,7 +2075,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2124,7 +2075,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
vwin->clipcount = 0; vwin->clipcount = 0;
return 0; return 0;
} }
break;
case VIDIOCSWIN: case VIDIOCSWIN:
{ {
...@@ -2146,7 +2096,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2146,7 +2096,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return res; return res;
} }
break;
case VIDIOCGFBUF: case VIDIOCGFBUF:
{ {
...@@ -2159,7 +2108,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2159,7 +2108,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return 0; return 0;
} }
break;
case VIDIOCSFBUF: case VIDIOCSFBUF:
{ {
...@@ -2192,7 +2140,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2192,7 +2140,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return res; return res;
} }
break;
case VIDIOCSYNC: case VIDIOCSYNC:
{ {
...@@ -2208,7 +2155,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2208,7 +2155,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
zr->v4l_sync_tail++; zr->v4l_sync_tail++;
return res; return res;
} }
break;
case VIDIOCMCAPTURE: case VIDIOCMCAPTURE:
{ {
...@@ -2226,7 +2172,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2226,7 +2172,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOCGMBUF: case VIDIOCGMBUF:
{ {
...@@ -2262,12 +2207,11 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2262,12 +2207,11 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
/* The next mmap will map the V4L buffers */ /* The next mmap will map the V4L buffers */
fh->map_mode = ZORAN_MAP_MODE_RAW; fh->map_mode = ZORAN_MAP_MODE_RAW;
v4l1reqbuf_unlock_and_return: v4l1reqbuf_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOCGUNIT: case VIDIOCGUNIT:
{ {
...@@ -2283,7 +2227,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2283,7 +2227,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return 0; return 0;
} }
break;
/* /*
* RJ: In principal we could support subcaptures for V4L grabbing. * RJ: In principal we could support subcaptures for V4L grabbing.
...@@ -2297,7 +2240,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2297,7 +2240,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
return -EINVAL; return -EINVAL;
} }
break;
case VIDIOCSCAPTURE: case VIDIOCSCAPTURE:
{ {
...@@ -2305,7 +2247,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2305,7 +2247,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
return -EINVAL; return -EINVAL;
} }
break;
case BUZIOC_G_PARAMS: case BUZIOC_G_PARAMS:
{ {
...@@ -2352,7 +2293,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2352,7 +2293,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return 0; return 0;
} }
break;
case BUZIOC_S_PARAMS: case BUZIOC_S_PARAMS:
{ {
...@@ -2401,12 +2341,11 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2401,12 +2341,11 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
} }
fh->jpg_settings = settings; fh->jpg_settings = settings;
sparams_unlock_and_return: sparams_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case BUZIOC_REQBUFS: case BUZIOC_REQBUFS:
{ {
...@@ -2456,12 +2395,11 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2456,12 +2395,11 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
/* The next mmap will map the MJPEG buffers - could /* The next mmap will map the MJPEG buffers - could
* also be *_PLAY, but it doesn't matter here */ * also be *_PLAY, but it doesn't matter here */
fh->map_mode = ZORAN_MAP_MODE_JPG_REC; fh->map_mode = ZORAN_MAP_MODE_JPG_REC;
jpgreqbuf_unlock_and_return: jpgreqbuf_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case BUZIOC_QBUF_CAPT: case BUZIOC_QBUF_CAPT:
{ {
...@@ -2476,7 +2414,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2476,7 +2414,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return res; return res;
} }
break;
case BUZIOC_QBUF_PLAY: case BUZIOC_QBUF_PLAY:
{ {
...@@ -2491,7 +2428,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2491,7 +2428,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return res; return res;
} }
break;
case BUZIOC_SYNC: case BUZIOC_SYNC:
{ {
...@@ -2506,7 +2442,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2506,7 +2442,6 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return res; return res;
} }
break;
case BUZIOC_G_STATUS: case BUZIOC_G_STATUS:
{ {
...@@ -2550,7 +2485,7 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2550,7 +2485,7 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
input = zr->card.input[zr->input].muxsel; input = zr->card.input[zr->input].muxsel;
decoder_command(zr, DECODER_SET_INPUT, &input); decoder_command(zr, DECODER_SET_INPUT, &input);
decoder_command(zr, DECODER_SET_NORM, &zr->norm); decoder_command(zr, DECODER_SET_NORM, &zr->norm);
gstat_unlock_and_return: gstat_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
if (!res) { if (!res) {
...@@ -2569,17 +2504,16 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2569,17 +2504,16 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return res; return res;
} }
break;
/* The new video4linux2 capture interface - much nicer than video4linux1, since
* it allows for integrating the JPEG capturing calls inside standard v4l2
*/
case VIDIOC_QUERYCAP: default:
{ return -EINVAL;
struct v4l2_capability *cap = arg; }
}
dprintk(3, KERN_DEBUG "%s: VIDIOC_QUERYCAP\n", ZR_DEVNAME(zr)); static int zoran_querycap(struct file *file, void *__fh, struct v4l2_capability *cap)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
memset(cap, 0, sizeof(*cap)); memset(cap, 0, sizeof(*cap));
strncpy(cap->card, ZR_DEVNAME(zr), sizeof(cap->card)-1); strncpy(cap->card, ZR_DEVNAME(zr), sizeof(cap->card)-1);
...@@ -2592,35 +2526,11 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2592,35 +2526,11 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
cap->capabilities = ZORAN_V4L2_VID_FLAGS; cap->capabilities = ZORAN_V4L2_VID_FLAGS;
return 0; return 0;
} }
break;
case VIDIOC_ENUM_FMT:
{
struct v4l2_fmtdesc *fmt = arg;
int index = fmt->index, num = -1, i, flag = 0, type =
fmt->type;
dprintk(3, KERN_DEBUG "%s: VIDIOC_ENUM_FMT - index=%d\n",
ZR_DEVNAME(zr), fmt->index);
switch (fmt->type) { static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag)
case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
flag = ZORAN_FORMAT_CAPTURE; int num = -1, i;
break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT:
flag = ZORAN_FORMAT_PLAYBACK;
break;
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
flag = ZORAN_FORMAT_OVERLAY;
break;
default:
dprintk(1,
KERN_ERR
"%s: VIDIOC_ENUM_FMT - unknown type %d\n",
ZR_DEVNAME(zr), fmt->type);
return -EINVAL;
}
for (i = 0; i < NUM_FORMATS; i++) { for (i = 0; i < NUM_FORMATS; i++) {
if (zoran_formats[i].flags & flag) if (zoran_formats[i].flags & flag)
...@@ -2628,137 +2538,239 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2628,137 +2538,239 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
if (num == fmt->index) if (num == fmt->index)
break; break;
} }
if (fmt->index < 0 /* late, but not too late */ || if (fmt->index < 0 /* late, but not too late */ || i == NUM_FORMATS)
i == NUM_FORMATS)
return -EINVAL; return -EINVAL;
memset(fmt, 0, sizeof(*fmt));
fmt->index = index;
fmt->type = type;
strncpy(fmt->description, zoran_formats[i].name, sizeof(fmt->description)-1); strncpy(fmt->description, zoran_formats[i].name, sizeof(fmt->description)-1);
fmt->pixelformat = zoran_formats[i].fourcc; fmt->pixelformat = zoran_formats[i].fourcc;
if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED) if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED)
fmt->flags |= V4L2_FMT_FLAG_COMPRESSED; fmt->flags |= V4L2_FMT_FLAG_COMPRESSED;
return 0;
}
static int zoran_enum_fmt_vid_cap(struct file *file, void *__fh,
struct v4l2_fmtdesc *f)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
return zoran_enum_fmt(zr, f, ZORAN_FORMAT_CAPTURE);
}
static int zoran_enum_fmt_vid_out(struct file *file, void *__fh,
struct v4l2_fmtdesc *f)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
return zoran_enum_fmt(zr, f, ZORAN_FORMAT_PLAYBACK);
}
static int zoran_enum_fmt_vid_overlay(struct file *file, void *__fh,
struct v4l2_fmtdesc *f)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
return zoran_enum_fmt(zr, f, ZORAN_FORMAT_OVERLAY);
}
static int zoran_g_fmt_vid_out(struct file *file, void *__fh,
struct v4l2_format *fmt)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
mutex_lock(&zr->resource_lock);
fmt->fmt.pix.width = fh->jpg_settings.img_width / fh->jpg_settings.HorDcm;
fmt->fmt.pix.height = fh->jpg_settings.img_height /
(fh->jpg_settings.VerDcm * fh->jpg_settings.TmpDcm);
fmt->fmt.pix.sizeimage = zoran_v4l2_calc_bufsize(&fh->jpg_settings);
fmt->fmt.pix.pixelformat = V4L2_PIX_FMT_MJPEG;
if (fh->jpg_settings.TmpDcm == 1)
fmt->fmt.pix.field = (fh->jpg_settings.odd_even ?
V4L2_FIELD_SEQ_BT : V4L2_FIELD_SEQ_BT);
else
fmt->fmt.pix.field = (fh->jpg_settings.odd_even ?
V4L2_FIELD_TOP : V4L2_FIELD_BOTTOM);
fmt->fmt.pix.bytesperline = 0;
fmt->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
mutex_unlock(&zr->resource_lock);
return 0; return 0;
} }
break;
case VIDIOC_G_FMT: static int zoran_g_fmt_vid_cap(struct file *file, void *__fh,
{ struct v4l2_format *fmt)
struct v4l2_format *fmt = arg; {
int type = fmt->type; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
dprintk(5, KERN_DEBUG "%s: VIDIOC_G_FMT\n", ZR_DEVNAME(zr)); if (fh->map_mode != ZORAN_MAP_MODE_RAW)
return zoran_g_fmt_vid_out(file, fh, fmt);
memset(fmt, 0, sizeof(*fmt)); mutex_lock(&zr->resource_lock);
fmt->type = type; fmt->fmt.pix.width = fh->v4l_settings.width;
fmt->fmt.pix.height = fh->v4l_settings.height;
fmt->fmt.pix.sizeimage = fh->v4l_settings.bytesperline *
fh->v4l_settings.height;
fmt->fmt.pix.pixelformat = fh->v4l_settings.format->fourcc;
fmt->fmt.pix.colorspace = fh->v4l_settings.format->colorspace;
fmt->fmt.pix.bytesperline = fh->v4l_settings.bytesperline;
if (BUZ_MAX_HEIGHT < (fh->v4l_settings.height * 2))
fmt->fmt.pix.field = V4L2_FIELD_INTERLACED;
else
fmt->fmt.pix.field = V4L2_FIELD_TOP;
mutex_unlock(&zr->resource_lock);
return 0;
}
switch (fmt->type) { static int zoran_g_fmt_vid_overlay(struct file *file, void *__fh,
case V4L2_BUF_TYPE_VIDEO_OVERLAY: struct v4l2_format *fmt)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
fmt->fmt.win.w.left = fh->overlay_settings.x; fmt->fmt.win.w.left = fh->overlay_settings.x;
fmt->fmt.win.w.top = fh->overlay_settings.y; fmt->fmt.win.w.top = fh->overlay_settings.y;
fmt->fmt.win.w.width = fh->overlay_settings.width; fmt->fmt.win.w.width = fh->overlay_settings.width;
fmt->fmt.win.w.height = fmt->fmt.win.w.height = fh->overlay_settings.height;
fh->overlay_settings.height; if (fh->overlay_settings.width * 2 > BUZ_MAX_HEIGHT)
if (fh->overlay_settings.width * 2 >
BUZ_MAX_HEIGHT)
fmt->fmt.win.field = V4L2_FIELD_INTERLACED; fmt->fmt.win.field = V4L2_FIELD_INTERLACED;
else else
fmt->fmt.win.field = V4L2_FIELD_TOP; fmt->fmt.win.field = V4L2_FIELD_TOP;
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return 0;
}
break; static int zoran_try_fmt_vid_overlay(struct file *file, void *__fh,
struct v4l2_format *fmt)
case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
case V4L2_BUF_TYPE_VIDEO_OUTPUT: struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
if (fmt->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && if (fmt->fmt.win.w.width > BUZ_MAX_WIDTH)
fh->map_mode == ZORAN_MAP_MODE_RAW) { fmt->fmt.win.w.width = BUZ_MAX_WIDTH;
if (fmt->fmt.win.w.width < BUZ_MIN_WIDTH)
fmt->fmt.win.w.width = BUZ_MIN_WIDTH;
if (fmt->fmt.win.w.height > BUZ_MAX_HEIGHT)
fmt->fmt.win.w.height = BUZ_MAX_HEIGHT;
if (fmt->fmt.win.w.height < BUZ_MIN_HEIGHT)
fmt->fmt.win.w.height = BUZ_MIN_HEIGHT;
fmt->fmt.pix.width = mutex_unlock(&zr->resource_lock);
fh->v4l_settings.width; return 0;
fmt->fmt.pix.height = }
fh->v4l_settings.height;
fmt->fmt.pix.sizeimage =
fh->v4l_settings.bytesperline *
fh->v4l_settings.height;
fmt->fmt.pix.pixelformat =
fh->v4l_settings.format->fourcc;
fmt->fmt.pix.colorspace =
fh->v4l_settings.format->colorspace;
fmt->fmt.pix.bytesperline =
fh->v4l_settings.bytesperline;
if (BUZ_MAX_HEIGHT <
(fh->v4l_settings.height * 2))
fmt->fmt.pix.field =
V4L2_FIELD_INTERLACED;
else
fmt->fmt.pix.field =
V4L2_FIELD_TOP;
} else { static int zoran_try_fmt_vid_out(struct file *file, void *__fh,
struct v4l2_format *fmt)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
struct zoran_jpg_settings settings;
int res = 0;
fmt->fmt.pix.width = if (fmt->fmt.pix.bytesperline > 0)
fh->jpg_settings.img_width / return -EINVAL;
fh->jpg_settings.HorDcm;
fmt->fmt.pix.height = if (fmt->fmt.pix.pixelformat != V4L2_PIX_FMT_MJPEG)
fh->jpg_settings.img_height / return -EINVAL;
(fh->jpg_settings.VerDcm *
fh->jpg_settings.TmpDcm); mutex_lock(&zr->resource_lock);
fmt->fmt.pix.sizeimage = settings = fh->jpg_settings;
zoran_v4l2_calc_bufsize(&fh->
jpg_settings); /* we actually need to set 'real' parameters now */
fmt->fmt.pix.pixelformat = if ((fmt->fmt.pix.height * 2) > BUZ_MAX_HEIGHT)
V4L2_PIX_FMT_MJPEG; settings.TmpDcm = 1;
if (fh->jpg_settings.TmpDcm == 1)
fmt->fmt.pix.field =
(fh->jpg_settings.
odd_even ? V4L2_FIELD_SEQ_BT :
V4L2_FIELD_SEQ_BT);
else else
fmt->fmt.pix.field = settings.TmpDcm = 2;
(fh->jpg_settings. settings.decimation = 0;
odd_even ? V4L2_FIELD_TOP : if (fmt->fmt.pix.height <= fh->jpg_settings.img_height / 2)
V4L2_FIELD_BOTTOM); settings.VerDcm = 2;
else
settings.VerDcm = 1;
if (fmt->fmt.pix.width <= fh->jpg_settings.img_width / 4)
settings.HorDcm = 4;
else if (fmt->fmt.pix.width <= fh->jpg_settings.img_width / 2)
settings.HorDcm = 2;
else
settings.HorDcm = 1;
if (settings.TmpDcm == 1)
settings.field_per_buff = 2;
else
settings.field_per_buff = 1;
fmt->fmt.pix.bytesperline = 0; /* check */
fmt->fmt.pix.colorspace = res = zoran_check_jpg_settings(zr, &settings);
V4L2_COLORSPACE_SMPTE170M; if (res)
} goto tryfmt_unlock_and_return;
/* tell the user what we actually did */
fmt->fmt.pix.width = settings.img_width / settings.HorDcm;
fmt->fmt.pix.height = settings.img_height * 2 /
(settings.TmpDcm * settings.VerDcm);
if (settings.TmpDcm == 1)
fmt->fmt.pix.field = (fh->jpg_settings.odd_even ?
V4L2_FIELD_SEQ_TB : V4L2_FIELD_SEQ_BT);
else
fmt->fmt.pix.field = (fh->jpg_settings.odd_even ?
V4L2_FIELD_TOP : V4L2_FIELD_BOTTOM);
fmt->fmt.pix.sizeimage = zoran_v4l2_calc_bufsize(&settings);
tryfmt_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res;
}
static int zoran_try_fmt_vid_cap(struct file *file, void *__fh,
struct v4l2_format *fmt)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int i;
if (fmt->fmt.pix.bytesperline > 0)
return -EINVAL;
if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG)
return zoran_try_fmt_vid_out(file, fh, fmt);
mutex_lock(&zr->resource_lock);
for (i = 0; i < NUM_FORMATS; i++)
if (zoran_formats[i].fourcc == fmt->fmt.pix.pixelformat)
break; break;
default: if (i == NUM_FORMATS) {
dprintk(1, mutex_unlock(&zr->resource_lock);
KERN_ERR
"%s: VIDIOC_G_FMT - unsupported type %d\n",
ZR_DEVNAME(zr), fmt->type);
return -EINVAL; return -EINVAL;
} }
return 0;
}
break;
case VIDIOC_S_FMT: if (fmt->fmt.pix.width > BUZ_MAX_WIDTH)
{ fmt->fmt.pix.width = BUZ_MAX_WIDTH;
struct v4l2_format *fmt = arg; if (fmt->fmt.pix.width < BUZ_MIN_WIDTH)
int i, res = 0; fmt->fmt.pix.width = BUZ_MIN_WIDTH;
__le32 printformat; if (fmt->fmt.pix.height > BUZ_MAX_HEIGHT)
fmt->fmt.pix.height = BUZ_MAX_HEIGHT;
if (fmt->fmt.pix.height < BUZ_MIN_HEIGHT)
fmt->fmt.pix.height = BUZ_MIN_HEIGHT;
mutex_unlock(&zr->resource_lock);
dprintk(3, KERN_DEBUG "%s: VIDIOC_S_FMT - type=%d, ", return 0;
ZR_DEVNAME(zr), fmt->type); }
switch (fmt->type) { static int zoran_s_fmt_vid_overlay(struct file *file, void *__fh,
case V4L2_BUF_TYPE_VIDEO_OVERLAY: struct v4l2_format *fmt)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int res;
dprintk(3, "x=%d, y=%d, w=%d, h=%d, cnt=%d, map=0x%p\n", dprintk(3, "x=%d, y=%d, w=%d, h=%d, cnt=%d, map=0x%p\n",
fmt->fmt.win.w.left, fmt->fmt.win.w.top, fmt->fmt.win.w.left, fmt->fmt.win.w.top,
...@@ -2767,8 +2779,7 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2767,8 +2779,7 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
fmt->fmt.win.clipcount, fmt->fmt.win.clipcount,
fmt->fmt.win.bitmap); fmt->fmt.win.bitmap);
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
res = res = setup_window(file, fmt->fmt.win.w.left,
setup_window(file, fmt->fmt.win.w.left,
fmt->fmt.win.w.top, fmt->fmt.win.w.top,
fmt->fmt.win.w.width, fmt->fmt.win.w.width,
fmt->fmt.win.w.height, fmt->fmt.win.w.height,
...@@ -2778,65 +2789,48 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2778,65 +2789,48 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
fmt->fmt.win.bitmap); fmt->fmt.win.bitmap);
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
break; }
case V4L2_BUF_TYPE_VIDEO_CAPTURE: static int zoran_s_fmt_vid_out(struct file *file, void *__fh,
case V4L2_BUF_TYPE_VIDEO_OUTPUT: struct v4l2_format *fmt)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
__le32 printformat = __cpu_to_le32(fmt->fmt.pix.pixelformat);
struct zoran_jpg_settings settings;
int res = 0;
printformat =
__cpu_to_le32(fmt->fmt.pix.pixelformat);
dprintk(3, "size=%dx%d, fmt=0x%x (%4.4s)\n", dprintk(3, "size=%dx%d, fmt=0x%x (%4.4s)\n",
fmt->fmt.pix.width, fmt->fmt.pix.height, fmt->fmt.pix.width, fmt->fmt.pix.height,
fmt->fmt.pix.pixelformat, fmt->fmt.pix.pixelformat,
(char *) &printformat); (char *) &printformat);
if (fmt->fmt.pix.pixelformat != V4L2_PIX_FMT_MJPEG)
/* we can be requested to do JPEG/raw playback/capture */
if (!
(fmt->type == V4L2_BUF_TYPE_VIDEO_CAPTURE ||
(fmt->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
fmt->fmt.pix.pixelformat ==
V4L2_PIX_FMT_MJPEG))) {
dprintk(1,
KERN_ERR
"%s: VIDIOC_S_FMT - unknown type %d/0x%x(%4.4s) combination\n",
ZR_DEVNAME(zr), fmt->type,
fmt->fmt.pix.pixelformat,
(char *) &printformat);
return -EINVAL; return -EINVAL;
}
if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG) {
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
settings = fh->jpg_settings; settings = fh->jpg_settings;
if (fh->v4l_buffers.allocated || if (fh->v4l_buffers.allocated || fh->jpg_buffers.allocated) {
fh->jpg_buffers.allocated) { dprintk(1, KERN_ERR "%s: VIDIOC_S_FMT - cannot change capture mode\n",
dprintk(1,
KERN_ERR
"%s: VIDIOC_S_FMT - cannot change capture mode\n",
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
res = -EBUSY; res = -EBUSY;
goto sfmtjpg_unlock_and_return; goto sfmtjpg_unlock_and_return;
} }
/* we actually need to set 'real' parameters now */ /* we actually need to set 'real' parameters now */
if ((fmt->fmt.pix.height * 2) > if ((fmt->fmt.pix.height * 2) > BUZ_MAX_HEIGHT)
BUZ_MAX_HEIGHT)
settings.TmpDcm = 1; settings.TmpDcm = 1;
else else
settings.TmpDcm = 2; settings.TmpDcm = 2;
settings.decimation = 0; settings.decimation = 0;
if (fmt->fmt.pix.height <= if (fmt->fmt.pix.height <= fh->jpg_settings.img_height / 2)
fh->jpg_settings.img_height / 2)
settings.VerDcm = 2; settings.VerDcm = 2;
else else
settings.VerDcm = 1; settings.VerDcm = 1;
if (fmt->fmt.pix.width <= if (fmt->fmt.pix.width <= fh->jpg_settings.img_width / 4)
fh->jpg_settings.img_width / 4)
settings.HorDcm = 4; settings.HorDcm = 4;
else if (fmt->fmt.pix.width <= else if (fmt->fmt.pix.width <= fh->jpg_settings.img_width / 2)
fh->jpg_settings.img_width / 2)
settings.HorDcm = 2; settings.HorDcm = 2;
else else
settings.HorDcm = 1; settings.HorDcm = 1;
...@@ -2846,141 +2840,103 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2846,141 +2840,103 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
settings.field_per_buff = 1; settings.field_per_buff = 1;
/* check */ /* check */
if ((res = res = zoran_check_jpg_settings(zr, &settings);
zoran_check_jpg_settings(zr, if (res)
&settings)))
goto sfmtjpg_unlock_and_return; goto sfmtjpg_unlock_and_return;
/* it's ok, so set them */ /* it's ok, so set them */
fh->jpg_settings = settings; fh->jpg_settings = settings;
/* tell the user what we actually did */ /* tell the user what we actually did */
fmt->fmt.pix.width = fmt->fmt.pix.width = settings.img_width / settings.HorDcm;
settings.img_width / settings.HorDcm; fmt->fmt.pix.height = settings.img_height * 2 /
fmt->fmt.pix.height =
settings.img_height * 2 /
(settings.TmpDcm * settings.VerDcm); (settings.TmpDcm * settings.VerDcm);
if (settings.TmpDcm == 1) if (settings.TmpDcm == 1)
fmt->fmt.pix.field = fmt->fmt.pix.field = (fh->jpg_settings.odd_even ?
(fh->jpg_settings. V4L2_FIELD_SEQ_TB : V4L2_FIELD_SEQ_BT);
odd_even ? V4L2_FIELD_SEQ_TB :
V4L2_FIELD_SEQ_BT);
else else
fmt->fmt.pix.field = fmt->fmt.pix.field = (fh->jpg_settings.odd_even ?
(fh->jpg_settings. V4L2_FIELD_TOP : V4L2_FIELD_BOTTOM);
odd_even ? V4L2_FIELD_TOP : fh->jpg_buffers.buffer_size = zoran_v4l2_calc_bufsize(&fh->jpg_settings);
V4L2_FIELD_BOTTOM);
fh->jpg_buffers.buffer_size =
zoran_v4l2_calc_bufsize(&fh->
jpg_settings);
fmt->fmt.pix.bytesperline = 0; fmt->fmt.pix.bytesperline = 0;
fmt->fmt.pix.sizeimage = fmt->fmt.pix.sizeimage = fh->jpg_buffers.buffer_size;
fh->jpg_buffers.buffer_size; fmt->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
fmt->fmt.pix.colorspace =
V4L2_COLORSPACE_SMPTE170M;
/* we hereby abuse this variable to show that /* we hereby abuse this variable to show that
* we're gonna do mjpeg capture */ * we're gonna do mjpeg capture */
fh->map_mode = fh->map_mode = (fmt->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) ?
(fmt->type == ZORAN_MAP_MODE_JPG_REC : ZORAN_MAP_MODE_JPG_PLAY;
V4L2_BUF_TYPE_VIDEO_CAPTURE) ? sfmtjpg_unlock_and_return:
ZORAN_MAP_MODE_JPG_REC :
ZORAN_MAP_MODE_JPG_PLAY;
sfmtjpg_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
} else { return res;
}
static int zoran_s_fmt_vid_cap(struct file *file, void *__fh,
struct v4l2_format *fmt)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int i;
int res = 0;
if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG)
return zoran_s_fmt_vid_out(file, fh, fmt);
for (i = 0; i < NUM_FORMATS; i++) for (i = 0; i < NUM_FORMATS; i++)
if (fmt->fmt.pix.pixelformat == if (fmt->fmt.pix.pixelformat == zoran_formats[i].fourcc)
zoran_formats[i].fourcc)
break; break;
if (i == NUM_FORMATS) { if (i == NUM_FORMATS) {
dprintk(1, dprintk(1, KERN_ERR "%s: VIDIOC_S_FMT - unknown/unsupported format 0x%x\n",
KERN_ERR ZR_DEVNAME(zr), fmt->fmt.pix.pixelformat);
"%s: VIDIOC_S_FMT - unknown/unsupported format 0x%x (%4.4s)\n",
ZR_DEVNAME(zr),
fmt->fmt.pix.pixelformat,
(char *) &printformat);
return -EINVAL; return -EINVAL;
} }
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
if (fh->jpg_buffers.allocated || if (fh->jpg_buffers.allocated ||
(fh->v4l_buffers.allocated && (fh->v4l_buffers.allocated && fh->v4l_buffers.active != ZORAN_FREE)) {
fh->v4l_buffers.active != dprintk(1, KERN_ERR "%s: VIDIOC_S_FMT - cannot change capture mode\n",
ZORAN_FREE)) {
dprintk(1,
KERN_ERR
"%s: VIDIOC_S_FMT - cannot change capture mode\n",
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
res = -EBUSY; res = -EBUSY;
goto sfmtv4l_unlock_and_return; goto sfmtv4l_unlock_and_return;
} }
if (fmt->fmt.pix.height > BUZ_MAX_HEIGHT) if (fmt->fmt.pix.height > BUZ_MAX_HEIGHT)
fmt->fmt.pix.height = fmt->fmt.pix.height = BUZ_MAX_HEIGHT;
BUZ_MAX_HEIGHT;
if (fmt->fmt.pix.width > BUZ_MAX_WIDTH) if (fmt->fmt.pix.width > BUZ_MAX_WIDTH)
fmt->fmt.pix.width = BUZ_MAX_WIDTH; fmt->fmt.pix.width = BUZ_MAX_WIDTH;
if ((res = res = zoran_v4l_set_format(file, fmt->fmt.pix.width,
zoran_v4l_set_format(file, fmt->fmt.pix.height, &zoran_formats[i]);
fmt->fmt.pix. if (res)
width,
fmt->fmt.pix.
height,
&zoran_formats
[i])))
goto sfmtv4l_unlock_and_return; goto sfmtv4l_unlock_and_return;
/* tell the user the /* tell the user the
* results/missing stuff */ * results/missing stuff */
fmt->fmt.pix.bytesperline = fmt->fmt.pix.bytesperline = fh->v4l_settings.bytesperline;
fh->v4l_settings.bytesperline; fmt->fmt.pix.sizeimage = fh->v4l_settings.height * fh->v4l_settings.bytesperline;
fmt->fmt.pix.sizeimage = fmt->fmt.pix.colorspace = fh->v4l_settings.format->colorspace;
fh->v4l_settings.height * if (BUZ_MAX_HEIGHT < (fh->v4l_settings.height * 2))
fh->v4l_settings.bytesperline; fmt->fmt.pix.field = V4L2_FIELD_INTERLACED;
fmt->fmt.pix.colorspace =
fh->v4l_settings.format->colorspace;
if (BUZ_MAX_HEIGHT <
(fh->v4l_settings.height * 2))
fmt->fmt.pix.field =
V4L2_FIELD_INTERLACED;
else else
fmt->fmt.pix.field = fmt->fmt.pix.field = V4L2_FIELD_TOP;
V4L2_FIELD_TOP;
fh->map_mode = ZORAN_MAP_MODE_RAW; fh->map_mode = ZORAN_MAP_MODE_RAW;
sfmtv4l_unlock_and_return: sfmtv4l_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
}
break;
default:
dprintk(1,
KERN_ERR
"%s: VIDIOC_S_FMT - unsupported type %d\n",
ZR_DEVNAME(zr), fmt->type);
return -EINVAL;
}
return res; return res;
} }
break;
case VIDIOC_G_FBUF:
{
struct v4l2_framebuffer *fb = arg;
dprintk(3, KERN_DEBUG "%s: VIDIOC_G_FBUF\n", ZR_DEVNAME(zr)); static int zoran_g_fbuf(struct file *file, void *__fh,
struct v4l2_framebuffer *fb)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
memset(fb, 0, sizeof(*fb)); memset(fb, 0, sizeof(*fb));
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
fb->base = zr->buffer.base; fb->base = zr->buffer.base;
fb->fmt.width = zr->buffer.width; fb->fmt.width = zr->buffer.width;
fb->fmt.height = zr->buffer.height; fb->fmt.height = zr->buffer.height;
if (zr->overlay_settings.format) { if (zr->overlay_settings.format)
fb->fmt.pixelformat = fb->fmt.pixelformat = fh->overlay_settings.format->fourcc;
fh->overlay_settings.format->fourcc;
}
fb->fmt.bytesperline = zr->buffer.bytesperline; fb->fmt.bytesperline = zr->buffer.bytesperline;
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
fb->fmt.colorspace = V4L2_COLORSPACE_SRGB; fb->fmt.colorspace = V4L2_COLORSPACE_SRGB;
...@@ -2989,68 +2945,54 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -2989,68 +2945,54 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
fb->capability = V4L2_FBUF_CAP_LIST_CLIPPING; fb->capability = V4L2_FBUF_CAP_LIST_CLIPPING;
return 0; return 0;
} }
break;
case VIDIOC_S_FBUF: static int zoran_s_fbuf(struct file *file, void *__fh,
{ struct v4l2_framebuffer *fb)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int i, res = 0; int i, res = 0;
struct v4l2_framebuffer *fb = arg;
__le32 printformat = __cpu_to_le32(fb->fmt.pixelformat); __le32 printformat = __cpu_to_le32(fb->fmt.pixelformat);
dprintk(3,
KERN_DEBUG
"%s: VIDIOC_S_FBUF - base=0x%p, size=%dx%d, bpl=%d, fmt=0x%x (%4.4s)\n",
ZR_DEVNAME(zr), fb->base, fb->fmt.width, fb->fmt.height,
fb->fmt.bytesperline, fb->fmt.pixelformat,
(char *) &printformat);
for (i = 0; i < NUM_FORMATS; i++) for (i = 0; i < NUM_FORMATS; i++)
if (zoran_formats[i].fourcc == fb->fmt.pixelformat) if (zoran_formats[i].fourcc == fb->fmt.pixelformat)
break; break;
if (i == NUM_FORMATS) { if (i == NUM_FORMATS) {
dprintk(1, dprintk(1, KERN_ERR "%s: VIDIOC_S_FBUF - format=0x%x (%4.4s) not allowed\n",
KERN_ERR
"%s: VIDIOC_S_FBUF - format=0x%x (%4.4s) not allowed\n",
ZR_DEVNAME(zr), fb->fmt.pixelformat, ZR_DEVNAME(zr), fb->fmt.pixelformat,
(char *) &printformat); (char *)&printformat);
return -EINVAL; return -EINVAL;
} }
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
res = res = setup_fbuffer(file, fb->base, &zoran_formats[i],
setup_fbuffer(file, fb->base, &zoran_formats[i],
fb->fmt.width, fb->fmt.height, fb->fmt.width, fb->fmt.height,
fb->fmt.bytesperline); fb->fmt.bytesperline);
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_OVERLAY:
{
int *on = arg, res;
dprintk(3, KERN_DEBUG "%s: VIDIOC_PREVIEW - on=%d\n", static int zoran_overlay(struct file *file, void *__fh, unsigned int on)
ZR_DEVNAME(zr), *on); {
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int res;
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
res = setup_overlay(file, *on); res = setup_overlay(file, on);
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_REQBUFS: static int zoran_reqbufs(struct file *file, void *__fh, struct v4l2_requestbuffers *req)
{ {
struct v4l2_requestbuffers *req = arg; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int res = 0; int res = 0;
dprintk(3, KERN_DEBUG "%s: VIDIOC_REQBUFS - type=%d\n",
ZR_DEVNAME(zr), req->type);
if (req->memory != V4L2_MEMORY_MMAP) { if (req->memory != V4L2_MEMORY_MMAP) {
dprintk(1, dprintk(1,
KERN_ERR KERN_ERR
...@@ -3119,24 +3061,19 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3119,24 +3061,19 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
res = -EINVAL; res = -EINVAL;
goto v4l2reqbuf_unlock_and_return; goto v4l2reqbuf_unlock_and_return;
} }
v4l2reqbuf_unlock_and_return: v4l2reqbuf_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return 0; return res;
} }
break;
case VIDIOC_QUERYBUF: static int zoran_querybuf(struct file *file, void *__fh, struct v4l2_buffer *buf)
{ {
struct v4l2_buffer *buf = arg; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
__u32 type = buf->type; __u32 type = buf->type;
int index = buf->index, res; int index = buf->index, res;
dprintk(3,
KERN_DEBUG
"%s: VIDIOC_QUERYBUF - index=%d, type=%d\n",
ZR_DEVNAME(zr), buf->index, buf->type);
memset(buf, 0, sizeof(*buf)); memset(buf, 0, sizeof(*buf));
buf->type = type; buf->type = type;
buf->index = index; buf->index = index;
...@@ -3146,25 +3083,20 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3146,25 +3083,20 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_QBUF: static int zoran_qbuf(struct file *file, void *__fh, struct v4l2_buffer *buf)
{ {
struct v4l2_buffer *buf = arg; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int res = 0, codec_mode, buf_type; int res = 0, codec_mode, buf_type;
dprintk(3,
KERN_DEBUG "%s: VIDIOC_QBUF - type=%d, index=%d\n",
ZR_DEVNAME(zr), buf->type, buf->index);
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
switch (fh->map_mode) { switch (fh->map_mode) {
case ZORAN_MAP_MODE_RAW: case ZORAN_MAP_MODE_RAW:
if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) { if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_QBUF - invalid buf->type=%d for map_mode=%d\n", "%s: VIDIOC_QBUF - invalid buf->type=%d for map_mode=%d\n",
ZR_DEVNAME(zr), buf->type, fh->map_mode); ZR_DEVNAME(zr), buf->type, fh->map_mode);
res = -EINVAL; res = -EINVAL;
...@@ -3190,16 +3122,14 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3190,16 +3122,14 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
} }
if (buf->type != buf_type) { if (buf->type != buf_type) {
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_QBUF - invalid buf->type=%d for map_mode=%d\n", "%s: VIDIOC_QBUF - invalid buf->type=%d for map_mode=%d\n",
ZR_DEVNAME(zr), buf->type, fh->map_mode); ZR_DEVNAME(zr), buf->type, fh->map_mode);
res = -EINVAL; res = -EINVAL;
goto qbuf_unlock_and_return; goto qbuf_unlock_and_return;
} }
res = res = zoran_jpg_queue_frame(file, buf->index,
zoran_jpg_queue_frame(file, buf->index,
codec_mode); codec_mode);
if (res != 0) if (res != 0)
goto qbuf_unlock_and_return; goto qbuf_unlock_and_return;
...@@ -3210,35 +3140,30 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3210,35 +3140,30 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
break; break;
default: default:
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_QBUF - unsupported type %d\n", "%s: VIDIOC_QBUF - unsupported type %d\n",
ZR_DEVNAME(zr), buf->type); ZR_DEVNAME(zr), buf->type);
res = -EINVAL; res = -EINVAL;
goto qbuf_unlock_and_return; break;
} }
qbuf_unlock_and_return: qbuf_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_DQBUF: static int zoran_dqbuf(struct file *file, void *__fh, struct v4l2_buffer *buf)
{ {
struct v4l2_buffer *buf = arg; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int res = 0, buf_type, num = -1; /* compiler borks here (?) */ int res = 0, buf_type, num = -1; /* compiler borks here (?) */
dprintk(3, KERN_DEBUG "%s: VIDIOC_DQBUF - type=%d\n",
ZR_DEVNAME(zr), buf->type);
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
switch (fh->map_mode) { switch (fh->map_mode) {
case ZORAN_MAP_MODE_RAW: case ZORAN_MAP_MODE_RAW:
if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) { if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_QBUF - invalid buf->type=%d for map_mode=%d\n", "%s: VIDIOC_QBUF - invalid buf->type=%d for map_mode=%d\n",
ZR_DEVNAME(zr), buf->type, fh->map_mode); ZR_DEVNAME(zr), buf->type, fh->map_mode);
res = -EINVAL; res = -EINVAL;
...@@ -3247,15 +3172,13 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3247,15 +3172,13 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
num = zr->v4l_pend[zr->v4l_sync_tail & V4L_MASK_FRAME]; num = zr->v4l_pend[zr->v4l_sync_tail & V4L_MASK_FRAME];
if (file->f_flags & O_NONBLOCK && if (file->f_flags & O_NONBLOCK &&
zr->v4l_buffers.buffer[num].state != zr->v4l_buffers.buffer[num].state != BUZ_STATE_DONE) {
BUZ_STATE_DONE) {
res = -EAGAIN; res = -EAGAIN;
goto dqbuf_unlock_and_return; goto dqbuf_unlock_and_return;
} }
res = v4l_sync(file, num); res = v4l_sync(file, num);
if (res) if (res)
goto dqbuf_unlock_and_return; goto dqbuf_unlock_and_return;
else
zr->v4l_sync_tail++; zr->v4l_sync_tail++;
res = zoran_v4l2_buffer_status(file, buf, num); res = zoran_v4l2_buffer_status(file, buf, num);
break; break;
...@@ -3271,53 +3194,46 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3271,53 +3194,46 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (buf->type != buf_type) { if (buf->type != buf_type) {
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_QBUF - invalid buf->type=%d for map_mode=%d\n", "%s: VIDIOC_QBUF - invalid buf->type=%d for map_mode=%d\n",
ZR_DEVNAME(zr), buf->type, fh->map_mode); ZR_DEVNAME(zr), buf->type, fh->map_mode);
res = -EINVAL; res = -EINVAL;
goto dqbuf_unlock_and_return; goto dqbuf_unlock_and_return;
} }
num = num = zr->jpg_pend[zr->jpg_que_tail & BUZ_MASK_FRAME];
zr->jpg_pend[zr->
jpg_que_tail & BUZ_MASK_FRAME];
if (file->f_flags & O_NONBLOCK && if (file->f_flags & O_NONBLOCK &&
zr->jpg_buffers.buffer[num].state != zr->jpg_buffers.buffer[num].state != BUZ_STATE_DONE) {
BUZ_STATE_DONE) {
res = -EAGAIN; res = -EAGAIN;
goto dqbuf_unlock_and_return; goto dqbuf_unlock_and_return;
} }
res = jpg_sync(file, &bs); res = jpg_sync(file, &bs);
if (res) if (res)
goto dqbuf_unlock_and_return; goto dqbuf_unlock_and_return;
res = res = zoran_v4l2_buffer_status(file, buf, bs.frame);
zoran_v4l2_buffer_status(file, buf, bs.frame);
break; break;
} }
default: default:
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_DQBUF - unsupported type %d\n", "%s: VIDIOC_DQBUF - unsupported type %d\n",
ZR_DEVNAME(zr), buf->type); ZR_DEVNAME(zr), buf->type);
res = -EINVAL; res = -EINVAL;
goto dqbuf_unlock_and_return; break;
} }
dqbuf_unlock_and_return: dqbuf_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_STREAMON: static int zoran_streamon(struct file *file, void *__fh, enum v4l2_buf_type type)
{ {
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int res = 0; int res = 0;
dprintk(3, KERN_DEBUG "%s: VIDIOC_STREAMON\n", ZR_DEVNAME(zr));
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
switch (fh->map_mode) { switch (fh->map_mode) {
...@@ -3328,8 +3244,7 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3328,8 +3244,7 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
goto strmon_unlock_and_return; goto strmon_unlock_and_return;
} }
zr->v4l_buffers.active = fh->v4l_buffers.active = zr->v4l_buffers.active = fh->v4l_buffers.active = ZORAN_LOCKED;
ZORAN_LOCKED;
zr->v4l_settings = fh->v4l_settings; zr->v4l_settings = fh->v4l_settings;
zr->v4l_sync_tail = zr->v4l_pend_tail; zr->v4l_sync_tail = zr->v4l_pend_tail;
...@@ -3348,36 +3263,34 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3348,36 +3263,34 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
goto strmon_unlock_and_return; goto strmon_unlock_and_return;
} }
zr->jpg_buffers.active = fh->jpg_buffers.active = zr->jpg_buffers.active = fh->jpg_buffers.active = ZORAN_LOCKED;
ZORAN_LOCKED;
if (zr->jpg_que_head != zr->jpg_que_tail) { if (zr->jpg_que_head != zr->jpg_que_tail) {
/* Start the jpeg codec when the first frame is queued */ /* Start the jpeg codec when the first frame is queued */
jpeg_start(zr); jpeg_start(zr);
} }
break; break;
default: default:
dprintk(1, dprintk(1,
KERN_ERR KERN_ERR
"%s: VIDIOC_STREAMON - invalid map mode %d\n", "%s: VIDIOC_STREAMON - invalid map mode %d\n",
ZR_DEVNAME(zr), fh->map_mode); ZR_DEVNAME(zr), fh->map_mode);
res = -EINVAL; res = -EINVAL;
goto strmon_unlock_and_return; break;
} }
strmon_unlock_and_return: strmon_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_STREAMOFF: static int zoran_streamoff(struct file *file, void *__fh, enum v4l2_buf_type type)
{ {
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int i, res = 0; int i, res = 0;
dprintk(3, KERN_DEBUG "%s: VIDIOC_STREAMOFF\n", ZR_DEVNAME(zr));
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
switch (fh->map_mode) { switch (fh->map_mode) {
...@@ -3400,12 +3313,10 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3400,12 +3313,10 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
} }
for (i = 0; i < fh->v4l_buffers.num_buffers; i++) for (i = 0; i < fh->v4l_buffers.num_buffers; i++)
zr->v4l_buffers.buffer[i].state = zr->v4l_buffers.buffer[i].state = BUZ_STATE_USER;
BUZ_STATE_USER;
fh->v4l_buffers = zr->v4l_buffers; fh->v4l_buffers = zr->v4l_buffers;
zr->v4l_buffers.active = fh->v4l_buffers.active = zr->v4l_buffers.active = fh->v4l_buffers.active = ZORAN_FREE;
ZORAN_FREE;
zr->v4l_grab_seq = 0; zr->v4l_grab_seq = 0;
zr->v4l_pend_head = zr->v4l_pend_tail = 0; zr->v4l_pend_head = zr->v4l_pend_tail = 0;
...@@ -3423,37 +3334,29 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3423,37 +3334,29 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
if (zr->jpg_buffers.active == ZORAN_FREE) if (zr->jpg_buffers.active == ZORAN_FREE)
goto strmoff_unlock_and_return; goto strmoff_unlock_and_return;
res = res = jpg_qbuf(file, -1,
jpg_qbuf(file, -1, (fh->map_mode == ZORAN_MAP_MODE_JPG_REC) ?
(fh->map_mode ==
ZORAN_MAP_MODE_JPG_REC) ?
BUZ_MODE_MOTION_COMPRESS : BUZ_MODE_MOTION_COMPRESS :
BUZ_MODE_MOTION_DECOMPRESS); BUZ_MODE_MOTION_DECOMPRESS);
if (res) if (res)
goto strmoff_unlock_and_return; goto strmoff_unlock_and_return;
break; break;
default: default:
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_STREAMOFF - invalid map mode %d\n", "%s: VIDIOC_STREAMOFF - invalid map mode %d\n",
ZR_DEVNAME(zr), fh->map_mode); ZR_DEVNAME(zr), fh->map_mode);
res = -EINVAL; res = -EINVAL;
goto strmoff_unlock_and_return; break;
} }
strmoff_unlock_and_return: strmoff_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_QUERYCTRL:
{
struct v4l2_queryctrl *ctrl = arg;
dprintk(3, KERN_DEBUG "%s: VIDIOC_QUERYCTRL - id=%d\n",
ZR_DEVNAME(zr), ctrl->id);
static int zoran_queryctrl(struct file *file, void *__fh,
struct v4l2_queryctrl *ctrl)
{
/* we only support hue/saturation/contrast/brightness */ /* we only support hue/saturation/contrast/brightness */
if (ctrl->id < V4L2_CID_BRIGHTNESS || if (ctrl->id < V4L2_CID_BRIGHTNESS ||
ctrl->id > V4L2_CID_HUE) ctrl->id > V4L2_CID_HUE)
...@@ -3486,15 +3389,12 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3486,15 +3389,12 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
ctrl->type = V4L2_CTRL_TYPE_INTEGER; ctrl->type = V4L2_CTRL_TYPE_INTEGER;
return 0; return 0;
} }
break;
case VIDIOC_G_CTRL:
{
struct v4l2_control *ctrl = arg;
dprintk(3, KERN_DEBUG "%s: VIDIOC_G_CTRL - id=%d\n", static int zoran_g_ctrl(struct file *file, void *__fh, struct v4l2_control *ctrl)
ZR_DEVNAME(zr), ctrl->id); {
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
/* we only support hue/saturation/contrast/brightness */ /* we only support hue/saturation/contrast/brightness */
if (ctrl->id < V4L2_CID_BRIGHTNESS || if (ctrl->id < V4L2_CID_BRIGHTNESS ||
...@@ -3519,25 +3419,21 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3519,25 +3419,21 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return 0; return 0;
} }
break;
case VIDIOC_S_CTRL: static int zoran_s_ctrl(struct file *file, void *__fh, struct v4l2_control *ctrl)
{ {
struct v4l2_control *ctrl = arg; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
struct video_picture pict; struct video_picture pict;
dprintk(3, KERN_DEBUG "%s: VIDIOC_S_CTRL - id=%d\n",
ZR_DEVNAME(zr), ctrl->id);
/* we only support hue/saturation/contrast/brightness */ /* we only support hue/saturation/contrast/brightness */
if (ctrl->id < V4L2_CID_BRIGHTNESS || if (ctrl->id < V4L2_CID_BRIGHTNESS ||
ctrl->id > V4L2_CID_HUE) ctrl->id > V4L2_CID_HUE)
return -EINVAL; return -EINVAL;
if (ctrl->value < 0 || ctrl->value > 65535) { if (ctrl->value < 0 || ctrl->value > 65535) {
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_S_CTRL - invalid value %d for id=%d\n", "%s: VIDIOC_S_CTRL - invalid value %d for id=%d\n",
ZR_DEVNAME(zr), ctrl->value, ctrl->id); ZR_DEVNAME(zr), ctrl->value, ctrl->id);
return -EINVAL; return -EINVAL;
...@@ -3568,71 +3464,14 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3568,71 +3464,14 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return 0; return 0;
} }
break;
case VIDIOC_ENUMSTD:
{
struct v4l2_standard *std = arg;
dprintk(3, KERN_DEBUG "%s: VIDIOC_ENUMSTD - index=%d\n",
ZR_DEVNAME(zr), std->index);
if (std->index < 0 || std->index >= (zr->card.norms + 1))
return -EINVAL;
else {
int id = std->index;
memset(std, 0, sizeof(*std));
std->index = id;
}
if (std->index == zr->card.norms) {
/* if we have autodetect, ... */
struct video_decoder_capability caps;
decoder_command(zr, DECODER_GET_CAPABILITIES,
&caps);
if (caps.flags & VIDEO_DECODER_AUTO) {
std->id = V4L2_STD_ALL;
strncpy(std->name, "Autodetect", sizeof(std->name)-1);
return 0;
} else
return -EINVAL;
}
switch (std->index) {
case 0:
std->id = V4L2_STD_PAL;
strncpy(std->name, "PAL", sizeof(std->name)-1);
std->frameperiod.numerator = 1;
std->frameperiod.denominator = 25;
std->framelines = zr->card.tvn[0]->Ht;
break;
case 1:
std->id = V4L2_STD_NTSC;
strncpy(std->name, "NTSC", sizeof(std->name)-1);
std->frameperiod.numerator = 1001;
std->frameperiod.denominator = 30000;
std->framelines = zr->card.tvn[1]->Ht;
break;
case 2:
std->id = V4L2_STD_SECAM;
strncpy(std->name, "SECAM", sizeof(std->name)-1);
std->frameperiod.numerator = 1;
std->frameperiod.denominator = 25;
std->framelines = zr->card.tvn[2]->Ht;
break;
}
return 0;
}
break;
case VIDIOC_G_STD: static int zoran_g_std(struct file *file, void *__fh, v4l2_std_id *std)
{ {
v4l2_std_id *std = arg; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int norm; int norm;
dprintk(3, KERN_DEBUG "%s: VIDIOC_G_STD\n", ZR_DEVNAME(zr));
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
norm = zr->norm; norm = zr->norm;
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
...@@ -3650,16 +3489,13 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3650,16 +3489,13 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
} }
return 0; return 0;
} }
break;
case VIDIOC_S_STD: static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id *std)
{ {
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int norm = -1, res = 0; int norm = -1, res = 0;
v4l2_std_id *std = arg;
dprintk(3, KERN_DEBUG "%s: VIDIOC_S_STD - norm=0x%llx\n",
ZR_DEVNAME(zr), (unsigned long long)*std);
if ((*std & V4L2_STD_PAL) && !(*std & ~V4L2_STD_PAL)) if ((*std & V4L2_STD_PAL) && !(*std & ~V4L2_STD_PAL))
norm = VIDEO_MODE_PAL; norm = VIDEO_MODE_PAL;
...@@ -3670,32 +3506,30 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3670,32 +3506,30 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
else if (*std == V4L2_STD_ALL) else if (*std == V4L2_STD_ALL)
norm = VIDEO_MODE_AUTO; norm = VIDEO_MODE_AUTO;
else { else {
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_S_STD - invalid norm 0x%llx\n", "%s: VIDIOC_S_STD - invalid norm 0x%llx\n",
ZR_DEVNAME(zr), (unsigned long long)*std); ZR_DEVNAME(zr), (unsigned long long)*std);
return -EINVAL; return -EINVAL;
} }
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
if ((res = zoran_set_norm(zr, norm))) res = zoran_set_norm(zr, norm);
if (res)
goto sstd_unlock_and_return; goto sstd_unlock_and_return;
res = wait_grab_pending(zr); res = wait_grab_pending(zr);
sstd_unlock_and_return: sstd_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_ENUMINPUT: static int zoran_enum_input(struct file *file, void *__fh,
{ struct v4l2_input *inp)
struct v4l2_input *inp = arg; {
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int status; int status;
dprintk(3, KERN_DEBUG "%s: VIDIOC_ENUMINPUT - index=%d\n",
ZR_DEVNAME(zr), inp->index);
if (inp->index < 0 || inp->index >= zr->card.inputs) if (inp->index < 0 || inp->index >= zr->card.inputs)
return -EINVAL; return -EINVAL;
else { else {
...@@ -3722,49 +3556,41 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3722,49 +3556,41 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
inp->status |= V4L2_IN_ST_NO_COLOR; inp->status |= V4L2_IN_ST_NO_COLOR;
return 0; return 0;
} }
break;
case VIDIOC_G_INPUT:
{
int *input = arg;
dprintk(3, KERN_DEBUG "%s: VIDIOC_G_INPUT\n", ZR_DEVNAME(zr)); static int zoran_g_input(struct file *file, void *__fh, unsigned int *input)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
*input = zr->input; *input = zr->input;
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return 0; return 0;
} }
break;
case VIDIOC_S_INPUT:
{
int *input = arg, res = 0;
dprintk(3, KERN_DEBUG "%s: VIDIOC_S_INPUT - input=%d\n", static int zoran_s_input(struct file *file, void *__fh, unsigned int input)
ZR_DEVNAME(zr), *input); {
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int res;
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
if ((res = zoran_set_input(zr, *input))) res = zoran_set_input(zr, input);
if (res)
goto sinput_unlock_and_return; goto sinput_unlock_and_return;
/* Make sure the changes come into effect */ /* Make sure the changes come into effect */
res = wait_grab_pending(zr); res = wait_grab_pending(zr);
sinput_unlock_and_return: sinput_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_ENUMOUTPUT:
{
struct v4l2_output *outp = arg;
dprintk(3, KERN_DEBUG "%s: VIDIOC_ENUMOUTPUT - index=%d\n",
ZR_DEVNAME(zr), outp->index);
static int zoran_enum_output(struct file *file, void *__fh,
struct v4l2_output *outp)
{
if (outp->index != 0) if (outp->index != 0)
return -EINVAL; return -EINVAL;
...@@ -3774,44 +3600,31 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3774,44 +3600,31 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
strncpy(outp->name, "Autodetect", sizeof(outp->name)-1); strncpy(outp->name, "Autodetect", sizeof(outp->name)-1);
return 0; return 0;
} }
break;
case VIDIOC_G_OUTPUT:
{
int *output = arg;
dprintk(3, KERN_DEBUG "%s: VIDIOC_G_OUTPUT\n", ZR_DEVNAME(zr));
static int zoran_g_output(struct file *file, void *__fh, unsigned int *output)
{
*output = 0; *output = 0;
return 0; return 0;
} }
break;
case VIDIOC_S_OUTPUT:
{
int *output = arg;
dprintk(3, KERN_DEBUG "%s: VIDIOC_S_OUTPUT - output=%d\n",
ZR_DEVNAME(zr), *output);
if (*output != 0) static int zoran_s_output(struct file *file, void *__fh, unsigned int output)
{
if (output != 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
} }
break;
/* cropping (sub-frame capture) */ /* cropping (sub-frame capture) */
case VIDIOC_CROPCAP: static int zoran_cropcap(struct file *file, void *__fh,
{ struct v4l2_cropcap *cropcap)
struct v4l2_cropcap *cropcap = arg; {
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int type = cropcap->type, res = 0; int type = cropcap->type, res = 0;
dprintk(3, KERN_ERR "%s: VIDIOC_CROPCAP - type=%d\n",
ZR_DEVNAME(zr), cropcap->type);
memset(cropcap, 0, sizeof(*cropcap)); memset(cropcap, 0, sizeof(*cropcap));
cropcap->type = type; cropcap->type = type;
...@@ -3820,8 +3633,7 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3820,8 +3633,7 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
if (cropcap->type != V4L2_BUF_TYPE_VIDEO_OUTPUT && if (cropcap->type != V4L2_BUF_TYPE_VIDEO_OUTPUT &&
(cropcap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || (cropcap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
fh->map_mode == ZORAN_MAP_MODE_RAW)) { fh->map_mode == ZORAN_MAP_MODE_RAW)) {
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_CROPCAP - subcapture only supported for compressed capture\n", "%s: VIDIOC_CROPCAP - subcapture only supported for compressed capture\n",
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
res = -EINVAL; res = -EINVAL;
...@@ -3834,20 +3646,17 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3834,20 +3646,17 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
cropcap->defrect.top = cropcap->defrect.left = 0; cropcap->defrect.top = cropcap->defrect.left = 0;
cropcap->defrect.width = BUZ_MIN_WIDTH; cropcap->defrect.width = BUZ_MIN_WIDTH;
cropcap->defrect.height = BUZ_MIN_HEIGHT; cropcap->defrect.height = BUZ_MIN_HEIGHT;
cropcap_unlock_and_return: cropcap_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_G_CROP: static int zoran_g_crop(struct file *file, void *__fh, struct v4l2_crop *crop)
{ {
struct v4l2_crop *crop = arg; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int type = crop->type, res = 0; int type = crop->type, res = 0;
dprintk(3, KERN_ERR "%s: VIDIOC_G_CROP - type=%d\n",
ZR_DEVNAME(zr), crop->type);
memset(crop, 0, sizeof(*crop)); memset(crop, 0, sizeof(*crop));
crop->type = type; crop->type = type;
...@@ -3869,31 +3678,25 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3869,31 +3678,25 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
crop->c.width = fh->jpg_settings.img_width; crop->c.width = fh->jpg_settings.img_width;
crop->c.height = fh->jpg_settings.img_height; crop->c.height = fh->jpg_settings.img_height;
gcrop_unlock_and_return: gcrop_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_S_CROP: static int zoran_s_crop(struct file *file, void *__fh, struct v4l2_crop *crop)
{ {
struct v4l2_crop *crop = arg; struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int res = 0; int res = 0;
struct zoran_jpg_settings settings;
settings = fh->jpg_settings; settings = fh->jpg_settings;
dprintk(3,
KERN_ERR
"%s: VIDIOC_S_CROP - type=%d, x=%d,y=%d,w=%d,h=%d\n",
ZR_DEVNAME(zr), crop->type, crop->c.left, crop->c.top,
crop->c.width, crop->c.height);
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
if (fh->jpg_buffers.allocated || fh->v4l_buffers.allocated) { if (fh->jpg_buffers.allocated || fh->v4l_buffers.allocated) {
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_S_CROP - cannot change settings while active\n", "%s: VIDIOC_S_CROP - cannot change settings while active\n",
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
res = -EBUSY; res = -EBUSY;
...@@ -3903,8 +3706,7 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3903,8 +3706,7 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
if (crop->type != V4L2_BUF_TYPE_VIDEO_OUTPUT && if (crop->type != V4L2_BUF_TYPE_VIDEO_OUTPUT &&
(crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
fh->map_mode == ZORAN_MAP_MODE_RAW)) { fh->map_mode == ZORAN_MAP_MODE_RAW)) {
dprintk(1, dprintk(1, KERN_ERR
KERN_ERR
"%s: VIDIOC_G_CROP - subcapture only supported for compressed capture\n", "%s: VIDIOC_G_CROP - subcapture only supported for compressed capture\n",
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
res = -EINVAL; res = -EINVAL;
...@@ -3918,25 +3720,23 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3918,25 +3720,23 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
settings.img_height = crop->c.height; settings.img_height = crop->c.height;
/* check validity */ /* check validity */
if ((res = zoran_check_jpg_settings(zr, &settings))) res = zoran_check_jpg_settings(zr, &settings);
if (res)
goto scrop_unlock_and_return; goto scrop_unlock_and_return;
/* accept */ /* accept */
fh->jpg_settings = settings; fh->jpg_settings = settings;
scrop_unlock_and_return: scrop_unlock_and_return:
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
} }
break;
case VIDIOC_G_JPEGCOMP:
{
struct v4l2_jpegcompression *params = arg;
dprintk(3, KERN_DEBUG "%s: VIDIOC_G_JPEGCOMP\n",
ZR_DEVNAME(zr));
static int zoran_g_jpegcomp(struct file *file, void *__fh,
struct v4l2_jpegcompression *params)
{
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
memset(params, 0, sizeof(*params)); memset(params, 0, sizeof(*params));
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
...@@ -3957,211 +3757,44 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -3957,211 +3757,44 @@ static long zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return 0; return 0;
} }
break;
case VIDIOC_S_JPEGCOMP: static int zoran_s_jpegcomp(struct file *file, void *__fh,
{ struct v4l2_jpegcompression *params)
struct v4l2_jpegcompression *params = arg; {
struct zoran_fh *fh = __fh;
struct zoran *zr = fh->zr;
int res = 0; int res = 0;
struct zoran_jpg_settings settings;
settings = fh->jpg_settings; settings = fh->jpg_settings;
dprintk(3,
KERN_DEBUG
"%s: VIDIOC_S_JPEGCOMP - quality=%d, APPN=%d, APP_len=%d, COM_len=%d\n",
ZR_DEVNAME(zr), params->quality, params->APPn,
params->APP_len, params->COM_len);
settings.jpg_comp = *params; settings.jpg_comp = *params;
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
if (fh->v4l_buffers.active != ZORAN_FREE || if (fh->v4l_buffers.active != ZORAN_FREE ||
fh->jpg_buffers.active != ZORAN_FREE) { fh->jpg_buffers.active != ZORAN_FREE) {
dprintk(1, dprintk(1, KERN_WARNING
KERN_WARNING
"%s: VIDIOC_S_JPEGCOMP called while in playback/capture mode\n", "%s: VIDIOC_S_JPEGCOMP called while in playback/capture mode\n",
ZR_DEVNAME(zr)); ZR_DEVNAME(zr));
res = -EBUSY; res = -EBUSY;
goto sjpegc_unlock_and_return; goto sjpegc_unlock_and_return;
} }
if ((res = zoran_check_jpg_settings(zr, &settings))) res = zoran_check_jpg_settings(zr, &settings);
if (res)
goto sjpegc_unlock_and_return; goto sjpegc_unlock_and_return;
if (!fh->jpg_buffers.allocated) if (!fh->jpg_buffers.allocated)
fh->jpg_buffers.buffer_size = fh->jpg_buffers.buffer_size =
zoran_v4l2_calc_bufsize(&fh->jpg_settings); zoran_v4l2_calc_bufsize(&fh->jpg_settings);
fh->jpg_settings.jpg_comp = *params = settings.jpg_comp; fh->jpg_settings.jpg_comp = *params = settings.jpg_comp;
sjpegc_unlock_and_return: sjpegc_unlock_and_return:
mutex_unlock(&zr->resource_lock);
return 0;
}
break;
case VIDIOC_QUERYSTD: /* why is this useful? */
{
v4l2_std_id *std = arg;
dprintk(3,
KERN_DEBUG "%s: VIDIOC_QUERY_STD - std=0x%llx\n",
ZR_DEVNAME(zr), (unsigned long long)*std);
if (*std == V4L2_STD_ALL || *std == V4L2_STD_NTSC ||
*std == V4L2_STD_PAL || (*std == V4L2_STD_SECAM &&
zr->card.norms == 3)) {
return 0;
}
return -EINVAL;
}
break;
case VIDIOC_TRY_FMT:
{
struct v4l2_format *fmt = arg;
int res = 0;
dprintk(3, KERN_DEBUG "%s: VIDIOC_TRY_FMT - type=%d\n",
ZR_DEVNAME(zr), fmt->type);
switch (fmt->type) {
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
mutex_lock(&zr->resource_lock);
if (fmt->fmt.win.w.width > BUZ_MAX_WIDTH)
fmt->fmt.win.w.width = BUZ_MAX_WIDTH;
if (fmt->fmt.win.w.width < BUZ_MIN_WIDTH)
fmt->fmt.win.w.width = BUZ_MIN_WIDTH;
if (fmt->fmt.win.w.height > BUZ_MAX_HEIGHT)
fmt->fmt.win.w.height = BUZ_MAX_HEIGHT;
if (fmt->fmt.win.w.height < BUZ_MIN_HEIGHT)
fmt->fmt.win.w.height = BUZ_MIN_HEIGHT;
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
break;
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
case V4L2_BUF_TYPE_VIDEO_OUTPUT:
if (fmt->fmt.pix.bytesperline > 0)
return -EINVAL;
mutex_lock(&zr->resource_lock);
if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG) {
settings = fh->jpg_settings;
/* we actually need to set 'real' parameters now */
if ((fmt->fmt.pix.height * 2) >
BUZ_MAX_HEIGHT)
settings.TmpDcm = 1;
else
settings.TmpDcm = 2;
settings.decimation = 0;
if (fmt->fmt.pix.height <=
fh->jpg_settings.img_height / 2)
settings.VerDcm = 2;
else
settings.VerDcm = 1;
if (fmt->fmt.pix.width <=
fh->jpg_settings.img_width / 4)
settings.HorDcm = 4;
else if (fmt->fmt.pix.width <=
fh->jpg_settings.img_width / 2)
settings.HorDcm = 2;
else
settings.HorDcm = 1;
if (settings.TmpDcm == 1)
settings.field_per_buff = 2;
else
settings.field_per_buff = 1;
/* check */
if ((res =
zoran_check_jpg_settings(zr,
&settings)))
goto tryfmt_unlock_and_return;
/* tell the user what we actually did */
fmt->fmt.pix.width =
settings.img_width / settings.HorDcm;
fmt->fmt.pix.height =
settings.img_height * 2 /
(settings.TmpDcm * settings.VerDcm);
if (settings.TmpDcm == 1)
fmt->fmt.pix.field =
(fh->jpg_settings.
odd_even ? V4L2_FIELD_SEQ_TB :
V4L2_FIELD_SEQ_BT);
else
fmt->fmt.pix.field =
(fh->jpg_settings.
odd_even ? V4L2_FIELD_TOP :
V4L2_FIELD_BOTTOM);
fmt->fmt.pix.sizeimage =
zoran_v4l2_calc_bufsize(&settings);
} else if (fmt->type ==
V4L2_BUF_TYPE_VIDEO_CAPTURE) {
int i;
for (i = 0; i < NUM_FORMATS; i++)
if (zoran_formats[i].fourcc ==
fmt->fmt.pix.pixelformat)
break;
if (i == NUM_FORMATS) {
res = -EINVAL;
goto tryfmt_unlock_and_return;
}
if (fmt->fmt.pix.width > BUZ_MAX_WIDTH)
fmt->fmt.pix.width = BUZ_MAX_WIDTH;
if (fmt->fmt.pix.width < BUZ_MIN_WIDTH)
fmt->fmt.pix.width = BUZ_MIN_WIDTH;
if (fmt->fmt.pix.height > BUZ_MAX_HEIGHT)
fmt->fmt.pix.height =
BUZ_MAX_HEIGHT;
if (fmt->fmt.pix.height < BUZ_MIN_HEIGHT)
fmt->fmt.pix.height =
BUZ_MIN_HEIGHT;
} else {
res = -EINVAL;
goto tryfmt_unlock_and_return;
}
tryfmt_unlock_and_return:
mutex_unlock(&zr->resource_lock);
return res;
break;
default:
return -EINVAL;
}
return 0;
}
break;
default:
dprintk(1, KERN_DEBUG "%s: UNKNOWN ioctl cmd: 0x%x\n",
ZR_DEVNAME(zr), cmd);
return -ENOIOCTLCMD;
break;
}
return 0; return 0;
} }
static long
zoran_ioctl(struct file *file,
unsigned int cmd,
unsigned long arg)
{
return video_usercopy(file, cmd, arg, zoran_do_ioctl);
}
static unsigned int static unsigned int
zoran_poll (struct file *file, zoran_poll (struct file *file,
poll_table *wait) poll_table *wait)
...@@ -4300,10 +3933,7 @@ zoran_vm_close (struct vm_area_struct *vma) ...@@ -4300,10 +3933,7 @@ zoran_vm_close (struct vm_area_struct *vma)
fh->jpg_buffers.active = fh->jpg_buffers.active =
ZORAN_FREE; ZORAN_FREE;
} }
//jpg_fbuffer_free(file); jpg_fbuffer_free(file);
fh->jpg_buffers.allocated = 0;
fh->jpg_buffers.ready_to_be_freed = 1;
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
} }
...@@ -4340,10 +3970,7 @@ zoran_vm_close (struct vm_area_struct *vma) ...@@ -4340,10 +3970,7 @@ zoran_vm_close (struct vm_area_struct *vma)
ZORAN_FREE; ZORAN_FREE;
spin_unlock_irqrestore(&zr->spinlock, flags); spin_unlock_irqrestore(&zr->spinlock, flags);
} }
//v4l_fbuffer_free(file); v4l_fbuffer_free(file);
fh->v4l_buffers.allocated = 0;
fh->v4l_buffers.ready_to_be_freed = 1;
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
} }
...@@ -4582,11 +4209,53 @@ zoran_mmap (struct file *file, ...@@ -4582,11 +4209,53 @@ zoran_mmap (struct file *file,
return 0; return 0;
} }
static const struct v4l2_ioctl_ops zoran_ioctl_ops = {
.vidioc_querycap = zoran_querycap,
.vidioc_cropcap = zoran_cropcap,
.vidioc_s_crop = zoran_s_crop,
.vidioc_g_crop = zoran_g_crop,
.vidioc_enum_input = zoran_enum_input,
.vidioc_g_input = zoran_g_input,
.vidioc_s_input = zoran_s_input,
.vidioc_enum_output = zoran_enum_output,
.vidioc_g_output = zoran_g_output,
.vidioc_s_output = zoran_s_output,
.vidioc_g_fbuf = zoran_g_fbuf,
.vidioc_s_fbuf = zoran_s_fbuf,
.vidioc_g_std = zoran_g_std,
.vidioc_s_std = zoran_s_std,
.vidioc_g_jpegcomp = zoran_g_jpegcomp,
.vidioc_s_jpegcomp = zoran_s_jpegcomp,
.vidioc_overlay = zoran_overlay,
.vidioc_reqbufs = zoran_reqbufs,
.vidioc_querybuf = zoran_querybuf,
.vidioc_qbuf = zoran_qbuf,
.vidioc_dqbuf = zoran_dqbuf,
.vidioc_streamon = zoran_streamon,
.vidioc_streamoff = zoran_streamoff,
.vidioc_enum_fmt_vid_cap = zoran_enum_fmt_vid_cap,
.vidioc_enum_fmt_vid_out = zoran_enum_fmt_vid_out,
.vidioc_enum_fmt_vid_overlay = zoran_enum_fmt_vid_overlay,
.vidioc_g_fmt_vid_cap = zoran_g_fmt_vid_cap,
.vidioc_g_fmt_vid_out = zoran_g_fmt_vid_out,
.vidioc_g_fmt_vid_overlay = zoran_g_fmt_vid_overlay,
.vidioc_s_fmt_vid_cap = zoran_s_fmt_vid_cap,
.vidioc_s_fmt_vid_out = zoran_s_fmt_vid_out,
.vidioc_s_fmt_vid_overlay = zoran_s_fmt_vid_overlay,
.vidioc_try_fmt_vid_cap = zoran_try_fmt_vid_cap,
.vidioc_try_fmt_vid_out = zoran_try_fmt_vid_out,
.vidioc_try_fmt_vid_overlay = zoran_try_fmt_vid_overlay,
.vidioc_queryctrl = zoran_queryctrl,
.vidioc_s_ctrl = zoran_s_ctrl,
.vidioc_g_ctrl = zoran_g_ctrl,
.vidioc_default = zoran_default,
};
static const struct v4l2_file_operations zoran_fops = { static const struct v4l2_file_operations zoran_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = zoran_open, .open = zoran_open,
.release = zoran_close, .release = zoran_close,
.ioctl = zoran_ioctl, .ioctl = video_ioctl2,
.read = zoran_read, .read = zoran_read,
.write = zoran_write, .write = zoran_write,
.mmap = zoran_mmap, .mmap = zoran_mmap,
...@@ -4596,7 +4265,9 @@ static const struct v4l2_file_operations zoran_fops = { ...@@ -4596,7 +4265,9 @@ static const struct v4l2_file_operations zoran_fops = {
struct video_device zoran_template __devinitdata = { struct video_device zoran_template __devinitdata = {
.name = ZORAN_NAME, .name = ZORAN_NAME,
.fops = &zoran_fops, .fops = &zoran_fops,
.ioctl_ops = &zoran_ioctl_ops,
.release = &zoran_vdev_release, .release = &zoran_vdev_release,
.tvnorms = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,
.minor = -1 .minor = -1
}; };
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7