[PATCH] saa6752hs: resolutions handling

[linux-2.6-omap-h63xx.git] / drivers / media / video / saa7134 / saa7134-empress.c

diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 2021e099e35ace85f2cda86c97ab02bbb3642271..fa1357336907cd6df71614e39f61d133b8428607 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -233,10 +233,7 @@ static int ts_do_ioctl(struct inode *inode, struct file *file,
                memset(f,0,sizeof(*f));
                f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-               /* FIXME: translate subsampling type EMPRESS into
-                *        width/height: */
-               f->fmt.pix.width        = 720; /* D1 */
-               f->fmt.pix.height       = 576;
+               saa7134_i2c_call_clients(dev, cmd, arg);
                f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
                f->fmt.pix.sizeimage    = TS_PACKET_SIZE * dev->ts.nr_packets;
                return 0;
@@ -249,20 +246,7 @@ static int ts_do_ioctl(struct inode *inode, struct file *file,
                if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                    return -EINVAL;
 
-               /*
-                 FIXME: translate and round width/height into EMPRESS
-                 subsample type:
-
-                         type  |   PAL   |  NTSC
-                       ---------------------------
-                         SIF   | 352x288 | 352x240
-                        1/2 D1 | 352x576 | 352x480
-                        2/3 D1 | 480x576 | 480x480
-                         D1    | 720x576 | 720x480
-               */
-
-               f->fmt.pix.width        = 720; /* D1 */
-               f->fmt.pix.height       = 576;
+               saa7134_i2c_call_clients(dev, cmd, arg);
                f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
                f->fmt.pix.sizeimage    = TS_PACKET_SIZE* dev->ts.nr_packets;
                return 0;