From 2c3dd2a37d1b8204ae5c6a98716940101ac911ca Mon Sep 17 00:00:00 2001 From: David Rosca Date: Tue, 5 Nov 2024 11:51:21 +0100 Subject: [PATCH] frontends/va: Add minus_1 to AV1 render_width/height Rename to match the spec and to match the actual value. Reviewed-by: Ruijing Dong Part-of: --- src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c | 8 ++++---- src/gallium/frontends/va/picture_av1_enc.c | 4 ++-- src/gallium/include/pipe/p_video_state.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c index ed8862fd459..6fdd14b6a51 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c @@ -468,9 +468,9 @@ void radeon_enc_av1_frame_header_common(struct radeon_encoder *enc, bool frame_h radeon_enc_code_fixed_bits(enc, av1->enable_render_size ? 1 : 0, 1); if (av1->enable_render_size) { /* render_width_minus_1 */ - radeon_enc_code_fixed_bits(enc, av1->render_width, 16); + radeon_enc_code_fixed_bits(enc, av1->render_width_minus_1, 16); /* render_height_minus_1 */ - radeon_enc_code_fixed_bits(enc, av1->render_height, 16); + radeon_enc_code_fixed_bits(enc, av1->render_height_minus_1, 16); } if (!enc->enc_pic.disable_screen_content_tools && (enc->enc_pic.av1_spec_misc.palette_mode_enable || enc->enc_pic.force_integer_mv)) @@ -511,9 +511,9 @@ void radeon_enc_av1_frame_header_common(struct radeon_encoder *enc, bool frame_h radeon_enc_code_fixed_bits(enc, av1->enable_render_size ? 1 : 0, 1); if (av1->enable_render_size) { /* render_width_minus_1 */ - radeon_enc_code_fixed_bits(enc, av1->render_width, 16); + radeon_enc_code_fixed_bits(enc, av1->render_width_minus_1, 16); /* render_height_minus_1 */ - radeon_enc_code_fixed_bits(enc, av1->render_height, 16); + radeon_enc_code_fixed_bits(enc, av1->render_height_minus_1, 16); } } diff --git a/src/gallium/frontends/va/picture_av1_enc.c b/src/gallium/frontends/va/picture_av1_enc.c index 1102e88bf7e..2b30e7f52f5 100644 --- a/src/gallium/frontends/va/picture_av1_enc.c +++ b/src/gallium/frontends/va/picture_av1_enc.c @@ -639,8 +639,8 @@ static void av1_render_size(vlVaContext *context, struct vl_vlc *vlc) av1->enable_render_size = av1_f(vlc, 1); if (av1->enable_render_size) { - av1->render_width = av1_f(vlc, 16); - av1->render_height = av1_f(vlc, 16); + av1->render_width_minus_1 = av1_f(vlc, 16); + av1->render_height_minus_1 = av1_f(vlc, 16); } } diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h index 5311f230dd8..3c616032ee4 100644 --- a/src/gallium/include/pipe/p_video_state.h +++ b/src/gallium/include/pipe/p_video_state.h @@ -1381,8 +1381,8 @@ struct pipe_av1_enc_picture_desc uint16_t frame_width_sb; uint16_t frame_height_sb; uint16_t upscaled_width; - uint16_t render_width; - uint16_t render_height; + uint16_t render_width_minus_1; + uint16_t render_height_minus_1; uint32_t interpolation_filter; uint8_t tx_mode; uint8_t compound_reference_mode;