| Submitter | hvaibhav@ti.com |
|---|---|
| Date | 2009-10-16 10:20:03 |
| Message ID | <1255688403-6334-1-git-send-email-hvaibhav@ti.com> |
| Download | mbox | patch |
| Permalink | /patch/54204/ |
| State | RFC |
| Headers | show |
Comments
Hi,
On Friday 16 October 2009 12:20:03 hvaibhav@ti.com wrote:
> From: Vaibhav Hiremath <hvaibhav@ti.com>
Please include a documentation patch for the new controls.
> -----Original Message----- > From: Laurent Pinchart [mailto:laurent.pinchart@ideasonboard.com] > Sent: Friday, October 16, 2009 5:58 PM > To: Hiremath, Vaibhav > Cc: linux-media@vger.kernel.org > Subject: Re: [PATCH 2/4] V4L2: Added CID's V4L2_CID_ROTATE/BG_COLOR > > Hi, > > On Friday 16 October 2009 12:20:03 hvaibhav@ti.com wrote: > > From: Vaibhav Hiremath <hvaibhav@ti.com> > > Please include a documentation patch for the new controls. > [Hiremath, Vaibhav] Good point, but I have never done this before. If I understand correctly I will have add description to v4l2-dvb/v4l2-spec/controls.sgml and submit the patch, right? Anything else apart from this? Thanks, Vaibhav > -- > Regards, > > Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index f5a93ae..35a0107 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c @@ -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^12*/ + max = 0xFFFFFF; + break; default: qctrl->type = V4L2_CTRL_TYPE_INTEGER; break; diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index b6fe1de..d77db6f 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -912,8 +912,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)