fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-24 08:10:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

amd/vpelib: Fix studio range

Browse source 
[WHY]
Studio signal has an offset.

[HOW]
Subtract that offset.

Signed-off-by: Tiberiu Visan <Tiberiu.Visan@amd.com>
Reviewed-by: Roy Chan <Roy.Chan@amd.com>
Reviewed-by: Navid Assadian <Navid.Assadian@amd.com>
Acked-by: Alan Liu <Haoping.Liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33833>
This commit is contained in:
Visan, Tiberiu 2024-12-19 09:08:29 -05:00 • committed by Marge Bot
parent 69c331e2c0
commit b3d43cea08
3 changed files with 46 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,8 +43,9 @@ static void color_check_output_cm_update(
struct vpe_priv *vpe_priv, const struct vpe_color_space *vcs, bool geometric_update);
static bool color_update_input_cs(struct vpe_priv *vpe_priv, enum color_space in_cs,
const struct vpe_color_adjust *adjustments, struct vpe_csc_matrix *input_cs,
struct vpe_color_adjust *stream_clr_adjustments, struct fixed31_32 *matrix_scaling_factor);
struct vpe_color_adjust *adjustments, struct vpe_csc_matrix *input_cs,
struct vpe_color_adjust *stream_clr_adjustments, struct fixed31_32 *matrix_scaling_factor,
const struct vpe_surface_info *surface_info);
static bool is_ycbcr(enum color_space in_cs);
@ -232,8 +233,9 @@ static enum color_space color_get_icsc_cs(enum color_space ics)
// return true is bypass can be done
static bool color_update_input_cs(struct vpe_priv *vpe_priv, enum color_space in_cs,
const struct vpe_color_adjust *adjustments, struct vpe_csc_matrix *input_cs,
struct vpe_color_adjust *stream_clr_adjustments, struct fixed31_32 *matrix_scaling_factor)
struct vpe_color_adjust *adjustments, struct vpe_csc_matrix *input_cs,
struct vpe_color_adjust *stream_clr_adjustments, struct fixed31_32 *matrix_scaling_factor,
const struct vpe_surface_info *surface_info) /**< Color range. Full vs. Studio */
{
int i, j;
bool use_adjustments = false;
@ -259,8 +261,9 @@ static bool color_update_input_cs(struct vpe_priv *vpe_priv, enum color_space in
if (use_adjustments && is_ycbcr(in_cs)) { // shader supports only yuv input for color
// adjustments
vpe_log("Apply color adjustments (contrast, saturation, hue, brightness)");
if (!vpe_color_calculate_input_cs(
vpe_priv, in_cs, adjustments, input_cs, matrix_scaling_factor))
vpe_priv, in_cs, adjustments, input_cs, matrix_scaling_factor, surface_info))
return false;
*stream_clr_adjustments = *adjustments;
}
@ -675,7 +678,8 @@ enum vpe_status vpe_color_update_color_space_and_tf(
if (stream_ctx->dirty_bits.color_space) {
if (!color_update_input_cs(vpe_priv, stream_ctx->cs,
&stream_ctx->stream.color_adj, stream_ctx->input_cs,
&stream_ctx->color_adjustments, &new_matrix_scaling_factor)) {
&stream_ctx->color_adjustments, &new_matrix_scaling_factor,
&stream_ctx->stream.surface_info)) {
vpe_log("err: input cs not being programmed!");
}
else {

55
src/amd/vpelib/src/core/color_cs.c
View file

@ -130,7 +130,7 @@ static int get_hw_value_from_sw_value(int swVal, int swMin, int swMax, int hwMin
static void color_adjustments_to_fixed_point(const struct vpe_color_adjustments *vpe_adjust,
bool icsc, // input csc or output csc
struct fixed31_32 *grph_cont, struct fixed31_32 *grph_sat, struct fixed31_32 *grph_bright,
struct fixed31_32 *sin_grph_hue, struct fixed31_32 *cos_grph_hue)
struct fixed31_32 *sin_grph_hue, struct fixed31_32 *cos_grph_hue, int32_t bright_norm_factor)
{
/* Hue adjustment could be negative. -45 ~ +45 */
struct fixed31_32 hue;
@ -142,7 +142,6 @@ static void color_adjustments_to_fixed_point(const struct vpe_color_adjustments
const int hw_contrast_max = 200;
const int hw_bright_min = -1000;
const int hw_bright_max = 1000;
const int hw_bright_cap = 500;
int hw_val = 0;
if (icsc) {
@ -155,15 +154,8 @@ static void color_adjustments_to_fixed_point(const struct vpe_color_adjustments
hw_val = get_hw_value_from_sw_value(vpe_adjust->brightness.current, vpe_adjust->brightness.min,
vpe_adjust->brightness.max, hw_bright_min, hw_bright_max);
if (hw_val > hw_bright_cap) { // to avoid image saturation, cap the brigthness to 0.5
hw_val = hw_bright_cap;
}
if (hw_val < -hw_bright_cap) {
hw_val = -hw_bright_cap;
}
*grph_bright = vpe_fixpt_from_fraction(hw_val, 2550); //shader normalizes this value to the pixel range
*grph_bright = vpe_fixpt_from_fraction(hw_val, (long long) bright_norm_factor); //shader normalizes this value to the pixel range
*grph_cont = vpe_fixpt_from_fraction(
get_hw_value_from_sw_value(vpe_adjust->contrast.current, vpe_adjust->contrast.min,
@ -233,9 +225,9 @@ static void calculate_rgb_matrix_legacy(
struct fixed31_32 grph_bright;
struct fixed31_32 sin_grph_hue;
struct fixed31_32 cos_grph_hue;
const int32_t bright_norm_factor = 1;
color_adjustments_to_fixed_point(
vpe_adjust, true, &grph_cont, &grph_sat, &grph_bright, &sin_grph_hue, &cos_grph_hue);
vpe_adjust, true, &grph_cont, &grph_sat, &grph_bright, &sin_grph_hue, &cos_grph_hue, bright_norm_factor);
/* COEF_1_1 = GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K1 +*/
/* Sin(GrphHue) * K2))*/
@ -396,9 +388,9 @@ static void calculate_rgb_limited_range_matrix_legacy(
struct fixed31_32 grph_bright;
struct fixed31_32 sin_grph_hue;
struct fixed31_32 cos_grph_hue;
const int32_t bright_norm_factor = 1;
color_adjustments_to_fixed_point(
vpe_adjust, true, &grph_cont, &grph_sat, &grph_bright, &sin_grph_hue, &cos_grph_hue);
vpe_adjust, true, &grph_cont, &grph_sat, &grph_bright, &sin_grph_hue, &cos_grph_hue, bright_norm_factor);
/* COEF_1_1 = GrphCont * (LumaR + GrphSat * (Cos(GrphHue) * K1 +*/
/* Sin(GrphHue) * K2))*/
@ -591,7 +583,8 @@ static bool vpe_scale_csc_matrix(struct fixed31_32 *matrix, unsigned int matrixL
}
static void calculate_yuv_matrix(struct vpe_color_adjustments *vpe_adjust,
enum color_space color_space, struct vpe_csc_matrix *input_cs, struct fixed31_32 *yuv_matrix)
enum color_space color_space, struct vpe_csc_matrix *input_cs, struct fixed31_32 *yuv_matrix,
int32_t bright_norm_factor)
{
struct fixed31_32 initialMatrix[12];
uint32_t i = 0;
@ -624,7 +617,7 @@ static void calculate_yuv_matrix(struct vpe_color_adjustments *vpe_adjust,
}
color_adjustments_to_fixed_point(
vpe_adjust, ovl, &grph_cont, &grph_sat, &grph_bright, &sin_grph_hue, &cos_grph_hue);
vpe_adjust, ovl, &grph_cont, &grph_sat, &grph_bright, &sin_grph_hue, &cos_grph_hue, bright_norm_factor);
multiplier = vpe_fixpt_mul(grph_cont, grph_sat); // contSat
@ -708,14 +701,36 @@ static void convert_float_matrix(uint16_t *matrix, struct fixed31_32 *flt, uint3
bool vpe_color_calculate_input_cs(struct vpe_priv *vpe_priv, enum color_space in_cs,
const struct vpe_color_adjust *vpe_blt_adjust, struct vpe_csc_matrix *input_cs,
struct fixed31_32 *matrix_scaling_factor)
struct fixed31_32 *matrix_scaling_factor, const struct vpe_surface_info *surface_info)
{
struct fixed31_32 fixed_csc_matrix[12];
struct vpe_color_adjustments vpe_adjust = {0};
struct vpe_color_adjustments vpe_adjust = {0};
struct vpe_color_adjust vpe_in_adjust = {0};
int32_t bright_norm_factor = 1;
const int32_t bright_norm_factor_8bit = 2550; // 255*10
const int32_t bright_norm_factor_10bit = 10230; // 1023*10
if ( (surface_info == 0) || (vpe_blt_adjust == 0) || (input_cs == 0) || (matrix_scaling_factor == 0) ) {
vpe_log("Invalid input parameters");
return false;
}
vpe_in_adjust = *vpe_blt_adjust;
if ( (surface_info->cs.range == VPE_COLOR_RANGE_STUDIO)) { // brightness adjustment to match shader
if (vpe_is_8bit(surface_info->format)) {
vpe_in_adjust.brightness *= 1.16f; // 255/235 - scaling factor, applies only to the brightness
bright_norm_factor = bright_norm_factor_8bit;
}
else {
if (vpe_is_10bit(surface_info->format)) {
vpe_in_adjust.brightness *= 1.066f; // 1023/(1023 - 64) - scaling factor, applies only to the brightness
bright_norm_factor = bright_norm_factor_10bit;
}
}
}
if (vpe_blt_adjust) {
translate_blt_to_internal_adjustments(vpe_blt_adjust, &vpe_adjust);
translate_blt_to_internal_adjustments(&vpe_in_adjust, &vpe_adjust);
}
switch (in_cs) {
@ -732,7 +747,7 @@ bool vpe_color_calculate_input_cs(struct vpe_priv *vpe_priv, enum color_space in
case COLOR_SPACE_YCBCR601_LIMITED:
case COLOR_SPACE_YCBCR709_LIMITED:
case COLOR_SPACE_2020_YCBCR:
calculate_yuv_matrix(&vpe_adjust, in_cs, input_cs, fixed_csc_matrix);
calculate_yuv_matrix(&vpe_adjust, in_cs, input_cs, fixed_csc_matrix, bright_norm_factor);
if (vpe_priv->scale_yuv_matrix) { // in case the coefficitents are too large
// they are scaled down to fit the n integer bits, m
// fractional bits (for now 2.19)

2
src/amd/vpelib/src/core/inc/color_cs.h
View file

@ -46,7 +46,7 @@ struct vpe_color_adjustments {
bool vpe_color_calculate_input_cs(struct vpe_priv *vpe_priv, enum color_space in_cs,
const struct vpe_color_adjust *vpe_adjust, struct vpe_csc_matrix *input_cs,
struct fixed31_32 *matrix_scaling_factor);
struct fixed31_32 *matrix_scaling_factor, const struct vpe_surface_info *surface_info);
bool vpe_color_different_color_adjusts(
const struct vpe_color_adjust *new_vpe_adjusts, struct vpe_color_adjust *crt_vpe_adjusts);