diff options
| author | Oliver Brown <oliver.brown@freescale.com> | 2014-08-05 08:12:09 -0500 |
|---|---|---|
| committer | Peng Fushi <fushi.peng@freescale.com> | 2014-08-28 16:51:17 +0800 |
| commit | b59b9e418461555d174ce78a9d6737c33e000952 (patch) | |
| tree | 73fd6d646d5797aa05c5fa026dfc57db4d775301 | |
| parent | e981dc5973778ba260011662464269b8d3870bb0 (diff) | |
ENGR00280663-3 mxc vout: handle downsize ratio overflow
This patch handles downsize ratio overflow error by doing
input cropping with 8 pixel step.
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
| -rw-r--r-- | drivers/media/video/mxc/output/mxc_vout.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/mxc/output/mxc_vout.c b/drivers/media/video/mxc/output/mxc_vout.c index 452c5735e3ea..f5744ed63e03 100644 --- a/drivers/media/video/mxc/output/mxc_vout.c +++ b/drivers/media/video/mxc/output/mxc_vout.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2011-2014 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -1061,11 +1061,13 @@ again: ret = ipu_check_task(task); if (ret != IPU_CHECK_OK) { if (ret > IPU_CHECK_ERR_MIN) { - if (ret == IPU_CHECK_ERR_SPLIT_INPUTW_OVER) { + if (ret == IPU_CHECK_ERR_SPLIT_INPUTW_OVER || + ret == IPU_CHECK_ERR_W_DOWNSIZE_OVER) { task->input.crop.w -= 8; goto again; } - if (ret == IPU_CHECK_ERR_SPLIT_INPUTH_OVER) { + if (ret == IPU_CHECK_ERR_SPLIT_INPUTH_OVER || + ret == IPU_CHECK_ERR_H_DOWNSIZE_OVER) { task->input.crop.h -= 8; goto again; } |