Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
b2f0c338
Commit
b2f0c338
authored
Dec 14, 2016
by
Jingning Han
Browse files
Change table definitions to support 4x4 coding block
Change-Id: I93493abe3c412fc10f5bb5a2eb157c8db277f4e0
parent
d7d20477
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/common/common_data.h
View file @
b2f0c338
...
...
@@ -283,9 +283,12 @@ static const BLOCK_SIZE subsize_lookup[PARTITION_TYPES][BLOCK_SIZES] =
#if CONFIG_CB4X4
// 2X2, 2X4, 4X2,
BLOCK_INVALID
,
BLOCK_INVALID
,
BLOCK_INVALID
,
#endif
// 4X4
BLOCK_4X2
,
#else
// 4X4
BLOCK_INVALID
,
#endif
// 4X8, 8X4, 8X8
BLOCK_INVALID
,
BLOCK_INVALID
,
BLOCK_8X4
,
// 8X16, 16X8, 16X16
...
...
@@ -302,9 +305,12 @@ static const BLOCK_SIZE subsize_lookup[PARTITION_TYPES][BLOCK_SIZES] =
#if CONFIG_CB4X4
// 2X2, 2X4, 4X2,
BLOCK_INVALID
,
BLOCK_INVALID
,
BLOCK_INVALID
,
#endif
// 4X4
BLOCK_2X4
,
#else
// 4X4
BLOCK_INVALID
,
#endif
// 4X8, 8X4, 8X8
BLOCK_INVALID
,
BLOCK_INVALID
,
BLOCK_4X8
,
// 8X16, 16X8, 16X16
...
...
@@ -784,10 +790,14 @@ static const BLOCK_SIZE ss_size_lookup[BLOCK_SIZES][2][2] = {
{
{
BLOCK_2X2
,
BLOCK_INVALID
},
{
BLOCK_INVALID
,
BLOCK_INVALID
}
},
{
{
BLOCK_2X4
,
BLOCK_INVALID
},
{
BLOCK_INVALID
,
BLOCK_INVALID
}
},
{
{
BLOCK_4X2
,
BLOCK_INVALID
},
{
BLOCK_INVALID
,
BLOCK_INVALID
}
},
#endif
{
{
BLOCK_4X4
,
BLOCK_4X2
},
{
BLOCK_2X4
,
BLOCK_2X2
}
},
{
{
BLOCK_4X8
,
BLOCK_4X4
},
{
BLOCK_INVALID
,
BLOCK_2X4
}
},
{
{
BLOCK_8X4
,
BLOCK_INVALID
},
{
BLOCK_4X4
,
BLOCK_4X2
}
},
#else
{
{
BLOCK_4X4
,
BLOCK_INVALID
},
{
BLOCK_INVALID
,
BLOCK_INVALID
}
},
{
{
BLOCK_4X8
,
BLOCK_4X4
},
{
BLOCK_INVALID
,
BLOCK_INVALID
}
},
{
{
BLOCK_8X4
,
BLOCK_INVALID
},
{
BLOCK_4X4
,
BLOCK_INVALID
}
},
#endif
{
{
BLOCK_8X8
,
BLOCK_8X4
},
{
BLOCK_4X8
,
BLOCK_4X4
}
},
{
{
BLOCK_8X16
,
BLOCK_8X8
},
{
BLOCK_INVALID
,
BLOCK_4X8
}
},
{
{
BLOCK_16X8
,
BLOCK_INVALID
},
{
BLOCK_8X8
,
BLOCK_8X4
}
},
...
...
@@ -927,7 +937,7 @@ static const TX_SIZE uv_txsize_lookup[BLOCK_SIZES][TX_SIZES_ALL][2][2] = {
{
// BLOCK_8X8
#if CONFIG_CB4X4
{
{
TX_
4X4
,
TX_
4X4
},
{
TX_
4X4
,
TX_
4X4
}
},
{
{
TX_
2X2
,
TX_
2X2
},
{
TX_
2X2
,
TX_
2X2
}
},
#endif
{
{
TX_4X4
,
TX_4X4
},
{
TX_4X4
,
TX_4X4
}
},
{
{
TX_8X8
,
TX_4X4
},
{
TX_4X4
,
TX_4X4
}
},
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment