hwpplayer1/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

vp9_types: Remove unused Vp9PictureInfo members

Browse source
This commit is contained in:
ameerj 2021-08-25 21:29:22 -04:00
parent 3843995ceb
commit 3de38c9a70
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/video_core/command_classes/codecs/vp9.cpp
View file

@ -742,6 +742,7 @@ VpxBitStreamWriter VP9::ComposeUncompressedHeader() {
uncomp_writer.WriteDeltaQ(current_frame_info.uv_dc_delta_q); uncomp_writer.WriteDeltaQ(current_frame_info.uv_dc_delta_q);
uncomp_writer.WriteDeltaQ(current_frame_info.uv_ac_delta_q); uncomp_writer.WriteDeltaQ(current_frame_info.uv_ac_delta_q);
ASSERT(!current_frame_info.segment_enabled);
uncomp_writer.WriteBit(false); // Segmentation enabled (TODO). uncomp_writer.WriteBit(false); // Segmentation enabled (TODO).
const s32 min_tile_cols_log2 = CalcMinLog2TileCols(current_frame_info.frame_size.width); const s32 min_tile_cols_log2 = CalcMinLog2TileCols(current_frame_info.frame_size.width);

24
src/video_core/command_classes/codecs/vp9_types.h
View file

@ -95,7 +95,6 @@ struct Vp9PictureInfo {
bool is_key_frame; bool is_key_frame;
bool intra_only; bool intra_only;
bool last_frame_was_key; bool last_frame_was_key;
bool frame_size_changed;
bool error_resilient_mode; bool error_resilient_mode;
bool last_frame_shown; bool last_frame_shown;
bool show_frame; bool show_frame;
@ -109,18 +108,10 @@ struct Vp9PictureInfo {
bool allow_high_precision_mv; bool allow_high_precision_mv;
s32 interp_filter; s32 interp_filter;
s32 reference_mode; s32 reference_mode;
s8 comp_fixed_ref;
std::array<s8, 2> comp_var_ref;
s32 log2_tile_cols; s32 log2_tile_cols;
s32 log2_tile_rows; s32 log2_tile_rows;
bool segment_enabled; bool segment_enabled;
bool segment_map_update;
bool segment_map_temporal_update;
s32 segment_abs_delta;
std::array<u32, 8> segment_feature_enable;
std::array<std::array<s16, 4>, 8> segment_feature_data;
bool mode_ref_delta_enabled; bool mode_ref_delta_enabled;
bool use_prev_in_find_mv_refs;
std::array<s8, 4> ref_deltas; std::array<s8, 4> ref_deltas;
std::array<s8, 2> mode_deltas; std::array<s8, 2> mode_deltas;
Vp9EntropyProbs entropy; Vp9EntropyProbs entropy;
@ -129,7 +120,6 @@ struct Vp9PictureInfo {
u8 sharpness_level; u8 sharpness_level;
u32 bitstream_size; u32 bitstream_size;
std::array<u64, 4> frame_offsets; std::array<u64, 4> frame_offsets;
std::array<bool, 4> refresh_frame;
}; };
struct Vp9FrameContainer { struct Vp9FrameContainer {
@ -187,22 +177,9 @@ struct PictureInfo {
.allow_high_precision_mv = allow_high_precision_mv != 0, .allow_high_precision_mv = allow_high_precision_mv != 0,
.interp_filter = interp_filter, .interp_filter = interp_filter,
.reference_mode = reference_mode, .reference_mode = reference_mode,
.comp_fixed_ref = comp_fixed_ref,
.comp_var_ref = comp_var_ref,
.log2_tile_cols = log2_tile_cols, .log2_tile_cols = log2_tile_cols,
.log2_tile_rows = log2_tile_rows, .log2_tile_rows = log2_tile_rows,
.segment_enabled = segmentation.enabled != 0, .segment_enabled = segmentation.enabled != 0,
.segment_map_update = segmentation.update_map != 0,
.segment_map_temporal_update = segmentation.temporal_update != 0,
.segment_abs_delta = segmentation.abs_delta,
.segment_feature_enable = segmentation.feature_mask,
.segment_feature_data = segmentation.feature_data,
.mode_ref_delta_enabled = loop_filter.mode_ref_delta_enabled != 0,
.use_prev_in_find_mv_refs = !(vp9_flags == (FrameFlags::ErrorResilientMode)) &&
!(vp9_flags == (FrameFlags::FrameSizeChanged)) &&
!(vp9_flags == (FrameFlags::IntraOnly)) &&
(vp9_flags == (FrameFlags::LastShowFrame)) &&
!(vp9_flags == (FrameFlags::LastFrameIsKeyFrame)),
.ref_deltas = loop_filter.ref_deltas, .ref_deltas = loop_filter.ref_deltas,
.mode_deltas = loop_filter.mode_deltas, .mode_deltas = loop_filter.mode_deltas,
.entropy{}, .entropy{},
@ -211,7 +188,6 @@ struct PictureInfo {
.sharpness_level = sharpness_level, .sharpness_level = sharpness_level,
.bitstream_size = bitstream_size, .bitstream_size = bitstream_size,
.frame_offsets{}, .frame_offsets{},
.refresh_frame{},
}; };
} }
}; };