diff options
| author | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-08-03 23:12:09 +0200 |
|---|---|---|
| committer | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-08-03 23:12:09 +0200 |
| commit | 52215890ef7c4d06fd3323f8315d85f14d637a91 (patch) | |
| tree | 2f97aaab909de9fa903ba52224f6f643e2f25cf5 /drivers/media/video | |
| parent | 4309a7ffa8aa46ac2fc4090cebc3efeb00dce72f (diff) | |
| download | kernel_samsung_smdk4412-52215890ef7c4d06fd3323f8315d85f14d637a91.zip kernel_samsung_smdk4412-52215890ef7c4d06fd3323f8315d85f14d637a91.tar.gz kernel_samsung_smdk4412-52215890ef7c4d06fd3323f8315d85f14d637a91.tar.bz2 | |
samsung opensource update4
Change-Id: I9db25f213bb1577c4468873c66b230a0566b6cf2
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/s5c73m3.c | 6 | ||||
| -rw-r--r-- | drivers/media/video/s5c73m3.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/media/video/s5c73m3.c b/drivers/media/video/s5c73m3.c index 5db5f7f..47c4297 100644 --- a/drivers/media/video/s5c73m3.c +++ b/drivers/media/video/s5c73m3.c @@ -70,9 +70,8 @@ static const struct s5c73m3_frmsizeenum preview_frmsizes[] = { { S5C73M3_PREVIEW_QVGA, 320, 240, 0x01 }, { S5C73M3_PREVIEW_CIF, 352, 288, 0x0E }, { S5C73M3_PREVIEW_VGA, 640, 480, 0x02 }, - { S5C73M3_PREVIEW_704X576, 704, 576, 0x09 }, + { S5C73M3_PREVIEW_800X600, 800, 600, 0x09 }, { S5C73M3_PREVIEW_880X720, 880, 720, 0x03 }, - { S5C73M3_PREVIEW_960X640, 960, 640, 0x0B }, { S5C73M3_PREVIEW_960X720, 960, 720, 0x04 }, { S5C73M3_PREVIEW_1008X672, 1008, 672, 0x0F }, { S5C73M3_PREVIEW_1184X666, 1184, 666, 0x05 }, @@ -80,10 +79,13 @@ static const struct s5c73m3_frmsizeenum preview_frmsizes[] = { { S5C73M3_VDIS_720P, 1536, 864, 0x07 }, { S5C73M3_PREVIEW_1080P, 1920, 1080, 0x0A}, { S5C73M3_VDIS_1080P, 2304, 1296, 0x0C}, + { S5C73M3_PREVIEW_D1, 720, 480, 0x0B }, }; static const struct s5c73m3_frmsizeenum capture_frmsizes[] = { { S5C73M3_CAPTURE_VGA, 640, 480, 0x10 }, + { S5C73M3_CAPTURE_960x540, 960, 540, 0x20 }, + { S5C73M3_CAPTURE_960x720, 960, 720, 0x30 }, { S5C73M3_CAPTURE_1024X768, 1024, 768, 0xD0 }, { S5C73M3_CAPTURE_HD, 1280, 720, 0x40 }, { S5C73M3_CAPTURE_2MP, 1600, 1200, 0x70 }, diff --git a/drivers/media/video/s5c73m3.h b/drivers/media/video/s5c73m3.h index 40d7eaf..aaf4007 100644 --- a/drivers/media/video/s5c73m3.h +++ b/drivers/media/video/s5c73m3.h @@ -71,7 +71,7 @@ enum s5c73m3_prev_frmsize { S5C73M3_PREVIEW_VGA, S5C73M3_PREVIEW_D1, S5C73M3_PREVIEW_WVGA, - S5C73M3_PREVIEW_704X576, + S5C73M3_PREVIEW_800X600, S5C73M3_PREVIEW_880X720, S5C73M3_PREVIEW_960X640, S5C73M3_PREVIEW_960X720, @@ -88,6 +88,8 @@ enum s5c73m3_prev_frmsize { enum s5c73m3_cap_frmsize { S5C73M3_CAPTURE_VGA, /* 640 x 480 */ S5C73M3_CAPTURE_WVGA, /* 800 x 480 */ + S5C73M3_CAPTURE_960x540, /* 960 x 540 */ + S5C73M3_CAPTURE_960x720, /* 960 x 720 */ S5C73M3_CAPTURE_1024X768, /* 1024 x 768 */ S5C73M3_CAPTURE_HD, /* 1280 x 720 */ S5C73M3_CAPTURE_W1MP, /* 1600 x 960 */ |