aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-11-27 10:55:21 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:42:16 -0500
commitfb3de0398ab1bf270bc55f66945f82e61e50f6b6 (patch)
treef48fba0b776953b803d652f4205cbbae8fd3376a /drivers/media
parent0731160aca15df5882387e07d61671e6746c658f (diff)
em28xx: don't reduce scale to half size for em2800
Since em2800 can't support 720x480 / 720x576, the driver used to reduce the scale to half the size on those chips. As the proper fix were applied, reducing the maximum horizontal resolution to 640, this hack can be removed. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index fbe536f092f..7ad65370f27 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1060,12 +1060,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
1060 /* the em2800 can only scale down to 50% */ 1060 /* the em2800 can only scale down to 50% */
1061 height = height > (3 * maxh / 4) ? maxh : maxh / 2; 1061 height = height > (3 * maxh / 4) ? maxh : maxh / 2;
1062 width = width > (3 * maxw / 4) ? maxw : maxw / 2; 1062 width = width > (3 * maxw / 4) ? maxw : maxw / 2;
1063 /* According to empiatech support the MaxPacketSize is too small
1064 * to support framesizes larger than 640x480 @ 30 fps or 640x576
1065 * @ 25 fps. As this would cut of a part of the image we prefer
1066 * 360x576 or 360x480 for now */
1067 if (width == maxw && height == maxh)
1068 width /= 2;
1069 } else { 1063 } else {
1070 /* width must even because of the YUYV format 1064 /* width must even because of the YUYV format
1071 height must be even because of interlacing */ 1065 height must be even because of interlacing */