Attachment #2644 for bug #15791

View | Details | Raw Unified | Return to bug 15791
Collapse All | Expand All




/*
 * V4L2 Control identifiers.
 */
#define V4L2_CTRL_CLASS_CAMERA 0x009A0000	/* Camera class controls */
 
#define V4L2_CID_POWER_LINE_FREQUENCY		(V4L2_CID_BASE+24) 
enum v4l2_power_line_frequency {
	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED	= 0,
	V4L2_CID_POWER_LINE_FREQUENCY_50HZ	= 1,
	V4L2_CID_POWER_LINE_FREQUENCY_60HZ	= 2,
};

#define V4L2_CID_HUE_AUTO			(V4L2_CID_BASE+25) 
#define V4L2_CID_WHITE_BALANCE_TEMPERATURE	(V4L2_CID_BASE+26) 
#define V4L2_CID_SHARPNESS			(V4L2_CID_BASE+27) 

#define V4L2_CID_CAMERA_CLASS 			(V4L2_CTRL_CLASS_CAMERA | 1)

#define V4L2_CID_EXPOSURE_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+1)

	V4L2_EXPOSURE_MANUAL = 1,
	V4L2_EXPOSURE_AUTO = 2,
	V4L2_EXPOSURE_SHUTTER_PRIORITY = 4,
	V4L2_EXPOSURE_APERTURE_PRIORITY = 8
};
#define V4L2_CID_EXPOSURE_ABSOLUTE		(V4L2_CID_CAMERA_CLASS_BASE+2)
#define V4L2_CID_EXPOSURE_AUTO_PRIORITY		(V4L2_CID_CAMERA_CLASS_BASE+3)


Lines 40-45 Link Here

(-)kernel-source-uvcvideo-1.1/uvc_driver.c~ (+1 lines)
40		40
41	#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)	41	#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
42	#include <media/v4l2-common.h>	42	#include <media/v4l2-common.h>
		43	#include <media/v4l2-dev.h>
43	#endif	44	#endif
44		45
45	#include "uvcvideo.h"	46	#include "uvcvideo.h"

Lines 24-29 Link Here

(-)kernel-source-uvcvideo-1.1/uvc_v4l2.c~ (+1 lines)
24		24
25	#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)	25	#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
26	#include <media/v4l2-common.h>	26	#include <media/v4l2-common.h>
		27	#include <media/v4l2-dev.h>
27	#endif	28	#endif
28		29
29	#include "uvcvideo.h"	30	#include "uvcvideo.h"

Return to bug 15791

Lines 143-157 Link Here

(-)kernel-source-uvcvideo-1.1/uvc_compat.h~ (-15 / +1 lines)
143	/*	143	/*
144	* V4L2 Control identifiers.	144	* V4L2 Control identifiers.
145	*/	145	*/
146	#define V4L2_CTRL_CLASS_CAMERA 0x009A0000 /* Camera class controls */
147
148	#define V4L2_CID_POWER_LINE_FREQUENCY (V4L2_CID_BASE+24)
149	enum v4l2_power_line_frequency {
150	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED = 0,
151	V4L2_CID_POWER_LINE_FREQUENCY_50HZ = 1,
152	V4L2_CID_POWER_LINE_FREQUENCY_60HZ = 2,
153	};
154
155	#define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25)	146	#define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25)
156	#define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26)	147	#define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26)
157	#define V4L2_CID_SHARPNESS (V4L2_CID_BASE+27)	148	#define V4L2_CID_SHARPNESS (V4L2_CID_BASE+27)
Lines 161-172 Link Here
161	#define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA \| 1)	152	#define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA \| 1)
162		153
163	#define V4L2_CID_EXPOSURE_AUTO (V4L2_CID_CAMERA_CLASS_BASE+1)	154	#define V4L2_CID_EXPOSURE_AUTO (V4L2_CID_CAMERA_CLASS_BASE+1)
164	enum v4l2_exposure_auto_type {	155
165	V4L2_EXPOSURE_MANUAL = 1,
166	V4L2_EXPOSURE_AUTO = 2,
167	V4L2_EXPOSURE_SHUTTER_PRIORITY = 4,
168	V4L2_EXPOSURE_APERTURE_PRIORITY = 8
169	};
170	#define V4L2_CID_EXPOSURE_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+2)	156	#define V4L2_CID_EXPOSURE_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+2)
171	#define V4L2_CID_EXPOSURE_AUTO_PRIORITY (V4L2_CID_CAMERA_CLASS_BASE+3)	157	#define V4L2_CID_EXPOSURE_AUTO_PRIORITY (V4L2_CID_CAMERA_CLASS_BASE+3)
172		158