1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 21:57:35 +00:00

LibVideo/VP9: Don't store the default_intra_mode in a field

The default intra prediction mode was only used to set the sub-block
modes and the y prediction mode. Instead of storing it in a field, with
the sub modes are stored in an Array, we can just pull the last element
to set the y mode.
This commit is contained in:
Zaggy1024 2022-11-22 20:59:16 -06:00 committed by Andreas Kling
parent 713b48cfe2
commit e379223633
4 changed files with 7 additions and 9 deletions

View file

@ -1031,9 +1031,8 @@ DecoderErrorOr<void> Parser::intra_frame_mode_info()
above_context = m_sub_modes[get_image_index(m_mi_row - 1, m_mi_col)];
if (m_available_l)
left_context = m_sub_modes[get_image_index(m_mi_row, m_mi_col - 1)];
m_default_intra_mode = TRY_READ(TreeParser::parse_default_intra_mode(*m_bit_stream, *m_probability_tables, m_mi_size, above_context, left_context, m_block_sub_modes, 0, 0));
m_y_mode = m_default_intra_mode;
m_y_mode = TRY_READ(TreeParser::parse_default_intra_mode(*m_bit_stream, *m_probability_tables, m_mi_size, above_context, left_context, m_block_sub_modes, 0, 0));
for (auto& block_sub_mode : m_block_sub_modes)
block_sub_mode = m_y_mode;
} else {
@ -1048,17 +1047,17 @@ DecoderErrorOr<void> Parser::intra_frame_mode_info()
above_context = m_sub_modes[get_image_index(m_mi_row - 1, m_mi_col)];
if (m_available_l)
left_context = m_sub_modes[get_image_index(m_mi_row, m_mi_col - 1)];
m_default_intra_mode = TRY_READ(TreeParser::parse_default_intra_mode(*m_bit_stream, *m_probability_tables, m_mi_size, above_context, left_context, m_block_sub_modes, idx, idy));
auto sub_mode = TRY_READ(TreeParser::parse_default_intra_mode(*m_bit_stream, *m_probability_tables, m_mi_size, above_context, left_context, m_block_sub_modes, idx, idy));
for (auto y = 0; y < m_num_4x4_h; y++) {
for (auto x = 0; x < m_num_4x4_w; x++) {
auto index = (idy + y) * 2 + idx + x;
m_block_sub_modes[index] = m_default_intra_mode;
m_block_sub_modes[index] = sub_mode;
}
}
}
}
m_y_mode = m_default_intra_mode;
m_y_mode = m_block_sub_modes.last();
}
m_uv_mode = TRY_READ(TreeParser::parse_default_uv_mode(*m_bit_stream, *m_probability_tables, m_y_mode));
return {};