fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 16:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

amd/vpelib: Add PQ Norm to VPE interface

Browse source 
Rename the variable and add PQ Norm to VPE interaface.

Reviewed-by: Roy Chan <Roy.Chan@amd.com>
Acked-by: Alan Liu <haoping.liu@amd.com>
Signed-off-by: Jesse Agate <Jesse.Agate@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27239>
This commit is contained in:
Agate, Jesse 2024-01-04 16:51:37 -05:00 • committed by Marge Bot
parent 1dd28d6766
commit 2d02c75324
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/amd/vpelib/inc/vpe_types.h
View file

@ -550,6 +550,7 @@ struct vpe_tonemap_params {
enum vpe_transfer_function lut_out_tf;
enum vpe_color_primaries lut_in_gamut;
enum vpe_color_primaries lut_out_gamut;
uint16_t input_pq_norm_factor;
uint16_t lut_dim;
uint16_t *lut_data;

11
src/amd/vpelib/src/core/color.c
View file

@ -781,7 +781,7 @@ enum vpe_status vpe_color_update_movable_cm(
if (stream_ctx->update_3dlut) {
uint32_t pqNormFactor;
uint32_t pq_norm_factor;
struct vpe_color_space tm_out_cs;
enum color_space out_lut_cs;
enum color_transfer_func tf;
@ -825,11 +825,14 @@ enum vpe_status vpe_color_update_movable_cm(
//Blendgam is updated by output vpe_update_output_gamma_sequence
if (param->streams[stream_idx].tm_params.shaper_tf == VPE_TF_PQ_NORMALIZED)
pqNormFactor = stream_ctx->stream.hdr_metadata.max_mastering;
if (!param->streams[stream_idx].tm_params.input_pq_norm_factor)
pq_norm_factor = stream_ctx->stream.hdr_metadata.max_mastering;
else
pq_norm_factor = param->streams[stream_idx].tm_params.input_pq_norm_factor;
else
pqNormFactor = HDR_PEAK_WHITE;
pq_norm_factor = HDR_PEAK_WHITE;
vpe_color_tm_update_hdr_mult(SHAPER_EXP_MAX_IN, pqNormFactor,
vpe_color_tm_update_hdr_mult(SHAPER_EXP_MAX_IN, pq_norm_factor,
&stream_ctx->lut3d_func->hdr_multiplier, enable_3dlut);
vpe_color_update_shaper(SHAPER_EXP_MAX_IN, stream_ctx->in_shaper_func, enable_3dlut);