Skip to content
GitLab
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
3174e5fd
Commit
3174e5fd
authored
Dec 28, 2016
by
Jingning Han
Browse files
Change the transform operator table to support 2x2 transform
Change-Id: I6ccb0c884545049a7d428f8654df54c20f563392
parent
9e0976a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/common/av1_fwd_txfm2d.c
View file @
3174e5fd
...
...
@@ -119,24 +119,60 @@ void av1_fwd_txfm2d_64x64_c(const int16_t *input, int32_t *output, int stride,
#if CONFIG_EXT_TX
static
const
TXFM_2D_CFG
*
fwd_txfm_cfg_ls
[
FLIPADST_ADST
+
1
][
TX_SIZES
]
=
{
{
&
fwd_txfm_2d_cfg_dct_dct_4
,
&
fwd_txfm_2d_cfg_dct_dct_8
,
&
fwd_txfm_2d_cfg_dct_dct_16
,
&
fwd_txfm_2d_cfg_dct_dct_32
},
{
&
fwd_txfm_2d_cfg_adst_dct_4
,
&
fwd_txfm_2d_cfg_adst_dct_8
,
&
fwd_txfm_2d_cfg_adst_dct_16
,
&
fwd_txfm_2d_cfg_adst_dct_32
},
{
&
fwd_txfm_2d_cfg_dct_adst_4
,
&
fwd_txfm_2d_cfg_dct_adst_8
,
&
fwd_txfm_2d_cfg_dct_adst_16
,
&
fwd_txfm_2d_cfg_dct_adst_32
},
{
&
fwd_txfm_2d_cfg_adst_adst_4
,
&
fwd_txfm_2d_cfg_adst_adst_8
,
&
fwd_txfm_2d_cfg_adst_adst_16
,
&
fwd_txfm_2d_cfg_adst_adst_32
},
{
&
fwd_txfm_2d_cfg_adst_dct_4
,
&
fwd_txfm_2d_cfg_adst_dct_8
,
&
fwd_txfm_2d_cfg_adst_dct_16
,
&
fwd_txfm_2d_cfg_adst_dct_32
},
{
&
fwd_txfm_2d_cfg_dct_adst_4
,
&
fwd_txfm_2d_cfg_dct_adst_8
,
&
fwd_txfm_2d_cfg_dct_adst_16
,
&
fwd_txfm_2d_cfg_dct_adst_32
},
{
&
fwd_txfm_2d_cfg_adst_adst_4
,
&
fwd_txfm_2d_cfg_adst_adst_8
,
&
fwd_txfm_2d_cfg_adst_adst_16
,
&
fwd_txfm_2d_cfg_adst_adst_32
},
{
&
fwd_txfm_2d_cfg_adst_adst_4
,
&
fwd_txfm_2d_cfg_adst_adst_8
,
&
fwd_txfm_2d_cfg_adst_adst_16
,
&
fwd_txfm_2d_cfg_adst_adst_32
},
{
&
fwd_txfm_2d_cfg_adst_adst_4
,
&
fwd_txfm_2d_cfg_adst_adst_8
,
&
fwd_txfm_2d_cfg_adst_adst_16
,
&
fwd_txfm_2d_cfg_adst_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
fwd_txfm_2d_cfg_dct_dct_4
,
&
fwd_txfm_2d_cfg_dct_dct_8
,
&
fwd_txfm_2d_cfg_dct_dct_16
,
&
fwd_txfm_2d_cfg_dct_dct_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
fwd_txfm_2d_cfg_adst_dct_4
,
&
fwd_txfm_2d_cfg_adst_dct_8
,
&
fwd_txfm_2d_cfg_adst_dct_16
,
&
fwd_txfm_2d_cfg_adst_dct_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
fwd_txfm_2d_cfg_dct_adst_4
,
&
fwd_txfm_2d_cfg_dct_adst_8
,
&
fwd_txfm_2d_cfg_dct_adst_16
,
&
fwd_txfm_2d_cfg_dct_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
fwd_txfm_2d_cfg_adst_adst_4
,
&
fwd_txfm_2d_cfg_adst_adst_8
,
&
fwd_txfm_2d_cfg_adst_adst_16
,
&
fwd_txfm_2d_cfg_adst_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
fwd_txfm_2d_cfg_adst_dct_4
,
&
fwd_txfm_2d_cfg_adst_dct_8
,
&
fwd_txfm_2d_cfg_adst_dct_16
,
&
fwd_txfm_2d_cfg_adst_dct_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
fwd_txfm_2d_cfg_dct_adst_4
,
&
fwd_txfm_2d_cfg_dct_adst_8
,
&
fwd_txfm_2d_cfg_dct_adst_16
,
&
fwd_txfm_2d_cfg_dct_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
fwd_txfm_2d_cfg_adst_adst_4
,
&
fwd_txfm_2d_cfg_adst_adst_8
,
&
fwd_txfm_2d_cfg_adst_adst_16
,
&
fwd_txfm_2d_cfg_adst_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
fwd_txfm_2d_cfg_adst_adst_4
,
&
fwd_txfm_2d_cfg_adst_adst_8
,
&
fwd_txfm_2d_cfg_adst_adst_16
,
&
fwd_txfm_2d_cfg_adst_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
fwd_txfm_2d_cfg_adst_adst_4
,
&
fwd_txfm_2d_cfg_adst_adst_8
,
&
fwd_txfm_2d_cfg_adst_adst_16
,
&
fwd_txfm_2d_cfg_adst_adst_32
},
};
#else // CONFIG_EXT_TX
static
const
TXFM_2D_CFG
*
fwd_txfm_cfg_ls
[
TX_TYPES
][
TX_SIZES
]
=
{
...
...
av1/common/av1_inv_txfm2d.c
View file @
3174e5fd
...
...
@@ -31,24 +31,60 @@ static INLINE TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) {
#if CONFIG_EXT_TX
static
const
TXFM_2D_CFG
*
inv_txfm_cfg_ls
[
FLIPADST_ADST
+
1
][
TX_SIZES
]
=
{
{
&
inv_txfm_2d_cfg_dct_dct_4
,
&
inv_txfm_2d_cfg_dct_dct_8
,
&
inv_txfm_2d_cfg_dct_dct_16
,
&
inv_txfm_2d_cfg_dct_dct_32
},
{
&
inv_txfm_2d_cfg_adst_dct_4
,
&
inv_txfm_2d_cfg_adst_dct_8
,
&
inv_txfm_2d_cfg_adst_dct_16
,
&
inv_txfm_2d_cfg_adst_dct_32
},
{
&
inv_txfm_2d_cfg_dct_adst_4
,
&
inv_txfm_2d_cfg_dct_adst_8
,
&
inv_txfm_2d_cfg_dct_adst_16
,
&
inv_txfm_2d_cfg_dct_adst_32
},
{
&
inv_txfm_2d_cfg_adst_adst_4
,
&
inv_txfm_2d_cfg_adst_adst_8
,
&
inv_txfm_2d_cfg_adst_adst_16
,
&
inv_txfm_2d_cfg_adst_adst_32
},
{
&
inv_txfm_2d_cfg_adst_dct_4
,
&
inv_txfm_2d_cfg_adst_dct_8
,
&
inv_txfm_2d_cfg_adst_dct_16
,
&
inv_txfm_2d_cfg_adst_dct_32
},
{
&
inv_txfm_2d_cfg_dct_adst_4
,
&
inv_txfm_2d_cfg_dct_adst_8
,
&
inv_txfm_2d_cfg_dct_adst_16
,
&
inv_txfm_2d_cfg_dct_adst_32
},
{
&
inv_txfm_2d_cfg_adst_adst_4
,
&
inv_txfm_2d_cfg_adst_adst_8
,
&
inv_txfm_2d_cfg_adst_adst_16
,
&
inv_txfm_2d_cfg_adst_adst_32
},
{
&
inv_txfm_2d_cfg_adst_adst_4
,
&
inv_txfm_2d_cfg_adst_adst_8
,
&
inv_txfm_2d_cfg_adst_adst_16
,
&
inv_txfm_2d_cfg_adst_adst_32
},
{
&
inv_txfm_2d_cfg_adst_adst_4
,
&
inv_txfm_2d_cfg_adst_adst_8
,
&
inv_txfm_2d_cfg_adst_adst_16
,
&
inv_txfm_2d_cfg_adst_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
inv_txfm_2d_cfg_dct_dct_4
,
&
inv_txfm_2d_cfg_dct_dct_8
,
&
inv_txfm_2d_cfg_dct_dct_16
,
&
inv_txfm_2d_cfg_dct_dct_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
inv_txfm_2d_cfg_adst_dct_4
,
&
inv_txfm_2d_cfg_adst_dct_8
,
&
inv_txfm_2d_cfg_adst_dct_16
,
&
inv_txfm_2d_cfg_adst_dct_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
inv_txfm_2d_cfg_dct_adst_4
,
&
inv_txfm_2d_cfg_dct_adst_8
,
&
inv_txfm_2d_cfg_dct_adst_16
,
&
inv_txfm_2d_cfg_dct_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
inv_txfm_2d_cfg_adst_adst_4
,
&
inv_txfm_2d_cfg_adst_adst_8
,
&
inv_txfm_2d_cfg_adst_adst_16
,
&
inv_txfm_2d_cfg_adst_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
inv_txfm_2d_cfg_adst_dct_4
,
&
inv_txfm_2d_cfg_adst_dct_8
,
&
inv_txfm_2d_cfg_adst_dct_16
,
&
inv_txfm_2d_cfg_adst_dct_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
inv_txfm_2d_cfg_dct_adst_4
,
&
inv_txfm_2d_cfg_dct_adst_8
,
&
inv_txfm_2d_cfg_dct_adst_16
,
&
inv_txfm_2d_cfg_dct_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
inv_txfm_2d_cfg_adst_adst_4
,
&
inv_txfm_2d_cfg_adst_adst_8
,
&
inv_txfm_2d_cfg_adst_adst_16
,
&
inv_txfm_2d_cfg_adst_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
inv_txfm_2d_cfg_adst_adst_4
,
&
inv_txfm_2d_cfg_adst_adst_8
,
&
inv_txfm_2d_cfg_adst_adst_16
,
&
inv_txfm_2d_cfg_adst_adst_32
},
{
#if CONFIG_CB4X4
NULL
,
#endif
&
inv_txfm_2d_cfg_adst_adst_4
,
&
inv_txfm_2d_cfg_adst_adst_8
,
&
inv_txfm_2d_cfg_adst_adst_16
,
&
inv_txfm_2d_cfg_adst_adst_32
},
};
#else
static
const
TXFM_2D_CFG
*
inv_txfm_cfg_ls
[
TX_TYPES
][
TX_SIZES
]
=
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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