Skip to content

GitLab

Commit f8a29663 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files
Options

Merge "Simplify tx_size enums" into nextgenv2

parents f67e5eec aad298ff
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
av1/common/enums.h
View file @ f8a29663
......@@ -134,18 +134,16 @@ typedef enum ATTRIBUTE_PACKED {
#if CONFIG_CB4X4
TX_2X2, // 2x2 transform
#endif
TX_4X4, // 4x4 transform
TX_8X8, // 8x8 transform
TX_16X16, // 16x16 transform
TX_32X32, // 32x32 transform
#if CONFIG_EXT_TX
TX_4X4, // 4x4 transform
TX_8X8, // 8x8 transform
TX_16X16, // 16x16 transform
TX_32X32, // 32x32 transform
TX_4X8, // 4x8 transform
TX_8X4, // 8x4 transform
TX_8X16, // 8x16 transform
TX_16X8, // 16x8 transform
TX_16X32, // 16x32 transform
TX_32X16, // 32x16 transform
#endif // CONFIG_EXT_TX
TX_SIZES_ALL, // Includes rectangular transforms
TX_SIZES = TX_32X32 + 1, // Does NOT include rectangular transforms
TX_INVALID = 255 // Invalid transform size
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment