RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 20:37:34 +00:00
Code Issues Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibVideo/VP9/Parser.cpp
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)]; above_context = m_sub_modes[get_image_index(m_mi_row - 1, m_mi_col)];
if (m_available_l) if (m_available_l)
left_context = m_sub_modes[get_image_index(m_mi_row, m_mi_col - 1)]; 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) for (auto& block_sub_mode : m_block_sub_modes)
block_sub_mode = m_y_mode; block_sub_mode = m_y_mode;
} else { } 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)]; above_context = m_sub_modes[get_image_index(m_mi_row - 1, m_mi_col)];
if (m_available_l) if (m_available_l)
left_context = m_sub_modes[get_image_index(m_mi_row, m_mi_col - 1)]; 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 y = 0; y < m_num_4x4_h; y++) {
for (auto x = 0; x < m_num_4x4_w; x++) { for (auto x = 0; x < m_num_4x4_w; x++) {
auto index = (idy + y) * 2 + idx + 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)); m_uv_mode = TRY_READ(TreeParser::parse_default_uv_mode(*m_bit_stream, *m_probability_tables, m_y_mode));
return {}; return {};

3
Userland/Libraries/LibVideo/VP9/Parser.h
View file

@ -236,9 +236,8 @@ private:
TXSize m_tx_size { TX_4x4 }; TXSize m_tx_size { TX_4x4 };
ReferenceFramePair m_ref_frame; ReferenceFramePair m_ref_frame;
bool m_is_inter { false }; bool m_is_inter { false };
PredictionMode m_default_intra_mode { PredictionMode::DcPred };
PredictionMode m_y_mode { 0 }; PredictionMode m_y_mode { 0 };
PredictionMode m_block_sub_modes[4]; Array<PredictionMode, 4> m_block_sub_modes;
u8 m_num_4x4_w { 0 }; u8 m_num_4x4_w { 0 };
u8 m_num_4x4_h { 0 }; u8 m_num_4x4_h { 0 };
PredictionMode m_uv_mode { 0 }; // FIXME: Is u8 the right size? PredictionMode m_uv_mode { 0 }; // FIXME: Is u8 the right size?

2
Userland/Libraries/LibVideo/VP9/TreeParser.cpp
View file

@ -80,7 +80,7 @@ ErrorOr<Partition> TreeParser::parse_partition(BitStream& bit_stream, Probabilit
return value; return value;
} }
ErrorOr<PredictionMode> TreeParser::parse_default_intra_mode(BitStream& bit_stream, ProbabilityTables const& probability_table, BlockSubsize mi_size, Optional<Array<PredictionMode, 4> const&> above_context, Optional<Array<PredictionMode, 4> const&> left_context, PredictionMode block_sub_modes[4], u8 index_x, u8 index_y) ErrorOr<PredictionMode> TreeParser::parse_default_intra_mode(BitStream& bit_stream, ProbabilityTables const& probability_table, BlockSubsize mi_size, Optional<Array<PredictionMode, 4> const&> above_context, Optional<Array<PredictionMode, 4> const&> left_context, Array<PredictionMode, 4> const& block_sub_modes, u8 index_x, u8 index_y)
{ {
// FIXME: This should use a struct for the above and left contexts. // FIXME: This should use a struct for the above and left contexts.

2
Userland/Libraries/LibVideo/VP9/TreeParser.h
View file

@ -49,7 +49,7 @@ public:
}; };
static ErrorOr<Partition> parse_partition(BitStream&, ProbabilityTables const&, SyntaxElementCounter&, bool has_rows, bool has_columns, BlockSubsize block_subsize, u8 num_8x8, Vector<u8> const& above_partition_context, Vector<u8> const& left_partition_context, u32 row, u32 column, bool frame_is_intra); static ErrorOr<Partition> parse_partition(BitStream&, ProbabilityTables const&, SyntaxElementCounter&, bool has_rows, bool has_columns, BlockSubsize block_subsize, u8 num_8x8, Vector<u8> const& above_partition_context, Vector<u8> const& left_partition_context, u32 row, u32 column, bool frame_is_intra);
static ErrorOr<PredictionMode> parse_default_intra_mode(BitStream&, ProbabilityTables const&, BlockSubsize mi_size, Optional<Array<PredictionMode, 4> const&> above_context, Optional<Array<PredictionMode, 4> const&> left_context, PredictionMode block_sub_modes[4], u8 index_x, u8 index_y); static ErrorOr<PredictionMode> parse_default_intra_mode(BitStream&, ProbabilityTables const&, BlockSubsize mi_size, Optional<Array<PredictionMode, 4> const&> above_context, Optional<Array<PredictionMode, 4> const&> left_context, Array<PredictionMode, 4> const& block_sub_modes, u8 index_x, u8 index_y);
static ErrorOr<PredictionMode> parse_default_uv_mode(BitStream&, ProbabilityTables const&, PredictionMode y_mode); static ErrorOr<PredictionMode> parse_default_uv_mode(BitStream&, ProbabilityTables const&, PredictionMode y_mode);
static ErrorOr<PredictionMode> parse_intra_mode(BitStream&, ProbabilityTables const&, SyntaxElementCounter&, BlockSubsize mi_size); static ErrorOr<PredictionMode> parse_intra_mode(BitStream&, ProbabilityTables const&, SyntaxElementCounter&, BlockSubsize mi_size);
static ErrorOr<PredictionMode> parse_sub_intra_mode(BitStream&, ProbabilityTables const&, SyntaxElementCounter&); static ErrorOr<PredictionMode> parse_sub_intra_mode(BitStream&, ProbabilityTables const&, SyntaxElementCounter&);