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

frontends/va: Add minus_1 to AV1 render_width/height

Browse source 
Rename to match the spec and to match the actual value.

Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31977>
This commit is contained in:
David Rosca 2024-11-05 11:51:21 +01:00 • committed by Marge Bot
parent 7f2624e6ae
commit 2c3dd2a37d
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c
View file

@ -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);
}
}

4
src/gallium/frontends/va/picture_av1_enc.c
View file

@ -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);
}
}

4
src/gallium/include/pipe/p_video_state.h
View file

@ -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;