From 2c209776576ef524b9559905b944c1fd90297e3d Mon Sep 17 00:00:00 2001 From: "wenfeng.guo" Date: Fri, 23 Nov 2018 17:38:00 +0800 Subject: [PATCH] vpp: fix vpp covertiy error [1/1] PD#SWPL-2458 Problem: vpp has covertiy error Solution: fix vpp covertiy error Verify: r311 Change-Id: Ic755420107b72fa0a56d73e288b708ab421f7609 Signed-off-by: Wenfeng Guo --- drivers/amlogic/media/video_sink/vpp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/amlogic/media/video_sink/vpp.c b/drivers/amlogic/media/video_sink/vpp.c index b663469..f165f43 100644 --- a/drivers/amlogic/media/video_sink/vpp.c +++ b/drivers/amlogic/media/video_sink/vpp.c @@ -643,6 +643,8 @@ vpp_process_speed_check(s32 width_in, if (vf) cur_vf_type = vf->type; + else + return 0; if (force_vskip_cnt == 0xff)/*for debug*/ return SPEED_CHECK_DONE; if (next_frame_par->vscale_skip_count < force_vskip_cnt) @@ -1536,14 +1538,12 @@ RESTART: } /* force overwrite filter setting */ - if ((vert_scaler_filter >= COEF_BICUBIC) && - (vert_scaler_filter <= COEF_3D_FILTER)) { + if (vert_scaler_filter <= COEF_3D_FILTER) { filter->vpp_vert_coeff = filter_table[vert_scaler_filter]; filter->vpp_vert_filter = vert_scaler_filter; } if (vert_chroma_filter_force_en && - (vert_chroma_scaler_filter >= COEF_BICUBIC) && - (vert_chroma_scaler_filter <= COEF_3D_FILTER)) { + vert_chroma_scaler_filter <= COEF_3D_FILTER) { cur_vert_chroma_filter = vert_chroma_scaler_filter; filter->vpp_vert_chroma_coeff = filter_table[cur_vert_chroma_filter]; @@ -1553,8 +1553,7 @@ RESTART: filter->vpp_vert_chroma_filter_en = false; } - if ((horz_scaler_filter >= COEF_BICUBIC) && - (horz_scaler_filter <= COEF_3D_FILTER)) { + if (horz_scaler_filter <= COEF_3D_FILTER) { filter->vpp_horz_coeff = filter_table[horz_scaler_filter]; filter->vpp_horz_filter = horz_scaler_filter; } -- 2.7.4