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
79fcc567
Commit
79fcc567
authored
Jul 01, 2015
by
Johann
Committed by
Gerrit Code Review
Jul 01, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Fix --disable-use-x86inc when used with --enable-vp9-highbitdepth"
parents
8d538917
1c967f17
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
test/vp9_intrapred_test.cc
test/vp9_intrapred_test.cc
+6
-3
vp9/common/vp9_rtcd_defs.pl
vp9/common/vp9_rtcd_defs.pl
+3
-3
No files found.
test/vp9_intrapred_test.cc
View file @
79fcc567
...
...
@@ -131,6 +131,7 @@ using std::tr1::make_tuple;
#if HAVE_SSE2
#if CONFIG_VP9_HIGHBITDEPTH
#if CONFIG_USE_X86INC
#if ARCH_X86_64
INSTANTIATE_TEST_CASE_P
(
SSE2_TO_C_8
,
VP9IntraPredTest
,
::
testing
::
Values
(
...
...
@@ -179,7 +180,8 @@ INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest,
&
vp9_highbd_tm_predictor_4x4_c
,
4
,
8
),
make_tuple
(
&
vp9_highbd_tm_predictor_8x8_sse2
,
&
vp9_highbd_tm_predictor_8x8_c
,
8
,
8
)));
#endif
#endif // !ARCH_X86_64
#if ARCH_X86_64
INSTANTIATE_TEST_CASE_P
(
SSE2_TO_C_10
,
VP9IntraPredTest
,
::
testing
::
Values
(
...
...
@@ -235,7 +237,7 @@ INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest,
&
vp9_highbd_tm_predictor_4x4_c
,
4
,
10
),
make_tuple
(
&
vp9_highbd_tm_predictor_8x8_sse2
,
&
vp9_highbd_tm_predictor_8x8_c
,
8
,
10
)));
#endif
#endif
// !ARCH_X86_64
#if ARCH_X86_64
INSTANTIATE_TEST_CASE_P
(
SSE2_TO_C_12
,
VP9IntraPredTest
,
...
...
@@ -292,7 +294,8 @@ INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest,
&
vp9_highbd_tm_predictor_4x4_c
,
4
,
12
),
make_tuple
(
&
vp9_highbd_tm_predictor_8x8_sse2
,
&
vp9_highbd_tm_predictor_8x8_c
,
8
,
12
)));
#endif
#endif // !ARCH_X86_64
#endif // CONFIG_USE_X86INC
#endif // CONFIG_VP9_HIGHBITDEPTH
#endif // HAVE_SSE2
}
// namespace
vp9/common/vp9_rtcd_defs.pl
View file @
79fcc567
...
...
@@ -587,7 +587,7 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") {
specialize
qw/vp9_highbd_v_predictor_16x16/
,
"
$sse2_x86inc
";
add_proto
qw/void vp9_highbd_tm_predictor_16x16/
,
"
uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd
";
specialize
qw/vp9_highbd_tm_predictor_16x16/
,
"
$sse2_x86_64
";
specialize
qw/vp9_highbd_tm_predictor_16x16/
,
"
$sse2_x86_64
_x86inc
";
add_proto
qw/void vp9_highbd_dc_predictor_16x16/
,
"
uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd
";
specialize
qw/vp9_highbd_dc_predictor_16x16/
,
"
$sse2_x86inc
";
...
...
@@ -626,10 +626,10 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") {
specialize
qw/vp9_highbd_v_predictor_32x32/
,
"
$sse2_x86inc
";
add_proto
qw/void vp9_highbd_tm_predictor_32x32/
,
"
uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd
";
specialize
qw/vp9_highbd_tm_predictor_32x32/
,
"
$sse2_x86_64
";
specialize
qw/vp9_highbd_tm_predictor_32x32/
,
"
$sse2_x86_64
_x86inc
";
add_proto
qw/void vp9_highbd_dc_predictor_32x32/
,
"
uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd
";
specialize
qw/vp9_highbd_dc_predictor_32x32/
,
"
$sse2_x86_64
";
specialize
qw/vp9_highbd_dc_predictor_32x32/
,
"
$sse2_x86_64
_x86inc
";
add_proto
qw/void vp9_highbd_dc_top_predictor_32x32/
,
"
uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd
";
specialize
qw/vp9_highbd_dc_top_predictor_32x32/
;
...
...
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