hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] OMAP_VOUTLIB: Fix wrong resizer calculation 

The omap_vout_new_crop() function has possible bug, uses uninitialized
variable "crop.width/height" which is actually output of the function.
Instead we should be using "try_crop.width/height" to calculate the
resizer value.

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Vladimir Pantelic 2011-04-26 04:28:11 -03:00 committed by Mauro Carvalho Chehab
parent aa122d424b
commit e8bb10b82f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/omap/omap_voutlib.c
View File

@ -193,7 +193,7 @@ int omap_vout_new_crop(struct v4l2_pix_format *pix,
return -EINVAL; return -EINVAL;
if (cpu_is_omap24xx()) { if (cpu_is_omap24xx()) {
if (crop->height != win->w.height) { if (try_crop.height != win->w.height) {
/* If we're resizing vertically, we can't support a /* If we're resizing vertically, we can't support a
* crop width wider than 768 pixels. * crop width wider than 768 pixels.
*/ */
@ -202,7 +202,7 @@ int omap_vout_new_crop(struct v4l2_pix_format *pix,
} }
} }
/* vertical resizing */ /* vertical resizing */
vresize = (1024 * crop->height) / win->w.height; vresize = (1024 * try_crop.height) / win->w.height;
if (cpu_is_omap24xx() && (vresize > 2048)) if (cpu_is_omap24xx() && (vresize > 2048))
vresize = 2048; vresize = 2048;
else if (cpu_is_omap34xx() && (vresize > 4096)) else if (cpu_is_omap34xx() && (vresize > 4096))
@ -221,7 +221,7 @@ int omap_vout_new_crop(struct v4l2_pix_format *pix,
try_crop.height = 2; try_crop.height = 2;
} }
/* horizontal resizing */ /* horizontal resizing */
hresize = (1024 * crop->width) / win->w.width; hresize = (1024 * try_crop.width) / win->w.width;
if (cpu_is_omap24xx() && (hresize > 2048)) if (cpu_is_omap24xx() && (hresize > 2048))
hresize = 2048; hresize = 2048;
else if (cpu_is_omap34xx() && (hresize > 4096)) else if (cpu_is_omap34xx() && (hresize > 4096))