aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLiu Ying <Ying.Liu@freescale.com>2013-09-22 00:45:29 -0400
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 09:05:40 -0400
commit5020592a9e04dac7e9084aa4d4c315a6ce79d6e2 (patch)
treed472105aad2476c83a40a560c5fa8fd28b2115fe /drivers/media
parent8542c0afddaf074dc6711c0ae3966803ae2b219d (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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/mxc/output/mxc_vout.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/platform/mxc/output/mxc_vout.c b/drivers/media/platform/mxc/output/mxc_vout.c
index 0dfe387aab2c..7f20ecf0297f 100644
--- a/drivers/media/platform/mxc/output/mxc_vout.c
+++ b/drivers/media/platform/mxc/output/mxc_vout.c
@@ -1061,11 +1061,13 @@ again:
1061 ret = ipu_check_task(task); 1061 ret = ipu_check_task(task);
1062 if (ret != IPU_CHECK_OK) { 1062 if (ret != IPU_CHECK_OK) {
1063 if (ret > IPU_CHECK_ERR_MIN) { 1063 if (ret > IPU_CHECK_ERR_MIN) {
1064 if (ret == IPU_CHECK_ERR_SPLIT_INPUTW_OVER) { 1064 if (ret == IPU_CHECK_ERR_SPLIT_INPUTW_OVER ||
1065 ret == IPU_CHECK_ERR_W_DOWNSIZE_OVER) {
1065 task->input.crop.w -= 8; 1066 task->input.crop.w -= 8;
1066 goto again; 1067 goto again;
1067 } 1068 }
1068 if (ret == IPU_CHECK_ERR_SPLIT_INPUTH_OVER) { 1069 if (ret == IPU_CHECK_ERR_SPLIT_INPUTH_OVER ||
1070 ret == IPU_CHECK_ERR_H_DOWNSIZE_OVER) {
1069 task->input.crop.h -= 8; 1071 task->input.crop.h -= 8;
1070 goto again; 1072 goto again;
1071 } 1073 }