mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 00:47:45 +00:00
LibVideo: Parameterize segment ID parsing for the VP9 decoder
This commit is contained in:
parent
568e2fc1f2
commit
10ba956066
3 changed files with 21 additions and 28 deletions
|
@ -1064,7 +1064,7 @@ DecoderErrorOr<void> Parser::intra_frame_mode_info()
|
||||||
DecoderErrorOr<void> Parser::intra_segment_id()
|
DecoderErrorOr<void> Parser::intra_segment_id()
|
||||||
{
|
{
|
||||||
if (m_segmentation_enabled && m_segmentation_update_map)
|
if (m_segmentation_enabled && m_segmentation_update_map)
|
||||||
m_segment_id = TRY_READ(m_tree_parser->parse_tree<u8>(SyntaxElementType::SegmentID));
|
m_segment_id = TRY_READ(TreeParser::parse_segment_id(*m_bit_stream, m_segmentation_tree_probs));
|
||||||
else
|
else
|
||||||
m_segment_id = 0;
|
m_segment_id = 0;
|
||||||
return {};
|
return {};
|
||||||
|
@ -1128,15 +1128,15 @@ DecoderErrorOr<void> Parser::inter_segment_id()
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
if (!m_segmentation_temporal_update) {
|
if (!m_segmentation_temporal_update) {
|
||||||
m_segment_id = TRY_READ(m_tree_parser->parse_tree<u8>(SyntaxElementType::SegmentID));
|
m_segment_id = TRY_READ(TreeParser::parse_segment_id(*m_bit_stream, m_segmentation_tree_probs));
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
auto seg_id_predicted = TRY_READ(m_tree_parser->parse_tree<bool>(SyntaxElementType::SegIDPredicted));
|
auto seg_id_predicted = TRY_READ(TreeParser::parse_segment_id_predicted(*m_bit_stream, m_segmentation_pred_prob, m_left_seg_pred_context[m_mi_row], m_above_seg_pred_context[m_mi_col]));
|
||||||
if (seg_id_predicted)
|
if (seg_id_predicted)
|
||||||
m_segment_id = predicted_segment_id;
|
m_segment_id = predicted_segment_id;
|
||||||
else
|
else
|
||||||
m_segment_id = TRY_READ(m_tree_parser->parse_tree<u8>(SyntaxElementType::SegmentID));
|
m_segment_id = TRY_READ(TreeParser::parse_segment_id(*m_bit_stream, m_segmentation_tree_probs));
|
||||||
|
|
||||||
for (size_t i = 0; i < num_8x8_blocks_wide_lookup[m_mi_size]; i++) {
|
for (size_t i = 0; i < num_8x8_blocks_wide_lookup[m_mi_size]; i++) {
|
||||||
auto index = m_mi_col + i;
|
auto index = m_mi_col + i;
|
||||||
|
|
|
@ -187,6 +187,21 @@ ErrorOr<PredictionMode> TreeParser::parse_uv_mode(BitStream& bit_stream, Probabi
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ErrorOr<u8> TreeParser::parse_segment_id(BitStream& bit_stream, u8 const probabilities[7])
|
||||||
|
{
|
||||||
|
auto value = TRY(parse_tree_new<u8>(bit_stream, { segment_tree }, [&](u8 node) { return probabilities[node]; }));
|
||||||
|
// Segment ID is not counted.
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
ErrorOr<bool> TreeParser::parse_segment_id_predicted(BitStream& bit_stream, u8 const probabilities[3], u8 above_seg_pred_context, u8 left_seg_pred_context)
|
||||||
|
{
|
||||||
|
auto context = left_seg_pred_context + above_seg_pred_context;
|
||||||
|
auto value = TRY(parse_tree_new<bool>(bit_stream, { binary_tree }, [&](u8) { return probabilities[context]; }));
|
||||||
|
// Segment ID prediction is not counted.
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
ErrorOr<PredictionMode> TreeParser::parse_inter_mode(BitStream& bit_stream, ProbabilityTables const& probability_table, SyntaxElementCounter& counter, u8 mode_context_for_ref_frame_0)
|
ErrorOr<PredictionMode> TreeParser::parse_inter_mode(BitStream& bit_stream, ProbabilityTables const& probability_table, SyntaxElementCounter& counter, u8 mode_context_for_ref_frame_0)
|
||||||
{
|
{
|
||||||
// Tree
|
// Tree
|
||||||
|
@ -235,10 +250,7 @@ ErrorOr<InterpolationFilter> TreeParser::parse_interpolation_filter(BitStream& b
|
||||||
TreeParser::TreeSelection TreeParser::select_tree(SyntaxElementType type)
|
TreeParser::TreeSelection TreeParser::select_tree(SyntaxElementType type)
|
||||||
{
|
{
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case SyntaxElementType::SegmentID:
|
|
||||||
return { segment_tree };
|
|
||||||
case SyntaxElementType::Skip:
|
case SyntaxElementType::Skip:
|
||||||
case SyntaxElementType::SegIDPredicted:
|
|
||||||
case SyntaxElementType::IsInter:
|
case SyntaxElementType::IsInter:
|
||||||
case SyntaxElementType::CompMode:
|
case SyntaxElementType::CompMode:
|
||||||
case SyntaxElementType::CompRef:
|
case SyntaxElementType::CompRef:
|
||||||
|
@ -281,12 +293,8 @@ TreeParser::TreeSelection TreeParser::select_tree(SyntaxElementType type)
|
||||||
u8 TreeParser::select_tree_probability(SyntaxElementType type, u8 node)
|
u8 TreeParser::select_tree_probability(SyntaxElementType type, u8 node)
|
||||||
{
|
{
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case SyntaxElementType::SegmentID:
|
|
||||||
return calculate_segment_id_probability(node);
|
|
||||||
case SyntaxElementType::Skip:
|
case SyntaxElementType::Skip:
|
||||||
return calculate_skip_probability();
|
return calculate_skip_probability();
|
||||||
case SyntaxElementType::SegIDPredicted:
|
|
||||||
return calculate_seg_id_predicted_probability();
|
|
||||||
case SyntaxElementType::IsInter:
|
case SyntaxElementType::IsInter:
|
||||||
return calculate_is_inter_probability();
|
return calculate_is_inter_probability();
|
||||||
case SyntaxElementType::CompMode:
|
case SyntaxElementType::CompMode:
|
||||||
|
@ -342,11 +350,6 @@ u8 TreeParser::select_tree_probability(SyntaxElementType type, u8 node)
|
||||||
#define ABOVE_SINGLE m_decoder.m_above_single
|
#define ABOVE_SINGLE m_decoder.m_above_single
|
||||||
#define LEFT_SINGLE m_decoder.m_left_single
|
#define LEFT_SINGLE m_decoder.m_left_single
|
||||||
|
|
||||||
u8 TreeParser::calculate_segment_id_probability(u8 node)
|
|
||||||
{
|
|
||||||
return m_decoder.m_segmentation_tree_probs[node];
|
|
||||||
}
|
|
||||||
|
|
||||||
u8 TreeParser::calculate_skip_probability()
|
u8 TreeParser::calculate_skip_probability()
|
||||||
{
|
{
|
||||||
m_ctx = 0;
|
m_ctx = 0;
|
||||||
|
@ -357,12 +360,6 @@ u8 TreeParser::calculate_skip_probability()
|
||||||
return m_decoder.m_probability_tables->skip_prob()[m_ctx];
|
return m_decoder.m_probability_tables->skip_prob()[m_ctx];
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 TreeParser::calculate_seg_id_predicted_probability()
|
|
||||||
{
|
|
||||||
m_ctx = m_decoder.m_left_seg_pred_context[m_decoder.m_mi_row] + m_decoder.m_above_seg_pred_context[m_decoder.m_mi_col];
|
|
||||||
return m_decoder.m_segmentation_pred_prob[m_ctx];
|
|
||||||
}
|
|
||||||
|
|
||||||
u8 TreeParser::calculate_is_inter_probability()
|
u8 TreeParser::calculate_is_inter_probability()
|
||||||
{
|
{
|
||||||
if (AVAIL_U && AVAIL_L) {
|
if (AVAIL_U && AVAIL_L) {
|
||||||
|
@ -779,10 +776,6 @@ void TreeParser::count_syntax_element(SyntaxElementType type, int value)
|
||||||
case SyntaxElementType::MoreCoefs:
|
case SyntaxElementType::MoreCoefs:
|
||||||
increment(m_decoder.m_syntax_element_counter->m_counts_more_coefs[m_tx_size][m_plane > 0][m_decoder.m_is_inter][m_band][m_ctx][value]);
|
increment(m_decoder.m_syntax_element_counter->m_counts_more_coefs[m_tx_size][m_plane > 0][m_decoder.m_is_inter][m_band][m_ctx][value]);
|
||||||
return;
|
return;
|
||||||
case SyntaxElementType::SegmentID:
|
|
||||||
case SyntaxElementType::SegIDPredicted:
|
|
||||||
// No counting required
|
|
||||||
return;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,6 +68,8 @@ public:
|
||||||
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&);
|
||||||
static ErrorOr<PredictionMode> parse_uv_mode(BitStream&, ProbabilityTables const&, SyntaxElementCounter&, PredictionMode y_mode);
|
static ErrorOr<PredictionMode> parse_uv_mode(BitStream&, ProbabilityTables const&, SyntaxElementCounter&, PredictionMode y_mode);
|
||||||
|
static ErrorOr<u8> parse_segment_id(BitStream&, u8 const probabilities[7]);
|
||||||
|
static ErrorOr<bool> parse_segment_id_predicted(BitStream&, u8 const probabilities[3], u8 above_seg_pred_context, u8 left_seg_pred_context);
|
||||||
static ErrorOr<PredictionMode> parse_inter_mode(BitStream&, ProbabilityTables const&, SyntaxElementCounter&, u8 mode_context_for_ref_frame_0);
|
static ErrorOr<PredictionMode> parse_inter_mode(BitStream&, ProbabilityTables const&, SyntaxElementCounter&, u8 mode_context_for_ref_frame_0);
|
||||||
static ErrorOr<InterpolationFilter> parse_interpolation_filter(BitStream&, ProbabilityTables const&, SyntaxElementCounter&, Optional<ReferenceFrameType> above_ref_frame, Optional<ReferenceFrameType> left_ref_frame, Optional<InterpolationFilter> above_interpolation_filter, Optional<InterpolationFilter> left_interpolation_filter);
|
static ErrorOr<InterpolationFilter> parse_interpolation_filter(BitStream&, ProbabilityTables const&, SyntaxElementCounter&, Optional<ReferenceFrameType> above_ref_frame, Optional<ReferenceFrameType> left_ref_frame, Optional<InterpolationFilter> above_interpolation_filter, Optional<InterpolationFilter> left_interpolation_filter);
|
||||||
|
|
||||||
|
@ -103,9 +105,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
u8 calculate_segment_id_probability(u8 node);
|
|
||||||
u8 calculate_skip_probability();
|
u8 calculate_skip_probability();
|
||||||
u8 calculate_seg_id_predicted_probability();
|
|
||||||
u8 calculate_is_inter_probability();
|
u8 calculate_is_inter_probability();
|
||||||
u8 calculate_comp_mode_probability();
|
u8 calculate_comp_mode_probability();
|
||||||
u8 calculate_comp_ref_probability();
|
u8 calculate_comp_ref_probability();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue