Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
b72ab8fe
Commit
b72ab8fe
authored
May 08, 2017
by
Fred BARBIER
Committed by
Frédéric BARBIER
May 08, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deduplicate (inv/fwd)_txfm_cfg_ls arrays
Change-Id: Ibd7091d444cfb3095ddb938100704d3b75cf1af4
parent
ed057990
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
60 deletions
+6
-60
av1/common/av1_fwd_txfm2d.c
av1/common/av1_fwd_txfm2d.c
+3
-30
av1/common/av1_inv_txfm2d.c
av1/common/av1_inv_txfm2d.c
+3
-30
No files found.
av1/common/av1_fwd_txfm2d.c
View file @
b72ab8fe
...
...
@@ -117,8 +117,7 @@ void av1_fwd_txfm2d_64x64_c(const int16_t *input, int32_t *output, int stride,
fwd_txfm2d_c
(
input
,
output
,
stride
,
&
cfg
,
txfm_buf
);
}
#if CONFIG_EXT_TX
static
const
TXFM_2D_CFG
*
fwd_txfm_cfg_ls
[
FLIPADST_ADST
+
1
][
TX_SIZES
]
=
{
static
const
TXFM_2D_CFG
*
fwd_txfm_cfg_ls
[
TX_TYPES
][
TX_SIZES
]
=
{
{
#if CONFIG_CB4X4
NULL
,
...
...
@@ -143,6 +142,7 @@ static const TXFM_2D_CFG *fwd_txfm_cfg_ls[FLIPADST_ADST + 1][TX_SIZES] = {
#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_EXT_TX
{
#if CONFIG_CB4X4
NULL
,
...
...
@@ -173,35 +173,8 @@ static const TXFM_2D_CFG *fwd_txfm_cfg_ls[FLIPADST_ADST + 1][TX_SIZES] = {
#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
]
=
{
{
#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
},
};
#endif // CONFIG_EXT_TX
};
TXFM_2D_FLIP_CFG
av1_get_fwd_txfm_cfg
(
int
tx_type
,
int
tx_size
)
{
TXFM_2D_FLIP_CFG
cfg
;
...
...
av1/common/av1_inv_txfm2d.c
View file @
b72ab8fe
...
...
@@ -29,8 +29,7 @@ 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
]
=
{
static
const
TXFM_2D_CFG
*
inv_txfm_cfg_ls
[
TX_TYPES
][
TX_SIZES
]
=
{
{
#if CONFIG_CB4X4
NULL
,
...
...
@@ -55,6 +54,7 @@ static const TXFM_2D_CFG *inv_txfm_cfg_ls[FLIPADST_ADST + 1][TX_SIZES] = {
#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_EXT_TX
{
#if CONFIG_CB4X4
NULL
,
...
...
@@ -85,35 +85,8 @@ static const TXFM_2D_CFG *inv_txfm_cfg_ls[FLIPADST_ADST + 1][TX_SIZES] = {
#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
},
#endif // CONFIG_EXT_TX
};
#else
static
const
TXFM_2D_CFG
*
inv_txfm_cfg_ls
[
TX_TYPES
][
TX_SIZES
]
=
{
{
#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
},
};
#endif
TXFM_2D_FLIP_CFG
av1_get_inv_txfm_cfg
(
int
tx_type
,
int
tx_size
)
{
TXFM_2D_FLIP_CFG
cfg
;
...
...
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