Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
571189c6
Commit
571189c6
authored
Oct 24, 2016
by
Jingning Han
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add MAX_VARTX_DEPTH macro
Change-Id: I85532cf88f91f0f0cb4d9cb4b2dbda8a181297bf
parent
421af353
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
av1/common/enums.h
av1/common/enums.h
+4
-0
av1/decoder/decodemv.c
av1/decoder/decodemv.c
+1
-1
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+1
-1
av1/encoder/rdopt.c
av1/encoder/rdopt.c
+2
-2
No files found.
av1/common/enums.h
View file @
571189c6
...
...
@@ -58,6 +58,10 @@ extern "C" {
#define MAX_TILE_COLS 64
#endif // CONFIG_EXT_TILE
#if CONFIG_VAR_TX
#define MAX_VARTX_DEPTH 2
#endif
// Bitstream profiles indicated by 2-3 bits in the uncompressed header.
// 00: Profile 0. 8-bit 4:2:0 only.
// 10: Profile 1. 8-bit 4:4:4, 4:2:2, and 4:4:0.
...
...
av1/decoder/decodemv.c
View file @
571189c6
...
...
@@ -294,7 +294,7 @@ static void read_tx_size_vartx(AV1_COMMON *cm, MACROBLOCKD *xd,
if
(
blk_row
>=
max_blocks_high
||
blk_col
>=
max_blocks_wide
)
return
;
if
(
depth
==
2
)
{
if
(
depth
==
MAX_VARTX_DEPTH
)
{
int
idx
,
idy
;
inter_tx_size
[
0
][
0
]
=
tx_size
;
for
(
idy
=
0
;
idy
<
num_4x4_blocks_high_txsize_lookup
[
tx_size
]
/
2
;
++
idy
)
...
...
av1/encoder/bitstream.c
View file @
571189c6
...
...
@@ -379,7 +379,7 @@ static void write_tx_size_vartx(const AV1_COMMON *cm, const MACROBLOCKD *xd,
if
(
blk_row
>=
max_blocks_high
||
blk_col
>=
max_blocks_wide
)
return
;
if
(
depth
==
2
)
{
if
(
depth
==
MAX_VARTX_DEPTH
)
{
txfm_partition_update
(
xd
->
above_txfm_context
+
tx_col
,
xd
->
left_txfm_context
+
tx_row
,
tx_size
);
return
;
...
...
av1/encoder/rdopt.c
View file @
571189c6
...
...
@@ -3116,13 +3116,13 @@ static void select_tx_block(const AV1_COMP *cpi, MACROBLOCK *x, int blk_row,
*skip = 0;
}
if (tx_size > TX_4X4 && depth <
2
)
if (tx_size > TX_4X4 && depth <
MAX_VARTX_DEPTH
)
*rate += av1_cost_bit(cpi->common.fc->txfm_partition_prob[ctx], 0);
this_rd = RDCOST(x->rdmult, x->rddiv, *rate, *dist);
tmp_eob = p->eobs[block];
}
if (tx_size > TX_4X4 && depth <
2
) {
if (tx_size > TX_4X4 && depth <
MAX_VARTX_DEPTH
) {
BLOCK_SIZE bsize = txsize_to_bsize[tx_size];
int bsl = b_height_log2_lookup[bsize];
int sub_step = num_4x4_blocks_txsize_lookup[tx_size - 1];
...
...
Write
Preview
Markdown
is supported
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