Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa21ccb authored by Dichen Zhang's avatar Dichen Zhang Committed by Android (Google) Code Review
Browse files

Merge "ultrahdr: tune lut tables qstep for quality"

parents 5814d8b2 6786299a

libs/ultrahdr/include/ultrahdr/gainmapmath.h

+4 −4
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ Color hlgOetf(Color e); 
float hlgOetfLUT(float e);

Color hlgOetfLUT(Color e);



constexpr size_t kHlgOETFPrecision = 10;

constexpr size_t kHlgOETFPrecision = 16;

constexpr size_t kHlgOETFNumEntries = 1 << kHlgOETFPrecision;



/*
@@ -325,7 +325,7 @@ Color hlgInvOetf(Color e_gamma); 
float hlgInvOetfLUT(float e_gamma);

Color hlgInvOetfLUT(Color e_gamma);



constexpr size_t kHlgInvOETFPrecision = 10;

constexpr size_t kHlgInvOETFPrecision = 12;

constexpr size_t kHlgInvOETFNumEntries = 1 << kHlgInvOETFPrecision;



/*
@@ -338,7 +338,7 @@ Color pqOetf(Color e); 
float pqOetfLUT(float e);

Color pqOetfLUT(Color e);



constexpr size_t kPqOETFPrecision = 10;

constexpr size_t kPqOETFPrecision = 16;

constexpr size_t kPqOETFNumEntries = 1 << kPqOETFPrecision;



/*
@@ -351,7 +351,7 @@ Color pqInvOetf(Color e_gamma); 
float pqInvOetfLUT(float e_gamma);

Color pqInvOetfLUT(Color e_gamma);



constexpr size_t kPqInvOETFPrecision = 10;

constexpr size_t kPqInvOETFPrecision = 12;

constexpr size_t kPqInvOETFNumEntries = 1 << kPqInvOETFPrecision;

libs/ultrahdr/jpegr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ status_t JpegR::applyGainMap(jr_uncompressed_ptr uncompressed_yuv_420_image, 
            }

            case ULTRAHDR_OUTPUT_HDR_PQ:

            {

#if USE_HLG_OETF_LUT

#if USE_PQ_OETF_LUT

              ColorTransformFn hdrOetf = pqOetfLUT;

#else

              ColorTransformFn hdrOetf = pqOetf;