From d5a560e3049288816733db2fa232e74fdebcff17 Mon Sep 17 00:00:00 2001 From: Brian Zhu Date: Mon, 30 Sep 2019 18:41:33 +0800 Subject: [PATCH] dv: need update the right osd size for core2 [1/1] PD#SWPL-14748 Problem: DV core2 did not update the osd size. Solution: monitor the osd size change in dv processing Verify: Verifed on U212 Change-Id: Icade183483bd0f12f3d1d5424b38ac97ac1c83d1 Signed-off-by: Brian Zhu --- .../enhancement/amdolby_vision/amdolby_vision.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c b/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c index 0c0ed0ade4d4..f69ffebaef78 100644 --- a/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c +++ b/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c @@ -2637,8 +2637,7 @@ static int is_graphic_changed(void) is_osd_off = false; ret |= 2; } - /* do not need to monitor osd change, */ - /* because scaler is after dolby core2 */ + if ((osd_graphic_width != new_osd_graphic_width) || (osd_graphic_height != new_osd_graphic_height)) { if (debug_dolby & 0x10) @@ -2647,11 +2646,12 @@ static int is_graphic_changed(void) osd_graphic_height, new_osd_graphic_width, new_osd_graphic_height); - /* ignore osd size change */ - /* osd scaler is after dobly core */ - /* osd_graphic_width = new_osd_graphic_width; */ - /* osd_graphic_height = new_osd_graphic_height; */ - /* ret |= 4; */ + /* TODO: since tm2 can change osd pps position */ + if (!is_osd_off && !is_meson_tm2()) { + osd_graphic_width = new_osd_graphic_width; + osd_graphic_height = new_osd_graphic_height; + ret |= 2; + } } return ret; }