aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/soc_mediabus.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-05-20 03:25:09 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 11:05:08 -0400
commitcc552b620fa3a184ba3d4064223ca1d59325b166 (patch)
tree8de21b7b635acbc87f71f790af917f3a4c56ee20 /drivers/media/video/soc_mediabus.c
parente9ceeced6feb6f072d59b87fe5a47c37e2b50d51 (diff)
[media] V4L: soc-camera: add a new packing for YUV 4:2:0 type formats
12-bit formats, similar to YUV 4:2:0 occupy 3 bytes for each two pixels and cannot be described by any of the existing SOC_MBUS_PACKING_* macros. This patch adds a new one SOC_MBUS_PACKING_1_5X8 to describe such formats and extends soc_mbus_samples_per_pixel() to support it. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/soc_mediabus.c')
-rw-r--r--drivers/media/video/soc_mediabus.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/drivers/media/video/soc_mediabus.c b/drivers/media/video/soc_mediabus.c
index 1b0018a58804..e13c663d6d04 100644
--- a/drivers/media/video/soc_mediabus.c
+++ b/drivers/media/video/soc_mediabus.c
@@ -172,16 +172,27 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
172}, 172},
173}; 173};
174 174
175int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf) 175int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf,
176 unsigned int *numerator, unsigned int *denominator)
176{ 177{
177 switch (mf->packing) { 178 switch (mf->packing) {
178 case SOC_MBUS_PACKING_NONE: 179 case SOC_MBUS_PACKING_NONE:
179 case SOC_MBUS_PACKING_EXTEND16: 180 case SOC_MBUS_PACKING_EXTEND16:
180 return 1; 181 *numerator = 1;
182 *denominator = 1;
183 return 0;
181 case SOC_MBUS_PACKING_2X8_PADHI: 184 case SOC_MBUS_PACKING_2X8_PADHI:
182 case SOC_MBUS_PACKING_2X8_PADLO: 185 case SOC_MBUS_PACKING_2X8_PADLO:
183 return 2; 186 *numerator = 2;
187 *denominator = 1;
188 return 0;
189 case SOC_MBUS_PACKING_1_5X8:
190 *numerator = 3;
191 *denominator = 2;
192 return 0;
184 case SOC_MBUS_PACKING_VARIABLE: 193 case SOC_MBUS_PACKING_VARIABLE:
194 *numerator = 0;
195 *denominator = 1;
185 return 0; 196 return 0;
186 } 197 }
187 return -EINVAL; 198 return -EINVAL;
@@ -197,6 +208,8 @@ s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf)
197 case SOC_MBUS_PACKING_2X8_PADLO: 208 case SOC_MBUS_PACKING_2X8_PADLO:
198 case SOC_MBUS_PACKING_EXTEND16: 209 case SOC_MBUS_PACKING_EXTEND16:
199 return width * 2; 210 return width * 2;
211 case SOC_MBUS_PACKING_1_5X8:
212 return width * 3 / 2;
200 case SOC_MBUS_PACKING_VARIABLE: 213 case SOC_MBUS_PACKING_VARIABLE:
201 return 0; 214 return 0;
202 } 215 }