diff options
Diffstat (limited to 'drivers/media/video/omap3isp/isppreview.h')
-rw-r--r-- | drivers/media/video/omap3isp/isppreview.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/video/omap3isp/isppreview.h b/drivers/media/video/omap3isp/isppreview.h index fa943bd05c7..f54e775c2df 100644 --- a/drivers/media/video/omap3isp/isppreview.h +++ b/drivers/media/video/omap3isp/isppreview.h | |||
@@ -45,11 +45,6 @@ | |||
45 | #define ISPPRV_CONTRAST_HIGH 0xFF | 45 | #define ISPPRV_CONTRAST_HIGH 0xFF |
46 | #define ISPPRV_CONTRAST_UNITS 0x1 | 46 | #define ISPPRV_CONTRAST_UNITS 0x1 |
47 | 47 | ||
48 | #define NO_AVE 0x0 | ||
49 | #define AVE_2_PIX 0x1 | ||
50 | #define AVE_4_PIX 0x2 | ||
51 | #define AVE_8_PIX 0x3 | ||
52 | |||
53 | /* Features list */ | 48 | /* Features list */ |
54 | #define PREV_LUMA_ENHANCE OMAP3ISP_PREV_LUMAENH | 49 | #define PREV_LUMA_ENHANCE OMAP3ISP_PREV_LUMAENH |
55 | #define PREV_INVERSE_ALAW OMAP3ISP_PREV_INVALAW | 50 | #define PREV_INVERSE_ALAW OMAP3ISP_PREV_INVALAW |
@@ -106,7 +101,6 @@ enum preview_ycpos_mode { | |||
106 | * @rgb2ycbcr: RGB to ycbcr parameters. | 101 | * @rgb2ycbcr: RGB to ycbcr parameters. |
107 | * @hmed: Horizontal median filter. | 102 | * @hmed: Horizontal median filter. |
108 | * @yclimit: YC limits parameters. | 103 | * @yclimit: YC limits parameters. |
109 | * @average: Downsampling rate for averager. | ||
110 | * @contrast: Contrast. | 104 | * @contrast: Contrast. |
111 | * @brightness: Brightness. | 105 | * @brightness: Brightness. |
112 | */ | 106 | */ |
@@ -124,7 +118,6 @@ struct prev_params { | |||
124 | struct omap3isp_prev_csc rgb2ycbcr; | 118 | struct omap3isp_prev_csc rgb2ycbcr; |
125 | struct omap3isp_prev_hmed hmed; | 119 | struct omap3isp_prev_hmed hmed; |
126 | struct omap3isp_prev_yclimit yclimit; | 120 | struct omap3isp_prev_yclimit yclimit; |
127 | u8 average; | ||
128 | u8 contrast; | 121 | u8 contrast; |
129 | u8 brightness; | 122 | u8 brightness; |
130 | }; | 123 | }; |
@@ -159,6 +152,7 @@ struct isptables_update { | |||
159 | * @subdev: V4L2 subdevice | 152 | * @subdev: V4L2 subdevice |
160 | * @pads: Media entity pads | 153 | * @pads: Media entity pads |
161 | * @formats: Active formats at the subdev pad | 154 | * @formats: Active formats at the subdev pad |
155 | * @crop: Active crop rectangle | ||
162 | * @input: Module currently connected to the input pad | 156 | * @input: Module currently connected to the input pad |
163 | * @output: Bitmask of the active output | 157 | * @output: Bitmask of the active output |
164 | * @video_in: Input video entity | 158 | * @video_in: Input video entity |
@@ -177,6 +171,7 @@ struct isp_prev_device { | |||
177 | struct v4l2_subdev subdev; | 171 | struct v4l2_subdev subdev; |
178 | struct media_pad pads[PREV_PADS_NUM]; | 172 | struct media_pad pads[PREV_PADS_NUM]; |
179 | struct v4l2_mbus_framefmt formats[PREV_PADS_NUM]; | 173 | struct v4l2_mbus_framefmt formats[PREV_PADS_NUM]; |
174 | struct v4l2_rect crop; | ||
180 | 175 | ||
181 | struct v4l2_ctrl_handler ctrls; | 176 | struct v4l2_ctrl_handler ctrls; |
182 | 177 | ||