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
032ab8b3
Commit
032ab8b3
authored
Sep 19, 2017
by
Hui Su
Browse files
Move local functions out of blockd.h
Change-Id: Id667950de84ad6a0b55222264a0ce8473cd10bcc
parent
de5bdcad
Changes
3
Hide whitespace changes
Inline
Side-by-side
av1/common/blockd.h
View file @
032ab8b3
...
...
@@ -961,51 +961,6 @@ static const int av1_ext_tx_set_idx_to_type[2][AOMMAX(EXT_TX_SETS_INTRA,
}
};
static
const
int
use_intra_ext_tx_for_txsize
[
EXT_TX_SETS_INTRA
][
EXT_TX_SIZES
]
=
{
#if CONFIG_CHROMA_2X2
{
1
,
1
,
1
,
1
,
1
},
// unused
{
0
,
1
,
1
,
0
,
0
},
{
0
,
0
,
0
,
1
,
0
},
#if CONFIG_MRC_TX
{
0
,
0
,
0
,
0
,
1
},
#endif // CONFIG_MRC_TX
#else // CONFIG_CHROMA_2X2
{
1
,
1
,
1
,
1
},
// unused
{
1
,
1
,
0
,
0
},
{
0
,
0
,
1
,
0
},
#if CONFIG_MRC_TX
{
0
,
0
,
0
,
1
},
#endif // CONFIG_MRC_TX
#endif // CONFIG_CHROMA_2X2
};
static
const
int
use_inter_ext_tx_for_txsize
[
EXT_TX_SETS_INTER
][
EXT_TX_SIZES
]
=
{
#if CONFIG_CHROMA_2X2
{
1
,
1
,
1
,
1
,
1
},
// unused
{
0
,
1
,
1
,
0
,
0
},
{
0
,
0
,
0
,
1
,
0
},
{
0
,
0
,
0
,
0
,
1
},
#if CONFIG_MRC_TX
{
0
,
0
,
0
,
0
,
1
},
#endif // CONFIG_MRC_TX
#else // CONFIG_CHROMA_2X2
{
1
,
1
,
1
,
1
},
// unused
{
1
,
1
,
0
,
0
},
{
0
,
0
,
1
,
0
},
{
0
,
0
,
0
,
1
},
#if CONFIG_MRC_TX
{
0
,
0
,
0
,
1
},
#endif // CONFIG_MRC_TX
#endif // CONFIG_CHROMA_2X2
};
// 1D Transforms used in inter set, this needs to be changed if
// ext_tx_used_inter is changed
static
const
int
ext_tx_used_inter_1D
[
EXT_TX_SETS_INTER
][
TX_TYPES_1D
]
=
{
{
1
,
0
,
0
,
0
},
{
1
,
1
,
1
,
1
},
{
1
,
1
,
1
,
1
},
{
1
,
0
,
0
,
1
},
#if CONFIG_MRC_TX
{
1
,
0
,
0
,
1
},
#endif // CONFIG_MRC_TX
};
#if CONFIG_MRC_TX
static
const
int
av1_ext_tx_used
[
EXT_TX_SET_TYPES
][
TX_TYPES
]
=
{
{
...
...
av1/encoder/rd.c
View file @
032ab8b3
...
...
@@ -64,6 +64,44 @@ static const uint8_t rd_thresh_block_size_factor[BLOCK_SIZES_ALL] = {
4
,
4
,
8
,
8
,
16
,
16
};
#if CONFIG_EXT_TX
static
const
int
use_intra_ext_tx_for_txsize
[
EXT_TX_SETS_INTRA
][
EXT_TX_SIZES
]
=
{
#if CONFIG_CHROMA_2X2
{
1
,
1
,
1
,
1
,
1
},
// unused
{
0
,
1
,
1
,
0
,
0
},
{
0
,
0
,
0
,
1
,
0
},
#if CONFIG_MRC_TX
{
0
,
0
,
0
,
0
,
1
},
#endif // CONFIG_MRC_TX
#else // CONFIG_CHROMA_2X2
{
1
,
1
,
1
,
1
},
// unused
{
1
,
1
,
0
,
0
},
{
0
,
0
,
1
,
0
},
#if CONFIG_MRC_TX
{
0
,
0
,
0
,
1
},
#endif // CONFIG_MRC_TX
#endif // CONFIG_CHROMA_2X2
};
static
const
int
use_inter_ext_tx_for_txsize
[
EXT_TX_SETS_INTER
][
EXT_TX_SIZES
]
=
{
#if CONFIG_CHROMA_2X2
{
1
,
1
,
1
,
1
,
1
},
// unused
{
0
,
1
,
1
,
0
,
0
},
{
0
,
0
,
0
,
1
,
0
},
{
0
,
0
,
0
,
0
,
1
},
#if CONFIG_MRC_TX
{
0
,
0
,
0
,
0
,
1
},
#endif // CONFIG_MRC_TX
#else // CONFIG_CHROMA_2X2
{
1
,
1
,
1
,
1
},
// unused
{
1
,
1
,
0
,
0
},
{
0
,
0
,
1
,
0
},
{
0
,
0
,
0
,
1
},
#if CONFIG_MRC_TX
{
0
,
0
,
0
,
1
},
#endif // CONFIG_MRC_TX
#endif // CONFIG_CHROMA_2X2
};
#endif // CONFIG_EXT_TX
void
av1_fill_mode_rates
(
AV1_COMMON
*
const
cm
,
MACROBLOCK
*
x
,
FRAME_CONTEXT
*
fc
)
{
int
i
,
j
;
...
...
av1/encoder/rdopt.c
View file @
032ab8b3
...
...
@@ -1257,6 +1257,17 @@ static int prune_one_for_sby(const AV1_COMP *cpi, BLOCK_SIZE bsize,
pd->dst.stride);
}
#if CONFIG_EXT_TX
// 1D Transforms used in inter set, this needs to be changed if
// ext_tx_used_inter is changed
static const int ext_tx_used_inter_1D[EXT_TX_SETS_INTER][TX_TYPES_1D] = {
{ 1, 0, 0, 0 }, { 1, 1, 1, 1 }, { 1, 1, 1, 1 }, { 1, 0, 0, 1 },
#if CONFIG_MRC_TX
{ 1, 0, 0, 1 },
#endif // CONFIG_MRC_TX
};
#endif // CONFIG_EXT_TX
static int prune_tx_types(const AV1_COMP *cpi, BLOCK_SIZE bsize, MACROBLOCK *x,
const MACROBLOCKD *const xd, int tx_set) {
#if CONFIG_EXT_TX
...
...
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