diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-05-20 04:25:09 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 12:05:08 -0300 |
| commit | cc552b620fa3a184ba3d4064223ca1d59325b166 (patch) | |
| tree | 8de21b7b635acbc87f71f790af917f3a4c56ee20 /drivers/media | |
| parent | e9ceeced6feb6f072d59b87fe5a47c37e2b50d51 (diff) | |
| download | op-kernel-dev-cc552b620fa3a184ba3d4064223ca1d59325b166.zip op-kernel-dev-cc552b620fa3a184ba3d4064223ca1d59325b166.tar.gz | |
[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')
| -rw-r--r-- | drivers/media/video/mx3_camera.c | 6 | ||||
| -rw-r--r-- | drivers/media/video/soc_mediabus.c | 19 |
2 files changed, 20 insertions, 5 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 8630c0c..3e5435b 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c @@ -756,8 +756,10 @@ static void configure_geometry(struct mx3_camera_dev *mx3_cam, * the width parameter count the number of samples to * capture to complete the whole image width. */ - width *= soc_mbus_samples_per_pixel(fmt); - BUG_ON(width < 0); + unsigned int num, den; + int ret = soc_mbus_samples_per_pixel(fmt, &num, &den); + BUG_ON(ret < 0); + width = width * num / den; } /* Setup frame size - this cannot be changed on-the-fly... */ diff --git a/drivers/media/video/soc_mediabus.c b/drivers/media/video/soc_mediabus.c index 1b0018a..e13c663 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[] = { }, }; -int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf) +int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf, + unsigned int *numerator, unsigned int *denominator) { switch (mf->packing) { case SOC_MBUS_PACKING_NONE: case SOC_MBUS_PACKING_EXTEND16: - return 1; + *numerator = 1; + *denominator = 1; + return 0; case SOC_MBUS_PACKING_2X8_PADHI: case SOC_MBUS_PACKING_2X8_PADLO: - return 2; + *numerator = 2; + *denominator = 1; + return 0; + case SOC_MBUS_PACKING_1_5X8: + *numerator = 3; + *denominator = 2; + return 0; case SOC_MBUS_PACKING_VARIABLE: + *numerator = 0; + *denominator = 1; return 0; } return -EINVAL; @@ -197,6 +208,8 @@ s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf) case SOC_MBUS_PACKING_2X8_PADLO: case SOC_MBUS_PACKING_EXTEND16: return width * 2; + case SOC_MBUS_PACKING_1_5X8: + return width * 3 / 2; case SOC_MBUS_PACKING_VARIABLE: return 0; } |
