Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
f67196b2
Commit
f67196b2
authored
Jun 06, 2016
by
Angie Chiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move #if out of TEST_P in vp10_fwd/inv_txfm2d_test.cc
Change-Id: I1d5b2408f27a1e277574c2238f1e49e884596309
parent
3713949b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
84 additions
and
79 deletions
+84
-79
test/vp10_fwd_txfm2d_test.cc
test/vp10_fwd_txfm2d_test.cc
+42
-40
test/vp10_inv_txfm2d_test.cc
test/vp10_inv_txfm2d_test.cc
+42
-39
No files found.
test/vp10_fwd_txfm2d_test.cc
View file @
f67196b2
...
...
@@ -132,48 +132,50 @@ class VP10FwdTxfm2d : public ::testing::TestWithParam<VP10FwdTxfm2dParam> {
TEST_P
(
VP10FwdTxfm2d
,
RunFwdAccuracyCheck
)
{
RunFwdAccuracyCheck
();
}
const
VP10FwdTxfm2dParam
vp10_fwd_txfm2d_param_c
[]
=
{
#if CONFIG_EXT_TX
VP10FwdTxfm2dParam
(
FLIPADST_DCT
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
DCT_FLIPADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
ADST_FLIPADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
FLIPADST_ADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
FLIPADST_DCT
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
DCT_FLIPADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
ADST_FLIPADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
FLIPADST_ADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
FLIPADST_DCT
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
DCT_FLIPADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
ADST_FLIPADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
FLIPADST_ADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
FLIPADST_DCT
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
DCT_FLIPADST
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
ADST_FLIPADST
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
FLIPADST_ADST
,
TX_32X32
,
70
,
7
),
#endif
VP10FwdTxfm2dParam
(
DCT_DCT
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
ADST_DCT
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
DCT_ADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
ADST_ADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
DCT_DCT
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
ADST_DCT
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
DCT_ADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
ADST_ADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
DCT_DCT
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
ADST_DCT
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
DCT_ADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
ADST_ADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
DCT_DCT
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
ADST_DCT
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
DCT_ADST
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
ADST_ADST
,
TX_32X32
,
70
,
7
)
};
INSTANTIATE_TEST_CASE_P
(
C
,
VP10FwdTxfm2d
,
::
testing
::
Values
(
#if CONFIG_EXT_TX
VP10FwdTxfm2dParam
(
FLIPADST_DCT
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
DCT_FLIPADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
ADST_FLIPADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
FLIPADST_ADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
FLIPADST_DCT
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
DCT_FLIPADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
ADST_FLIPADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
FLIPADST_ADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
FLIPADST_DCT
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
DCT_FLIPADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
ADST_FLIPADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
FLIPADST_ADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
FLIPADST_DCT
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
DCT_FLIPADST
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
ADST_FLIPADST
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
FLIPADST_ADST
,
TX_32X32
,
70
,
7
),
#endif
VP10FwdTxfm2dParam
(
DCT_DCT
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
ADST_DCT
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
DCT_ADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
ADST_ADST
,
TX_4X4
,
2
,
0.2
),
VP10FwdTxfm2dParam
(
DCT_DCT
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
ADST_DCT
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
DCT_ADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
ADST_ADST
,
TX_8X8
,
5
,
0.6
),
VP10FwdTxfm2dParam
(
DCT_DCT
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
ADST_DCT
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
DCT_ADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
ADST_ADST
,
TX_16X16
,
11
,
1.5
),
VP10FwdTxfm2dParam
(
DCT_DCT
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
ADST_DCT
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
DCT_ADST
,
TX_32X32
,
70
,
7
),
VP10FwdTxfm2dParam
(
ADST_ADST
,
TX_32X32
,
70
,
7
)));
#endif // CONFIG_VP9_HIGHBITDEPTH
::
testing
::
ValuesIn
(
vp10_fwd_txfm2d_param_c
));
#endif // CONFIG_VP9_HIGHBITDEPTH
}
// namespace
test/vp10_inv_txfm2d_test.cc
View file @
f67196b2
...
...
@@ -108,47 +108,50 @@ class VP10InvTxfm2d : public ::testing::TestWithParam<VP10InvTxfm2dParam> {
TEST_P
(
VP10InvTxfm2d
,
RunRoundtripCheck
)
{
RunRoundtripCheck
();
}
INSTANTIATE_TEST_CASE_P
(
C
,
VP10InvTxfm2d
,
::
testing
::
Values
(
const
VP10InvTxfm2dParam
vp10_inv_txfm2d_param
[]
=
{
#if CONFIG_EXT_TX
VP10InvTxfm2dParam
(
FLIPADST_DCT
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
DCT_FLIPADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
ADST_FLIPADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
FLIPADST_ADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
FLIPADST_DCT
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
DCT_FLIPADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
ADST_FLIPADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
FLIPADST_ADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
FLIPADST_DCT
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
DCT_FLIPADST
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_16X16
,
11
,
0.04
),
VP10InvTxfm2dParam
(
ADST_FLIPADST
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
FLIPADST_ADST
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
FLIPADST_DCT
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
DCT_FLIPADST
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
ADST_FLIPADST
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
FLIPADST_ADST
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
FLIPADST_DCT
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
DCT_FLIPADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
ADST_FLIPADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
FLIPADST_ADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
FLIPADST_DCT
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
DCT_FLIPADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
ADST_FLIPADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
FLIPADST_ADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
FLIPADST_DCT
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
DCT_FLIPADST
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_16X16
,
11
,
0.04
),
VP10InvTxfm2dParam
(
ADST_FLIPADST
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
FLIPADST_ADST
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
FLIPADST_DCT
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
DCT_FLIPADST
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
FLIPADST_FLIPADST
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
ADST_FLIPADST
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
FLIPADST_ADST
,
TX_32X32
,
4
,
0.4
),
#endif
VP10InvTxfm2dParam
(
DCT_DCT
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
ADST_DCT
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
DCT_ADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
ADST_ADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
DCT_DCT
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
ADST_DCT
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
DCT_ADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
ADST_ADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
DCT_DCT
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
ADST_DCT
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
DCT_ADST
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
ADST_ADST
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
DCT_DCT
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
ADST_DCT
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
DCT_ADST
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
ADST_ADST
,
TX_32X32
,
4
,
0.4
)));
VP10InvTxfm2dParam
(
DCT_DCT
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
ADST_DCT
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
DCT_ADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
ADST_ADST
,
TX_4X4
,
2
,
0.002
),
VP10InvTxfm2dParam
(
DCT_DCT
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
ADST_DCT
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
DCT_ADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
ADST_ADST
,
TX_8X8
,
2
,
0.02
),
VP10InvTxfm2dParam
(
DCT_DCT
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
ADST_DCT
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
DCT_ADST
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
ADST_ADST
,
TX_16X16
,
2
,
0.04
),
VP10InvTxfm2dParam
(
DCT_DCT
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
ADST_DCT
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
DCT_ADST
,
TX_32X32
,
4
,
0.4
),
VP10InvTxfm2dParam
(
ADST_ADST
,
TX_32X32
,
4
,
0.4
)
};
INSTANTIATE_TEST_CASE_P
(
C
,
VP10InvTxfm2d
,
::
testing
::
ValuesIn
(
vp10_inv_txfm2d_param
));
#endif // CONFIG_VP9_HIGHBITDEPTH
...
...
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