This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/media_tree.git tree:

Subject: [media] gspca - main: Better values for V4L2_FMT_FLAG_COMPRESSED
Author:  Jean-François Moine <[email protected]>
Date:    Wed Aug 10 07:32:57 2011 -0300

In vidioc_enum_fmt_vid_cap, the 'compressed' flag was set from the
pixelformat, and all pixelformats were not treated.
Now, images are told as compressed when the image size is smaller than
its number of pixels.

Signed-off-by: Jean-François Moine <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/video/gspca/gspca.c |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

---

http://git.linuxtv.org/media_tree.git?a=commitdiff;h=b796fb6ed032b0ccdb769b3b3bce5fb2b186a8f8

diff --git a/drivers/media/video/gspca/gspca.c 
b/drivers/media/video/gspca/gspca.c
index 85d2469..3ff26ba 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -499,19 +499,6 @@ void gspca_frame_add(struct gspca_dev *gspca_dev,
 }
 EXPORT_SYMBOL(gspca_frame_add);
 
-static int gspca_is_compressed(__u32 format)
-{
-       switch (format) {
-       case V4L2_PIX_FMT_MJPEG:
-       case V4L2_PIX_FMT_JPEG:
-       case V4L2_PIX_FMT_SPCA561:
-       case V4L2_PIX_FMT_PAC207:
-       case V4L2_PIX_FMT_MR97310A:
-               return 1;
-       }
-       return 0;
-}
-
 static int frame_alloc(struct gspca_dev *gspca_dev, struct file *file,
                        enum v4l2_memory memory, unsigned int count)
 {
@@ -1049,7 +1036,9 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, 
void  *priv,
                return -EINVAL;         /* no more format */
 
        fmtdesc->pixelformat = fmt_tb[index];
-       if (gspca_is_compressed(fmt_tb[index]))
+       if (gspca_dev->cam.cam_mode[i].sizeimage <
+                       gspca_dev->cam.cam_mode[i].width *
+                               gspca_dev->cam.cam_mode[i].height)
                fmtdesc->flags = V4L2_FMT_FLAG_COMPRESSED;
        fmtdesc->description[0] = fmtdesc->pixelformat & 0xff;
        fmtdesc->description[1] = (fmtdesc->pixelformat >> 8) & 0xff;

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to