projects
/
gspca_kinect.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the name video_camera instead of color_camera.
[gspca_kinect.git]
/
kinect.c
diff --git
a/kinect.c
b/kinect.c
index
1d7a74f
..
b5077ca
100644
(file)
--- a/
kinect.c
+++ b/
kinect.c
@@
-68,11
+68,11
@@
static const struct ctrl sd_ctrls[] = {
#define MODE_1280x1024 0x0002
#define FORMAT_BAYER 0x0010
#define MODE_1280x1024 0x0002
#define FORMAT_BAYER 0x0010
-#define FORMAT_UY
UV
0x0020
+#define FORMAT_UY
VY
0x0020
#define FPS_HIGH 0x0100
#define FPS_HIGH 0x0100
-static const struct v4l2_pix_format
color
_camera_mode[] = {
+static const struct v4l2_pix_format
video
_camera_mode[] = {
{640, 480, V4L2_PIX_FMT_SGRBG8, V4L2_FIELD_NONE,
.bytesperline = 640,
.sizeimage = 640 * 480,
{640, 480, V4L2_PIX_FMT_SGRBG8, V4L2_FIELD_NONE,
.bytesperline = 640,
.sizeimage = 640 * 480,
@@
-82,7
+82,7
@@
static const struct v4l2_pix_format color_camera_mode[] = {
.bytesperline = 640 * 2,
.sizeimage = 640 * 480 * 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.bytesperline = 640 * 2,
.sizeimage = 640 * 480 * 2,
.colorspace = V4L2_COLORSPACE_SRGB,
- .priv = MODE_640x480 | FORMAT_UY
UV
},
+ .priv = MODE_640x480 | FORMAT_UY
VY
},
{1280, 1024, V4L2_PIX_FMT_SGRBG8, V4L2_FIELD_NONE,
.bytesperline = 1280,
.sizeimage = 1280 * 1024,
{1280, 1024, V4L2_PIX_FMT_SGRBG8, V4L2_FIELD_NONE,
.bytesperline = 1280,
.sizeimage = 1280 * 1024,
@@
-211,8
+211,8
@@
static int sd_config(struct gspca_dev *gspca_dev,
cam = &gspca_dev->cam;
cam = &gspca_dev->cam;
- cam->cam_mode =
color
_camera_mode;
- cam->nmodes = ARRAY_SIZE(
color
_camera_mode);
+ cam->cam_mode =
video
_camera_mode;
+ cam->nmodes = ARRAY_SIZE(
video
_camera_mode);
//cam->npkt = 15;
//gspca_dev->pkt_size = 960 * 2;
//cam->npkt = 15;
//gspca_dev->pkt_size = 960 * 2;
@@
-242,7
+242,7
@@
static int sd_start(struct gspca_dev *gspca_dev)
fps_reg = 0x0e;
/* format */
fps_reg = 0x0e;
/* format */
- if (mode & FORMAT_UY
UV
)
+ if (mode & FORMAT_UY
VY
)
fmt_val = 0x05;
else
fmt_val = 0x00;
fmt_val = 0x05;
else
fmt_val = 0x00;