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

Commit 85213630 authored by Vaibhav Hiremath's avatar Vaibhav Hiremath Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13467): V4L2: Added CID's V4L2_CID_ROTATE/BG_COLOR 



Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1ead696b

Documentation/DocBook/v4l/videodev2.h.xml

+3 −1
Original line number Diff line number Diff line
@@ -915,8 +915,10 @@ enum <link linkend="v4l2-colorfx">v4l2_colorfx</link> { 
#define V4L2_CID_AUTOBRIGHTNESS                 (V4L2_CID_BASE+32)

#define V4L2_CID_BAND_STOP_FILTER               (V4L2_CID_BASE+33)



#define V4L2_CID_ROTATE                         (V4L2_CID_BASE+34)

#define V4L2_CID_BG_COLOR                       (V4L2_CID_BASE+35)

/* last CID + 1 */

#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+34)

#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+36)



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

#define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)

drivers/media/video/v4l2-common.c

+9 −0
Original line number Diff line number Diff line
@@ -431,6 +431,8 @@ const char *v4l2_ctrl_get_name(u32 id) 
	case V4L2_CID_CHROMA_AGC:		return "Chroma AGC";

	case V4L2_CID_COLOR_KILLER:		return "Color Killer";

	case V4L2_CID_COLORFX:			return "Color Effects";

	case V4L2_CID_ROTATE:			return "Rotate";

	case V4L2_CID_BG_COLOR:			return "Background color";



	/* MPEG controls */

	case V4L2_CID_MPEG_CLASS: 		return "MPEG Encoder Controls";
@@ -587,6 +589,13 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste 
		qctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;

		min = max = step = def = 0;

		break;

	case V4L2_CID_BG_COLOR:

		qctrl->type = V4L2_CTRL_TYPE_INTEGER;

		step = 1;

		min = 0;

		/* Max is calculated as RGB888 that is 2^24 */

		max = 0xFFFFFF;

		break;

	default:

		qctrl->type = V4L2_CTRL_TYPE_INTEGER;

		break;

include/linux/videodev2.h

+3 −1
Original line number Diff line number Diff line
@@ -913,8 +913,10 @@ enum v4l2_colorfx { 
#define V4L2_CID_AUTOBRIGHTNESS			(V4L2_CID_BASE+32)

#define V4L2_CID_BAND_STOP_FILTER		(V4L2_CID_BASE+33)



#define V4L2_CID_ROTATE				(V4L2_CID_BASE+34)

#define V4L2_CID_BG_COLOR			(V4L2_CID_BASE+35)

/* last CID + 1 */

#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+34)

#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+36)



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

#define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)