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
Xiph.Org
aom-rav1e
Commits
dea22b4b
Commit
dea22b4b
authored
Oct 23, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Oct 23, 2013
Browse files
Merge "Renaming vp9_short_fdct32x32 to vp9_fdct32x32."
parents
ae0e747d
a018988c
Changes
5
Hide whitespace changes
Inline
Side-by-side
test/dct32x32_test.cc
View file @
dea22b4b
...
...
@@ -150,7 +150,7 @@ TEST_P(Trans32x32Test, CoeffCheck) {
input_block
[
j
]
=
rnd
.
Rand8
()
-
rnd
.
Rand8
();
const
int
stride
=
32
;
vp9_
short_
fdct32x32_c
(
input_block
,
output_ref_block
,
stride
);
vp9_fdct32x32_c
(
input_block
,
output_ref_block
,
stride
);
REGISTER_STATE_CHECK
(
fwd_txfm_
(
input_block
,
output_block
,
stride
));
if
(
version_
==
0
)
{
...
...
@@ -188,7 +188,7 @@ TEST_P(Trans32x32Test, MemCheck) {
input_extreme_block
[
j
]
=
-
255
;
const
int
stride
=
32
;
vp9_
short_
fdct32x32_c
(
input_extreme_block
,
output_ref_block
,
stride
);
vp9_fdct32x32_c
(
input_extreme_block
,
output_ref_block
,
stride
);
REGISTER_STATE_CHECK
(
fwd_txfm_
(
input_extreme_block
,
output_block
,
stride
));
// The minimum quant value is 4.
...
...
@@ -246,16 +246,16 @@ using std::tr1::make_tuple;
INSTANTIATE_TEST_CASE_P
(
C
,
Trans32x32Test
,
::
testing
::
Values
(
make_tuple
(
&
vp9_
short_
fdct32x32_c
,
&
vp9_idct32x32_1024_add_c
,
0
),
make_tuple
(
&
vp9_
short_
fdct32x32_rd_c
,
&
vp9_idct32x32_1024_add_c
,
1
)));
make_tuple
(
&
vp9_fdct32x32_c
,
&
vp9_idct32x32_1024_add_c
,
0
),
make_tuple
(
&
vp9_fdct32x32_rd_c
,
&
vp9_idct32x32_1024_add_c
,
1
)));
#if HAVE_SSE2
INSTANTIATE_TEST_CASE_P
(
SSE2
,
Trans32x32Test
,
::
testing
::
Values
(
make_tuple
(
&
vp9_
short_
fdct32x32_sse2
,
make_tuple
(
&
vp9_fdct32x32_sse2
,
&
vp9_idct32x32_1024_add_sse2
,
0
),
make_tuple
(
&
vp9_
short_
fdct32x32_rd_sse2
,
make_tuple
(
&
vp9_fdct32x32_rd_sse2
,
&
vp9_idct32x32_1024_add_sse2
,
1
)));
#endif
}
// namespace
vp9/common/vp9_rtcd_defs.sh
View file @
dea22b4b
...
...
@@ -701,11 +701,11 @@ specialize vp9_fdct8x8 sse2
prototype void vp9_short_fdct4x4
"int16_t *InputData, int16_t *OutputData, int stride"
specialize vp9_short_fdct4x4 sse2
prototype void vp9_
short_
fdct32x32
"int16_t *
I
nput
Data
, int16_t *
O
utput
Data
, int stride"
specialize vp9_
short_
fdct32x32 sse2
prototype void vp9_fdct32x32
"int16_t *
i
nput, int16_t *
o
utput, int stride"
specialize vp9_fdct32x32 sse2
prototype void vp9_
short_
fdct32x32_rd
"int16_t *
I
nput
Data
, int16_t *
O
utput
Data
, int stride"
specialize vp9_
short_
fdct32x32_rd sse2
prototype void vp9_fdct32x32_rd
"int16_t *
i
nput, int16_t *
o
utput, int stride"
specialize vp9_fdct32x32_rd sse2
prototype void vp9_fdct16x16
"int16_t *input, int16_t *output, int stride"
specialize vp9_fdct16x16 sse2
...
...
vp9/encoder/vp9_dct.c
View file @
dea22b4b
...
...
@@ -1311,7 +1311,7 @@ static void dct32_1d(const int *input, int *output, int round) {
output
[
31
]
=
dct_32_round
(
step
[
31
]
*
cospi_31_64
+
step
[
16
]
*
-
cospi_1_64
);
}
void
vp9_
short_
fdct32x32_c
(
int16_t
*
input
,
int16_t
*
out
,
int
stride
)
{
void
vp9_fdct32x32_c
(
int16_t
*
input
,
int16_t
*
out
,
int
stride
)
{
int
i
,
j
;
int
output
[
32
*
32
];
...
...
@@ -1339,7 +1339,7 @@ void vp9_short_fdct32x32_c(int16_t *input, int16_t *out, int stride) {
// Note that although we use dct_32_round in dct32_1d computation flow,
// this 2d fdct32x32 for rate-distortion optimization loop is operating
// within 16 bits precision.
void
vp9_
short_
fdct32x32_rd_c
(
int16_t
*
input
,
int16_t
*
out
,
int
stride
)
{
void
vp9_fdct32x32_rd_c
(
int16_t
*
input
,
int16_t
*
out
,
int
stride
)
{
int
i
,
j
;
int
output
[
32
*
32
];
...
...
vp9/encoder/vp9_encodemb.c
View file @
dea22b4b
...
...
@@ -365,9 +365,9 @@ void vp9_xform_quant(int plane, int block, BLOCK_SIZE plane_bsize,
yoff
=
32
*
(
block
>>
twl
);
src_diff
=
p
->
src_diff
+
4
*
bw
*
yoff
+
xoff
;
if
(
x
->
use_lp32x32fdct
)
vp9_
short_
fdct32x32_rd
(
src_diff
,
coeff
,
bw
*
4
);
vp9_fdct32x32_rd
(
src_diff
,
coeff
,
bw
*
4
);
else
vp9_
short_
fdct32x32
(
src_diff
,
coeff
,
bw
*
4
);
vp9_fdct32x32
(
src_diff
,
coeff
,
bw
*
4
);
vp9_quantize_b_32x32
(
coeff
,
1024
,
x
->
skip_block
,
p
->
zbin
,
p
->
round
,
p
->
quant
,
p
->
quant_shift
,
qcoeff
,
dqcoeff
,
pd
->
dequant
,
p
->
zbin_extra
,
eob
,
scan
,
iscan
);
...
...
@@ -532,9 +532,9 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
vp9_subtract_block
(
32
,
32
,
src_diff
,
bw
*
4
,
src
,
p
->
src
.
stride
,
dst
,
pd
->
dst
.
stride
);
if
(
x
->
use_lp32x32fdct
)
vp9_
short_
fdct32x32_rd
(
src_diff
,
coeff
,
bw
*
4
);
vp9_fdct32x32_rd
(
src_diff
,
coeff
,
bw
*
4
);
else
vp9_
short_
fdct32x32
(
src_diff
,
coeff
,
bw
*
4
);
vp9_fdct32x32
(
src_diff
,
coeff
,
bw
*
4
);
vp9_quantize_b_32x32
(
coeff
,
1024
,
x
->
skip_block
,
p
->
zbin
,
p
->
round
,
p
->
quant
,
p
->
quant_shift
,
qcoeff
,
dqcoeff
,
pd
->
dequant
,
p
->
zbin_extra
,
eob
,
scan
,
iscan
);
...
...
vp9/encoder/x86/vp9_dct_sse2.c
View file @
dea22b4b
...
...
@@ -2563,13 +2563,13 @@ void vp9_short_fht16x16_sse2(int16_t *input, int16_t *output,
write_buffer_16x16
(
output
,
in0
,
in1
,
16
);
}
#define FDCT32x32_2D vp9_
short_
fdct32x32_rd_sse2
#define FDCT32x32_2D vp9_fdct32x32_rd_sse2
#define FDCT32x32_HIGH_PRECISION 0
#include "vp9/encoder/x86/vp9_dct32x32_sse2.c"
#undef FDCT32x32_2D
#undef FDCT32x32_HIGH_PRECISION
#define FDCT32x32_2D vp9_
short_
fdct32x32_sse2
#define FDCT32x32_2D vp9_fdct32x32_sse2
#define FDCT32x32_HIGH_PRECISION 1
#include "vp9/encoder/x86/vp9_dct32x32_sse2.c" // NOLINT
#undef FDCT32x32_2D
...
...
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