diff options
| author | Tomasz Stanislawski <t.stanislaws@samsung.com> | 2011-11-25 05:56:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-10 23:19:40 -0200 |
| commit | 392d9e1d02edcbe9bc94bc292dd364339556f8ec (patch) | |
| tree | 169fb3f23dad76b908cdc9c3b6ec892f75e740f9 /drivers/media | |
| parent | 0d066d3f6fdfd189bef5fe653477f5f9db2eb225 (diff) | |
| download | linux-3.10-392d9e1d02edcbe9bc94bc292dd364339556f8ec.tar.gz linux-3.10-392d9e1d02edcbe9bc94bc292dd364339556f8ec.tar.bz2 linux-3.10-392d9e1d02edcbe9bc94bc292dd364339556f8ec.zip | |
[media] v4l: s5p-tv: mixer: fix setup of VP scaling
Adjusting of Video Processor's scaling factors was flawed. It bounded scaling
to range 1/16 to 1/1. The correct range should be 1/4 to 4/1. This patch fixes
this bug.
Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/s5p-tv/mixer_vp_layer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/s5p-tv/mixer_vp_layer.c b/drivers/media/video/s5p-tv/mixer_vp_layer.c index e41ec2ec45f..3d13a636877 100644 --- a/drivers/media/video/s5p-tv/mixer_vp_layer.c +++ b/drivers/media/video/s5p-tv/mixer_vp_layer.c @@ -172,10 +172,10 @@ static void mxr_vp_fix_geometry(struct mxr_layer *layer, y_center = src->y_offset + src->height / 2; /* ensure scaling is between 0.25x .. 16x */ - src->width = clamp(src->width, round_up(dst->width, 4), - dst->width * 16); - src->height = clamp(src->height, round_up(dst->height, 4), - dst->height * 16); + src->width = clamp(src->width, round_up(dst->width / 16, 4), + dst->width * 4); + src->height = clamp(src->height, round_up(dst->height / 16, 4), + dst->height * 4); /* hardware limits */ src->width = clamp(src->width, 32U, 2047U); |