aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Howse <josephhowse@nummist.com>2014-12-29 10:00:03 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-01-29 15:27:49 -0500
commit0f5b26576246251622e33c076486b7cb0bdb0d99 (patch)
treeba5135e6aaea1df3d1f476bece81abaf423e6766
parent13e6c9f4bc11a20b25718bd4197295aa56db8d38 (diff)
[media] gspca: Add high-speed modes for PS3 Eye camera
Add support in the PS3 Eye driver for QVGA capture at higher frame rates: 187, 150, and 137 FPS. This functionality is valuable because the PS3 Eye is popular for computer vision projects and no other camera in its price range supports such high frame rates. Correct a QVGA mode that was listed as 40 FPS. It is really 37 FPS (half of 75 FPS). Tests confirm that the nominal frame rates are achieved. Signed-off-by: Joe Howse <josephhowse@nummist.com> Tested-by: Antonio Ospite <ao2@ao2.it> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/usb/gspca/ov534.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/ov534.c b/drivers/media/usb/gspca/ov534.c
index 90f0d637cd9d..a9c866d6d82d 100644
--- a/drivers/media/usb/gspca/ov534.c
+++ b/drivers/media/usb/gspca/ov534.c
@@ -12,6 +12,8 @@
12 * PS3 Eye camera enhanced by Richard Kaswy http://kaswy.free.fr 12 * PS3 Eye camera enhanced by Richard Kaswy http://kaswy.free.fr
13 * PS3 Eye camera - brightness, contrast, awb, agc, aec controls 13 * PS3 Eye camera - brightness, contrast, awb, agc, aec controls
14 * added by Max Thrun <bear24rw@gmail.com> 14 * added by Max Thrun <bear24rw@gmail.com>
15 * PS3 Eye camera - FPS range extended by Joseph Howse
16 * <josephhowse@nummist.com> http://nummist.com
15 * 17 *
16 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
@@ -116,7 +118,7 @@ static const struct v4l2_pix_format ov767x_mode[] = {
116 .colorspace = V4L2_COLORSPACE_JPEG}, 118 .colorspace = V4L2_COLORSPACE_JPEG},
117}; 119};
118 120
119static const u8 qvga_rates[] = {125, 100, 75, 60, 50, 40, 30}; 121static const u8 qvga_rates[] = {187, 150, 137, 125, 100, 75, 60, 50, 37, 30};
120static const u8 vga_rates[] = {60, 50, 40, 30, 15}; 122static const u8 vga_rates[] = {60, 50, 40, 30, 15};
121 123
122static const struct framerates ov772x_framerates[] = { 124static const struct framerates ov772x_framerates[] = {
@@ -769,12 +771,16 @@ static void set_frame_rate(struct gspca_dev *gspca_dev)
769 {15, 0x03, 0x41, 0x04}, 771 {15, 0x03, 0x41, 0x04},
770 }; 772 };
771 static const struct rate_s rate_1[] = { /* 320x240 */ 773 static const struct rate_s rate_1[] = { /* 320x240 */
774/* {205, 0x01, 0xc1, 0x02}, * 205 FPS: video is partly corrupt */
775 {187, 0x01, 0x81, 0x02}, /* 187 FPS or below: video is valid */
776 {150, 0x01, 0xc1, 0x04},
777 {137, 0x02, 0xc1, 0x02},
772 {125, 0x02, 0x81, 0x02}, 778 {125, 0x02, 0x81, 0x02},
773 {100, 0x02, 0xc1, 0x04}, 779 {100, 0x02, 0xc1, 0x04},
774 {75, 0x03, 0xc1, 0x04}, 780 {75, 0x03, 0xc1, 0x04},
775 {60, 0x04, 0xc1, 0x04}, 781 {60, 0x04, 0xc1, 0x04},
776 {50, 0x02, 0x41, 0x04}, 782 {50, 0x02, 0x41, 0x04},
777 {40, 0x03, 0x41, 0x04}, 783 {37, 0x03, 0x41, 0x04},
778 {30, 0x04, 0x41, 0x04}, 784 {30, 0x04, 0x41, 0x04},
779 }; 785 };
780 786