From abc5ce3fe6dcf249fda8fccb143aeae670d55ae1 Mon Sep 17 00:00:00 2001 From: MingLiang Dong Date: Mon, 22 Oct 2018 04:20:05 -0400 Subject: [PATCH] amvecm: hdr: add hdr10 plus support [1/2] PD#SWPL-869 Problem: new feature, add hdr10 plus support Solution: 1. add hdr10 plus metadat parser 2. add hdr10 plus code support 3. add hdr10 plus bypass mode Verify: verify on U200 Change-Id: I957954ce148021882e17f2913dd2552e64f1298c Signed-off-by: MingLiang Dong Conflicts: MAINTAINERS drivers/amlogic/media/enhancement/amvecm/Makefile drivers/amlogic/media/enhancement/amvecm/amvecm.c drivers/amlogic/media/enhancement/amvecm/set_hdr2_v0.c include/linux/amlogic/media/amvecm/amvecm.h --- drivers/amlogic/media/enhancement/amvecm/set_hdr2_v0.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/amlogic/media/enhancement/amvecm/set_hdr2_v0.c b/drivers/amlogic/media/enhancement/amvecm/set_hdr2_v0.c index f28f66561c79..d4ab598a4dc5 100644 --- a/drivers/amlogic/media/enhancement/amvecm/set_hdr2_v0.c +++ b/drivers/amlogic/media/enhancement/amvecm/set_hdr2_v0.c @@ -1301,6 +1301,14 @@ void set_hdr_matrix( adpscl_alpha[i] = 10 * in_luma * (1 << adp_scal_shift) / out_luma; + if (hdr_mtx_param->p_sel & HDR_SDR) { + if (i == 0) + adpscl_shift[i] = adp_scal_shift; + else + adpscl_shift[i] = adp_scal_shift - 2; + } else + adpscl_shift[i] = adp_scal_shift; + adpscl_ys_coef[i] = 1 << adp_scal_shift; adpscl_beta_s[i] = 0;