Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26d507fc authored by Brandon Philips's avatar Brandon Philips Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7166): [v4l] Add new user class controls and deprecate others 



These changes should appear in the next update of the v4l2spec.

HCENTER and VCENTER are unused in the tree so I added a _DEPRECATED
postfix so applications can remove their use.

Signed-off-by: default avatarBrandon Philips <bphilips@suse.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 27a643b1

include/linux/videodev2.h

+18 −5
Original line number Diff line number Diff line
@@ -849,21 +849,34 @@ struct v4l2_querymenu 
#define V4L2_CID_AUDIO_TREBLE		(V4L2_CID_BASE+8)

#define V4L2_CID_AUDIO_MUTE		(V4L2_CID_BASE+9)

#define V4L2_CID_AUDIO_LOUDNESS		(V4L2_CID_BASE+10)

#define V4L2_CID_BLACK_LEVEL		(V4L2_CID_BASE+11)

#define V4L2_CID_BLACK_LEVEL		(V4L2_CID_BASE+11) /* Deprecated */

#define V4L2_CID_AUTO_WHITE_BALANCE	(V4L2_CID_BASE+12)

#define V4L2_CID_DO_WHITE_BALANCE	(V4L2_CID_BASE+13)

#define V4L2_CID_RED_BALANCE		(V4L2_CID_BASE+14)

#define V4L2_CID_BLUE_BALANCE		(V4L2_CID_BASE+15)

#define V4L2_CID_GAMMA			(V4L2_CID_BASE+16)

#define V4L2_CID_WHITENESS		(V4L2_CID_GAMMA) /* ? Not sure */

#define V4L2_CID_WHITENESS		(V4L2_CID_GAMMA) /* Deprecated */

#define V4L2_CID_EXPOSURE		(V4L2_CID_BASE+17)

#define V4L2_CID_AUTOGAIN		(V4L2_CID_BASE+18)

#define V4L2_CID_GAIN			(V4L2_CID_BASE+19)

#define V4L2_CID_HFLIP			(V4L2_CID_BASE+20)

#define V4L2_CID_VFLIP			(V4L2_CID_BASE+21)

#define V4L2_CID_HCENTER		(V4L2_CID_BASE+22)

#define V4L2_CID_VCENTER		(V4L2_CID_BASE+23)

#define V4L2_CID_LASTP1			(V4L2_CID_BASE+24) /* last CID + 1 */



/* Deprecated, use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */

#define V4L2_CID_HCENTER_DEPRECATED	(V4L2_CID_BASE+22)

#define V4L2_CID_VCENTER_DEPRECATED	(V4L2_CID_BASE+23)



#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_BACKLIGHT_COMPENSATION 	(V4L2_CID_BASE+28)

#define V4L2_CID_LASTP1				(V4L2_CID_BASE+29) /* last CID + 1 */



/*  MPEG-class control IDs defined by V4L2 */

#define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)