From 668e80a9f42fb4ce0e16f6381d05bcbd286b2da1 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 30 Jan 2022 10:31:13 +0100 Subject: VideoCore: Refactor syncing. --- src/video_core/command_classes/codecs/vp9_types.h | 306 ---------------------- 1 file changed, 306 deletions(-) delete mode 100644 src/video_core/command_classes/codecs/vp9_types.h (limited to 'src/video_core/command_classes/codecs/vp9_types.h') diff --git a/src/video_core/command_classes/codecs/vp9_types.h b/src/video_core/command_classes/codecs/vp9_types.h deleted file mode 100644 index bb3d8df6e..000000000 --- a/src/video_core/command_classes/codecs/vp9_types.h +++ /dev/null @@ -1,306 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include -#include -#include "common/common_funcs.h" -#include "common/common_types.h" - -namespace Tegra { -class GPU; - -namespace Decoder { -struct Vp9FrameDimensions { - s16 width; - s16 height; - s16 luma_pitch; - s16 chroma_pitch; -}; -static_assert(sizeof(Vp9FrameDimensions) == 0x8, "Vp9 Vp9FrameDimensions is an invalid size"); - -enum class FrameFlags : u32 { - IsKeyFrame = 1 << 0, - LastFrameIsKeyFrame = 1 << 1, - FrameSizeChanged = 1 << 2, - ErrorResilientMode = 1 << 3, - LastShowFrame = 1 << 4, - IntraOnly = 1 << 5, -}; -DECLARE_ENUM_FLAG_OPERATORS(FrameFlags) - -enum class TxSize { - Tx4x4 = 0, // 4x4 transform - Tx8x8 = 1, // 8x8 transform - Tx16x16 = 2, // 16x16 transform - Tx32x32 = 3, // 32x32 transform - TxSizes = 4 -}; - -enum class TxMode { - Only4X4 = 0, // Only 4x4 transform used - Allow8X8 = 1, // Allow block transform size up to 8x8 - Allow16X16 = 2, // Allow block transform size up to 16x16 - Allow32X32 = 3, // Allow block transform size up to 32x32 - TxModeSelect = 4, // Transform specified for each block - TxModes = 5 -}; - -struct Segmentation { - u8 enabled; - u8 update_map; - u8 temporal_update; - u8 abs_delta; - std::array feature_mask; - std::array, 8> feature_data; -}; -static_assert(sizeof(Segmentation) == 0x64, "Segmentation is an invalid size"); - -struct LoopFilter { - u8 mode_ref_delta_enabled; - std::array ref_deltas; - std::array mode_deltas; -}; -static_assert(sizeof(LoopFilter) == 0x7, "LoopFilter is an invalid size"); - -struct Vp9EntropyProbs { - std::array y_mode_prob; ///< 0x0000 - std::array partition_prob; ///< 0x0024 - std::array coef_probs; ///< 0x0064 - std::array switchable_interp_prob; ///< 0x0724 - std::array inter_mode_prob; ///< 0x072C - std::array intra_inter_prob; ///< 0x0748 - std::array comp_inter_prob; ///< 0x074C - std::array single_ref_prob; ///< 0x0751 - std::array comp_ref_prob; ///< 0x075B - std::array tx_32x32_prob; ///< 0x0760 - std::array tx_16x16_prob; ///< 0x0766 - std::array tx_8x8_prob; ///< 0x076A - std::array skip_probs; ///< 0x076C - std::array joints; ///< 0x076F - std::array sign; ///< 0x0772 - std::array classes; ///< 0x0774 - std::array class_0; ///< 0x0788 - std::array prob_bits; ///< 0x078A - std::array class_0_fr; ///< 0x079E - std::array fr; ///< 0x07AA - std::array class_0_hp; ///< 0x07B0 - std::array high_precision; ///< 0x07B2 -}; -static_assert(sizeof(Vp9EntropyProbs) == 0x7B4, "Vp9EntropyProbs is an invalid size"); - -struct Vp9PictureInfo { - u32 bitstream_size; - std::array frame_offsets; - std::array ref_frame_sign_bias; - s32 base_q_index; - s32 y_dc_delta_q; - s32 uv_dc_delta_q; - s32 uv_ac_delta_q; - s32 transform_mode; - s32 interp_filter; - s32 reference_mode; - s32 log2_tile_cols; - s32 log2_tile_rows; - std::array ref_deltas; - std::array mode_deltas; - Vp9EntropyProbs entropy; - Vp9FrameDimensions frame_size; - u8 first_level; - u8 sharpness_level; - bool is_key_frame; - bool intra_only; - bool last_frame_was_key; - bool error_resilient_mode; - bool last_frame_shown; - bool show_frame; - bool lossless; - bool allow_high_precision_mv; - bool segment_enabled; - bool mode_ref_delta_enabled; -}; - -struct Vp9FrameContainer { - Vp9PictureInfo info{}; - std::vector bit_stream; -}; - -struct PictureInfo { - INSERT_PADDING_WORDS_NOINIT(12); ///< 0x00 - u32 bitstream_size; ///< 0x30 - INSERT_PADDING_WORDS_NOINIT(5); ///< 0x34 - Vp9FrameDimensions last_frame_size; ///< 0x48 - Vp9FrameDimensions golden_frame_size; ///< 0x50 - Vp9FrameDimensions alt_frame_size; ///< 0x58 - Vp9FrameDimensions current_frame_size; ///< 0x60 - FrameFlags vp9_flags; ///< 0x68 - std::array ref_frame_sign_bias; ///< 0x6C - u8 first_level; ///< 0x70 - u8 sharpness_level; ///< 0x71 - u8 base_q_index; ///< 0x72 - u8 y_dc_delta_q; ///< 0x73 - u8 uv_ac_delta_q; ///< 0x74 - u8 uv_dc_delta_q; ///< 0x75 - u8 lossless; ///< 0x76 - u8 tx_mode; ///< 0x77 - u8 allow_high_precision_mv; ///< 0x78 - u8 interp_filter; ///< 0x79 - u8 reference_mode; ///< 0x7A - INSERT_PADDING_BYTES_NOINIT(3); ///< 0x7B - u8 log2_tile_cols; ///< 0x7E - u8 log2_tile_rows; ///< 0x7F - Segmentation segmentation; ///< 0x80 - LoopFilter loop_filter; ///< 0xE4 - INSERT_PADDING_BYTES_NOINIT(21); ///< 0xEB - - [[nodiscard]] Vp9PictureInfo Convert() const { - return { - .bitstream_size = bitstream_size, - .frame_offsets{}, - .ref_frame_sign_bias = ref_frame_sign_bias, - .base_q_index = base_q_index, - .y_dc_delta_q = y_dc_delta_q, - .uv_dc_delta_q = uv_dc_delta_q, - .uv_ac_delta_q = uv_ac_delta_q, - .transform_mode = tx_mode, - .interp_filter = interp_filter, - .reference_mode = reference_mode, - .log2_tile_cols = log2_tile_cols, - .log2_tile_rows = log2_tile_rows, - .ref_deltas = loop_filter.ref_deltas, - .mode_deltas = loop_filter.mode_deltas, - .entropy{}, - .frame_size = current_frame_size, - .first_level = first_level, - .sharpness_level = sharpness_level, - .is_key_frame = True(vp9_flags & FrameFlags::IsKeyFrame), - .intra_only = True(vp9_flags & FrameFlags::IntraOnly), - .last_frame_was_key = True(vp9_flags & FrameFlags::LastFrameIsKeyFrame), - .error_resilient_mode = True(vp9_flags & FrameFlags::ErrorResilientMode), - .last_frame_shown = True(vp9_flags & FrameFlags::LastShowFrame), - .show_frame = true, - .lossless = lossless != 0, - .allow_high_precision_mv = allow_high_precision_mv != 0, - .segment_enabled = segmentation.enabled != 0, - .mode_ref_delta_enabled = loop_filter.mode_ref_delta_enabled != 0, - }; - } -}; -static_assert(sizeof(PictureInfo) == 0x100, "PictureInfo is an invalid size"); - -struct EntropyProbs { - INSERT_PADDING_BYTES_NOINIT(1024); ///< 0x0000 - std::array inter_mode_prob; ///< 0x0400 - std::array intra_inter_prob; ///< 0x041C - INSERT_PADDING_BYTES_NOINIT(80); ///< 0x0420 - std::array tx_8x8_prob; ///< 0x0470 - std::array tx_16x16_prob; ///< 0x0472 - std::array tx_32x32_prob; ///< 0x0476 - std::array y_mode_prob_e8; ///< 0x047C - std::array, 4> y_mode_prob_e0e7; ///< 0x0480 - INSERT_PADDING_BYTES_NOINIT(64); ///< 0x04A0 - std::array partition_prob; ///< 0x04E0 - INSERT_PADDING_BYTES_NOINIT(10); ///< 0x0520 - std::array switchable_interp_prob; ///< 0x052A - std::array comp_inter_prob; ///< 0x0532 - std::array skip_probs; ///< 0x0537 - INSERT_PADDING_BYTES_NOINIT(1); ///< 0x053A - std::array joints; ///< 0x053B - std::array sign; ///< 0x053E - std::array class_0; ///< 0x0540 - std::array fr; ///< 0x0542 - std::array class_0_hp; ///< 0x0548 - std::array high_precision; ///< 0x054A - std::array classes; ///< 0x054C - std::array class_0_fr; ///< 0x0560 - std::array pred_bits; ///< 0x056C - std::array single_ref_prob; ///< 0x0580 - std::array comp_ref_prob; ///< 0x058A - INSERT_PADDING_BYTES_NOINIT(17); ///< 0x058F - std::array coef_probs; ///< 0x05A0 - - void Convert(Vp9EntropyProbs& fc) { - fc.inter_mode_prob = inter_mode_prob; - fc.intra_inter_prob = intra_inter_prob; - fc.tx_8x8_prob = tx_8x8_prob; - fc.tx_16x16_prob = tx_16x16_prob; - fc.tx_32x32_prob = tx_32x32_prob; - - for (std::size_t i = 0; i < 4; i++) { - for (std::size_t j = 0; j < 9; j++) { - fc.y_mode_prob[j + 9 * i] = j < 8 ? y_mode_prob_e0e7[i][j] : y_mode_prob_e8[i]; - } - } - - fc.partition_prob = partition_prob; - fc.switchable_interp_prob = switchable_interp_prob; - fc.comp_inter_prob = comp_inter_prob; - fc.skip_probs = skip_probs; - fc.joints = joints; - fc.sign = sign; - fc.class_0 = class_0; - fc.fr = fr; - fc.class_0_hp = class_0_hp; - fc.high_precision = high_precision; - fc.classes = classes; - fc.class_0_fr = class_0_fr; - fc.prob_bits = pred_bits; - fc.single_ref_prob = single_ref_prob; - fc.comp_ref_prob = comp_ref_prob; - - // Skip the 4th element as it goes unused - for (std::size_t i = 0; i < coef_probs.size(); i += 4) { - const std::size_t j = i - i / 4; - fc.coef_probs[j] = coef_probs[i]; - fc.coef_probs[j + 1] = coef_probs[i + 1]; - fc.coef_probs[j + 2] = coef_probs[i + 2]; - } - } -}; -static_assert(sizeof(EntropyProbs) == 0xEA0, "EntropyProbs is an invalid size"); - -enum class Ref { Last, Golden, AltRef }; - -struct RefPoolElement { - s64 frame{}; - Ref ref{}; - bool refresh{}; -}; - -#define ASSERT_POSITION(field_name, position) \ - static_assert(offsetof(Vp9EntropyProbs, field_name) == position, \ - "Field " #field_name " has invalid position") - -ASSERT_POSITION(partition_prob, 0x0024); -ASSERT_POSITION(switchable_interp_prob, 0x0724); -ASSERT_POSITION(sign, 0x0772); -ASSERT_POSITION(class_0_fr, 0x079E); -ASSERT_POSITION(high_precision, 0x07B2); -#undef ASSERT_POSITION - -#define ASSERT_POSITION(field_name, position) \ - static_assert(offsetof(PictureInfo, field_name) == position, \ - "Field " #field_name " has invalid position") - -ASSERT_POSITION(bitstream_size, 0x30); -ASSERT_POSITION(last_frame_size, 0x48); -ASSERT_POSITION(first_level, 0x70); -ASSERT_POSITION(segmentation, 0x80); -ASSERT_POSITION(loop_filter, 0xE4); -#undef ASSERT_POSITION - -#define ASSERT_POSITION(field_name, position) \ - static_assert(offsetof(EntropyProbs, field_name) == position, \ - "Field " #field_name " has invalid position") - -ASSERT_POSITION(inter_mode_prob, 0x400); -ASSERT_POSITION(tx_8x8_prob, 0x470); -ASSERT_POSITION(partition_prob, 0x4E0); -ASSERT_POSITION(class_0, 0x540); -ASSERT_POSITION(class_0_fr, 0x560); -ASSERT_POSITION(coef_probs, 0x5A0); -#undef ASSERT_POSITION - -}; // namespace Decoder -}; // namespace Tegra -- cgit v1.2.3