mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-01 14:00:16 +01:00
radv/video: Fix coding allow_screen_content_tools and force_integer_mv
This was copied from radeonsi which expected seq_force_screen_content_tools = 2
and seq_force_integer_mv = 2.
Fixes: 37e71a5cb2 ("radv/video: add support for AV1 encoding")
Reviewed-by: Benjamin Cheng <benjamin.cheng@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38371>
This commit is contained in:
parent
22803f0d50
commit
3858a6a696
1 changed files with 4 additions and 9 deletions
|
|
@ -2543,15 +2543,10 @@ radv_enc_av1_obu_instruction(struct radv_cmd_buffer *cmd_buffer, const VkVideoEn
|
|||
/* disable_cdf_update */
|
||||
radv_enc_code_fixed_bits(cmd_buffer, av1_pic->flags.disable_cdf_update, 1);
|
||||
|
||||
bool allow_screen_content_tools = false;
|
||||
if (seq->flags.reduced_still_picture_header || av1_pic->flags.allow_screen_content_tools) {
|
||||
/* allow_screen_content_tools */
|
||||
allow_screen_content_tools = /*av1_pic->av1_spec_misc.palette_mode_enable ||*/
|
||||
av1_pic->flags.force_integer_mv;
|
||||
radv_enc_code_fixed_bits(cmd_buffer, allow_screen_content_tools ? 1 : 0, 1);
|
||||
}
|
||||
if (seq->seq_force_screen_content_tools == STD_VIDEO_AV1_SELECT_SCREEN_CONTENT_TOOLS)
|
||||
radv_enc_code_fixed_bits(cmd_buffer, av1_pic->flags.allow_screen_content_tools, 1);
|
||||
|
||||
if (allow_screen_content_tools)
|
||||
if (av1_pic->flags.allow_screen_content_tools && seq->seq_force_integer_mv == STD_VIDEO_AV1_SELECT_INTEGER_MV)
|
||||
/* force_integer_mv */
|
||||
radv_enc_code_fixed_bits(cmd_buffer, av1_pic->flags.force_integer_mv, 1);
|
||||
|
||||
|
|
@ -2598,7 +2593,7 @@ radv_enc_av1_obu_instruction(struct radv_cmd_buffer *cmd_buffer, const VkVideoEn
|
|||
/* render_height_minus_1 */
|
||||
radv_enc_code_fixed_bits(cmd_buffer, av1_pic->render_height_minus_1, 16);
|
||||
}
|
||||
if (av1_pic->flags.allow_screen_content_tools && av1_pic->flags.force_integer_mv)
|
||||
if (av1_pic->flags.allow_screen_content_tools)
|
||||
/* allow_intrabc */
|
||||
radv_enc_code_fixed_bits(cmd_buffer, 0, 1);
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue