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
Guillaume Martres
aom-rav1e
Commits
4017fca3
Commit
4017fca3
authored
Feb 13, 2016
by
Thomas
Committed by
Yaowu Xu
Feb 25, 2016
Browse files
Modify tests to allow quantization matrices.
Change-Id: If740ec7e549d8bcd387f92c43fd8105c528e86ed
parent
1c122c24
Changes
3
Hide whitespace changes
Inline
Side-by-side
test/cpu_speed_test.cc
View file @
4017fca3
...
...
@@ -17,6 +17,9 @@
namespace
{
const
int
kMaxPSNR
=
100
;
#if CONFIG_AOM_QM
const
int
kMaxPSNR_QM
=
35
;
#endif
class
CpuSpeedTest
:
public
::
libvpx_test
::
EncoderTest
,
...
...
@@ -80,7 +83,11 @@ TEST_P(CpuSpeedTest, TestQ0) {
init_flags_
=
VPX_CODEC_USE_PSNR
;
ASSERT_NO_FATAL_FAILURE
(
RunLoop
(
&
video
));
#if CONFIG_AOM_QM
EXPECT_GE
(
min_psnr_
,
kMaxPSNR_QM
);
#else
EXPECT_GE
(
min_psnr_
,
kMaxPSNR
);
#endif
}
TEST_P
(
CpuSpeedTest
,
TestScreencastQ0
)
{
...
...
@@ -95,7 +102,11 @@ TEST_P(CpuSpeedTest, TestScreencastQ0) {
init_flags_
=
VPX_CODEC_USE_PSNR
;
ASSERT_NO_FATAL_FAILURE
(
RunLoop
(
&
video
));
#if CONFIG_AOM_QM
EXPECT_GE
(
min_psnr_
,
kMaxPSNR_QM
);
#else
EXPECT_GE
(
min_psnr_
,
kMaxPSNR
);
#endif
}
TEST_P
(
CpuSpeedTest
,
TestEncodeHighBitrate
)
{
...
...
test/end_to_end_test.cc
View file @
4017fca3
...
...
@@ -132,7 +132,11 @@ class EndToEndTestLarge
}
double
GetPsnrThreshold
()
{
#if CONFIG_AOM_QM
return
kPsnrThreshold
[
cpu_used_
][
encoding_mode_
]
-
3.0
;
#else
return
kPsnrThreshold
[
cpu_used_
][
encoding_mode_
];
#endif
}
TestVideoParam
test_video_param_
;
...
...
test/quantize_test.cc
View file @
4017fca3
...
...
@@ -28,6 +28,7 @@
using
libvpx_test
::
ACMRandom
;
namespace
{
#if !CONFIG_AOM_QM
#if CONFIG_VPX_HIGHBITDEPTH
const
int
number_of_iterations
=
100
;
...
...
@@ -341,4 +342,5 @@ INSTANTIATE_TEST_CASE_P(
&
vpx_highbd_quantize_b_32x32_c
,
VPX_BITS_12
)));
#endif // HAVE_SSE2
#endif // CONFIG_VPX_HIGHBITDEPTH
#endif // CONFIG_AOM_QM
}
// namespace
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