AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[media] V4L: soc-camera: add JPEG support

Browse Source 
Signed-off-by: Qing Xu <qingx@marvell.com>
Signed-off-by: Kassey Lee <ygli@marvell.com>
[g.liakhovetski@gmx.de: fixed compiler warning]
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Kassey Li 2011-05-20 04:08:39 -03:00 committed by Mauro Carvalho Chehab
parent 3dac322db6
commit 64149deb6a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/video/soc_mediabus.c
View File

@ -130,6 +130,13 @@ static const struct soc_mbus_pixelfmt mbus_fmt[] = {
.packing = SOC_MBUS_PACKING_2X8_PADLO, .packing = SOC_MBUS_PACKING_2X8_PADLO,
.order = SOC_MBUS_ORDER_BE, .order = SOC_MBUS_ORDER_BE,
}, },
[MBUS_IDX(JPEG_1X8)] = {
.fourcc = V4L2_PIX_FMT_JPEG,
.name = "JPEG",
.bits_per_sample = 8,
.packing = SOC_MBUS_PACKING_VARIABLE,
.order = SOC_MBUS_ORDER_LE,
},
}; };
int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf) int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf)
@ -141,6 +148,8 @@ int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf)
case SOC_MBUS_PACKING_2X8_PADHI: case SOC_MBUS_PACKING_2X8_PADHI:
case SOC_MBUS_PACKING_2X8_PADLO: case SOC_MBUS_PACKING_2X8_PADLO:
return 2; return 2;
case SOC_MBUS_PACKING_VARIABLE:
return 0;
} }
return -EINVAL; return -EINVAL;
} }
@ -155,6 +164,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_2X8_PADLO:
case SOC_MBUS_PACKING_EXTEND16: case SOC_MBUS_PACKING_EXTEND16:
return width * 2; return width * 2;
case SOC_MBUS_PACKING_VARIABLE:
return 0;
} }
return -EINVAL; return -EINVAL;
} }

1
include/media/soc_mediabus.h
View File

@ -28,6 +28,7 @@ enum soc_mbus_packing {
SOC_MBUS_PACKING_2X8_PADHI, SOC_MBUS_PACKING_2X8_PADHI,
SOC_MBUS_PACKING_2X8_PADLO, SOC_MBUS_PACKING_2X8_PADLO,
SOC_MBUS_PACKING_EXTEND16, SOC_MBUS_PACKING_EXTEND16,
SOC_MBUS_PACKING_VARIABLE,
}; };
/** /**