Skip to content
GitLab
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
4a1a7919
Commit
4a1a7919
authored
Feb 05, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Feb 05, 2014
Browse files
Merge "Removing "_1d" suffix from mips transform code."
parents
5eda0eae
6e4a03e8
Changes
6
Hide whitespace changes
Inline
Side-by-side
vp9/common/mips/dspr2/vp9_common_dspr2.h
View file @
4a1a7919
...
...
@@ -85,8 +85,8 @@ static INLINE void vp9_prefetch_store_streamed(unsigned char *dst) {
);
}
void
vp9_idct32_
1d_
cols_add_blk_dspr2
(
int16_t
*
input
,
uint8_t
*
dest
,
int
dest_stride
);
void
vp9_idct32_cols_add_blk_dspr2
(
int16_t
*
input
,
uint8_t
*
dest
,
int
dest_stride
);
void
vp9_convolve2_horiz_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
...
...
vp9/common/mips/dspr2/vp9_itrans16_dspr2.c
View file @
4a1a7919
...
...
@@ -19,8 +19,8 @@
#include
"vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2
static
void
idct16_
1d_
rows_dspr2
(
const
int16_t
*
input
,
int16_t
*
output
,
uint32_t
no_rows
)
{
static
void
idct16_rows_dspr2
(
const
int16_t
*
input
,
int16_t
*
output
,
uint32_t
no_rows
)
{
int
i
;
int
step1_0
,
step1_1
,
step1_2
,
step1_3
,
step1_4
,
step1_5
,
step1_6
,
step1_7
;
int
step1_10
,
step1_11
,
step1_12
,
step1_13
;
...
...
@@ -404,8 +404,8 @@ static void idct16_1d_rows_dspr2(const int16_t *input, int16_t *output,
}
}
static
void
idct16_
1d_
cols_add_blk_dspr2
(
int16_t
*
input
,
uint8_t
*
dest
,
int
dest_stride
)
{
static
void
idct16_cols_add_blk_dspr2
(
int16_t
*
input
,
uint8_t
*
dest
,
int
dest_stride
)
{
int
i
;
int
step1_0
,
step1_1
,
step1_2
,
step1_3
,
step1_4
,
step1_5
,
step1_6
,
step1_7
;
int
step1_8
,
step1_9
,
step1_10
,
step1_11
;
...
...
@@ -905,13 +905,13 @@ void vp9_idct16x16_256_add_dspr2(const int16_t *input, uint8_t *dest,
);
// First transform rows
idct16_
1d_
rows_dspr2
(
input
,
out
,
16
);
idct16_rows_dspr2
(
input
,
out
,
16
);
// Then transform columns and add to dest
idct16_
1d_
cols_add_blk_dspr2
(
out
,
dest
,
dest_stride
);
idct16_cols_add_blk_dspr2
(
out
,
dest
,
dest_stride
);
}
static
void
iadst16
_1d
(
const
int16_t
*
input
,
int16_t
*
output
)
{
static
void
iadst16
(
const
int16_t
*
input
,
int16_t
*
output
)
{
int
s0
,
s1
,
s2
,
s3
,
s4
,
s5
,
s6
,
s7
,
s8
,
s9
,
s10
,
s11
,
s12
,
s13
,
s14
,
s15
;
int
x0
=
input
[
15
];
...
...
@@ -1099,16 +1099,16 @@ void vp9_iht16x16_256_add_dspr2(const int16_t *input, uint8_t *dest,
switch
(
tx_type
)
{
case
DCT_DCT
:
// DCT in both horizontal and vertical
idct16_
1d_
rows_dspr2
(
input
,
outptr
,
16
);
idct16_
1d_
cols_add_blk_dspr2
(
out
,
dest
,
pitch
);
idct16_rows_dspr2
(
input
,
outptr
,
16
);
idct16_cols_add_blk_dspr2
(
out
,
dest
,
pitch
);
break
;
case
ADST_DCT
:
// ADST in vertical, DCT in horizontal
idct16_
1d_
rows_dspr2
(
input
,
outptr
,
16
);
idct16_rows_dspr2
(
input
,
outptr
,
16
);
outptr
=
out
;
for
(
i
=
0
;
i
<
16
;
++
i
)
{
iadst16
_1d
(
outptr
,
temp_out
);
iadst16
(
outptr
,
temp_out
);
for
(
j
=
0
;
j
<
16
;
++
j
)
dest
[
j
*
pitch
+
i
]
=
...
...
@@ -1125,7 +1125,7 @@ void vp9_iht16x16_256_add_dspr2(const int16_t *input, uint8_t *dest,
/* prefetch row */
vp9_prefetch_load
((
const
uint8_t
*
)(
input
+
16
));
iadst16
_1d
(
input
,
outptr
);
iadst16
(
input
,
outptr
);
input
+=
16
;
outptr
+=
16
;
}
...
...
@@ -1134,7 +1134,7 @@ void vp9_iht16x16_256_add_dspr2(const int16_t *input, uint8_t *dest,
for
(
j
=
0
;
j
<
16
;
++
j
)
temp_in
[
j
*
16
+
i
]
=
out
[
i
*
16
+
j
];
idct16_
1d_
cols_add_blk_dspr2
(
temp_in
,
dest
,
pitch
);
idct16_cols_add_blk_dspr2
(
temp_in
,
dest
,
pitch
);
}
break
;
case
ADST_ADST
:
// ADST in both directions
...
...
@@ -1145,7 +1145,7 @@ void vp9_iht16x16_256_add_dspr2(const int16_t *input, uint8_t *dest,
/* prefetch row */
vp9_prefetch_load
((
const
uint8_t
*
)(
input
+
16
));
iadst16
_1d
(
input
,
outptr
);
iadst16
(
input
,
outptr
);
input
+=
16
;
outptr
+=
16
;
}
...
...
@@ -1153,7 +1153,7 @@ void vp9_iht16x16_256_add_dspr2(const int16_t *input, uint8_t *dest,
for
(
i
=
0
;
i
<
16
;
++
i
)
{
for
(
j
=
0
;
j
<
16
;
++
j
)
temp_in
[
j
]
=
out
[
j
*
16
+
i
];
iadst16
_1d
(
temp_in
,
temp_out
);
iadst16
(
temp_in
,
temp_out
);
for
(
j
=
0
;
j
<
16
;
++
j
)
dest
[
j
*
pitch
+
i
]
=
clip_pixel
(
ROUND_POWER_OF_TWO
(
temp_out
[
j
],
6
)
...
...
@@ -1183,7 +1183,7 @@ void vp9_idct16x16_10_add_dspr2(const int16_t *input, uint8_t *dest,
// First transform rows. Since all non-zero dct coefficients are in
// upper-left 4x4 area, we only need to calculate first 4 rows here.
idct16_
1d_
rows_dspr2
(
input
,
outptr
,
4
);
idct16_rows_dspr2
(
input
,
outptr
,
4
);
outptr
+=
4
;
for
(
i
=
0
;
i
<
6
;
++
i
)
{
...
...
@@ -1213,7 +1213,7 @@ void vp9_idct16x16_10_add_dspr2(const int16_t *input, uint8_t *dest,
}
// Then transform columns
idct16_
1d_
cols_add_blk_dspr2
(
out
,
dest
,
dest_stride
);
idct16_cols_add_blk_dspr2
(
out
,
dest
,
dest_stride
);
}
void
vp9_idct16x16_1_add_dspr2
(
const
int16_t
*
input
,
uint8_t
*
dest
,
...
...
vp9/common/mips/dspr2/vp9_itrans32_cols_dspr2.c
View file @
4a1a7919
...
...
@@ -18,8 +18,8 @@
#include
"vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2
void
vp9_idct32_
1d_
cols_add_blk_dspr2
(
int16_t
*
input
,
uint8_t
*
dest
,
int
dest_stride
)
{
void
vp9_idct32_cols_add_blk_dspr2
(
int16_t
*
input
,
uint8_t
*
dest
,
int
dest_stride
)
{
int16_t
step1_0
,
step1_1
,
step1_2
,
step1_3
,
step1_4
,
step1_5
,
step1_6
;
int16_t
step1_7
,
step1_8
,
step1_9
,
step1_10
,
step1_11
,
step1_12
,
step1_13
;
int16_t
step1_14
,
step1_15
,
step1_16
,
step1_17
,
step1_18
,
step1_19
;
...
...
vp9/common/mips/dspr2/vp9_itrans32_dspr2.c
View file @
4a1a7919
...
...
@@ -19,8 +19,8 @@
#include
"vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2
static
void
idct32_
1d_
rows_dspr2
(
const
int16_t
*
input
,
int16_t
*
output
,
uint32_t
no_rows
)
{
static
void
idct32_rows_dspr2
(
const
int16_t
*
input
,
int16_t
*
output
,
uint32_t
no_rows
)
{
int16_t
step1_0
,
step1_1
,
step1_2
,
step1_3
,
step1_4
,
step1_5
,
step1_6
;
int16_t
step1_7
,
step1_8
,
step1_9
,
step1_10
,
step1_11
,
step1_12
,
step1_13
;
int16_t
step1_14
,
step1_15
,
step1_16
,
step1_17
,
step1_18
,
step1_19
,
step1_20
;
...
...
@@ -882,10 +882,10 @@ void vp9_idct32x32_1024_add_dspr2(const int16_t *input, uint8_t *dest,
);
// Rows
idct32_
1d_
rows_dspr2
(
input
,
outptr
,
32
);
idct32_rows_dspr2
(
input
,
outptr
,
32
);
// Columns
vp9_idct32_
1d_
cols_add_blk_dspr2
(
out
,
dest
,
dest_stride
);
vp9_idct32_cols_add_blk_dspr2
(
out
,
dest
,
dest_stride
);
}
void
vp9_idct32x32_34_add_dspr2
(
const
int16_t
*
input
,
uint8_t
*
dest
,
...
...
@@ -903,7 +903,7 @@ void vp9_idct32x32_34_add_dspr2(const int16_t *input, uint8_t *dest,
);
// Rows
idct32_
1d_
rows_dspr2
(
input
,
outptr
,
8
);
idct32_rows_dspr2
(
input
,
outptr
,
8
);
outptr
+=
8
;
__asm__
__volatile__
(
...
...
@@ -947,7 +947,7 @@ void vp9_idct32x32_34_add_dspr2(const int16_t *input, uint8_t *dest,
}
// Columns
vp9_idct32_
1d_
cols_add_blk_dspr2
(
out
,
dest
,
stride
);
vp9_idct32_cols_add_blk_dspr2
(
out
,
dest
,
stride
);
}
void
vp9_idct32x32_1_add_dspr2
(
const
int16_t
*
input
,
uint8_t
*
dest
,
...
...
vp9/common/mips/dspr2/vp9_itrans4_dspr2.c
View file @
4a1a7919
...
...
@@ -19,7 +19,7 @@
#include
"vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2
static
void
vp9_idct4_
1d_
rows_dspr2
(
const
int16_t
*
input
,
int16_t
*
output
)
{
static
void
vp9_idct4_rows_dspr2
(
const
int16_t
*
input
,
int16_t
*
output
)
{
int16_t
step_0
,
step_1
,
step_2
,
step_3
;
int
Temp0
,
Temp1
,
Temp2
,
Temp3
;
const
int
const_2_power_13
=
8192
;
...
...
@@ -104,7 +104,7 @@ static void vp9_idct4_1d_rows_dspr2(const int16_t *input, int16_t *output) {
}
}
static
void
vp9_idct4_
1d_
columns_add_blk_dspr2
(
int16_t
*
input
,
uint8_t
*
dest
,
static
void
vp9_idct4_columns_add_blk_dspr2
(
int16_t
*
input
,
uint8_t
*
dest
,
int
dest_stride
)
{
int16_t
step_0
,
step_1
,
step_2
,
step_3
;
int
Temp0
,
Temp1
,
Temp2
,
Temp3
;
...
...
@@ -240,10 +240,10 @@ void vp9_idct4x4_16_add_dspr2(const int16_t *input, uint8_t *dest,
);
// Rows
vp9_idct4_
1d_
rows_dspr2
(
input
,
outptr
);
vp9_idct4_rows_dspr2
(
input
,
outptr
);
// Columns
vp9_idct4_
1d_
columns_add_blk_dspr2
(
&
out
[
0
],
dest
,
dest_stride
);
vp9_idct4_columns_add_blk_dspr2
(
&
out
[
0
],
dest
,
dest_stride
);
}
void
vp9_idct4x4_1_add_dspr2
(
const
int16_t
*
input
,
uint8_t
*
dest
,
...
...
@@ -319,7 +319,7 @@ void vp9_idct4x4_1_add_dspr2(const int16_t *input, uint8_t *dest,
}
}
static
void
iadst4_
1d_
dspr2
(
const
int16_t
*
input
,
int16_t
*
output
)
{
static
void
iadst4_dspr2
(
const
int16_t
*
input
,
int16_t
*
output
)
{
int
s0
,
s1
,
s2
,
s3
,
s4
,
s5
,
s6
,
s7
;
int
x0
,
x1
,
x2
,
x3
;
...
...
@@ -379,16 +379,16 @@ void vp9_iht4x4_16_add_dspr2(const int16_t *input, uint8_t *dest,
switch
(
tx_type
)
{
case
DCT_DCT
:
// DCT in both horizontal and vertical
vp9_idct4_
1d_
rows_dspr2
(
input
,
outptr
);
vp9_idct4_
1d_
columns_add_blk_dspr2
(
&
out
[
0
],
dest
,
dest_stride
);
vp9_idct4_rows_dspr2
(
input
,
outptr
);
vp9_idct4_columns_add_blk_dspr2
(
&
out
[
0
],
dest
,
dest_stride
);
break
;
case
ADST_DCT
:
// ADST in vertical, DCT in horizontal
vp9_idct4_
1d_
rows_dspr2
(
input
,
outptr
);
vp9_idct4_rows_dspr2
(
input
,
outptr
);
outptr
=
out
;
for
(
i
=
0
;
i
<
4
;
++
i
)
{
iadst4_
1d_
dspr2
(
outptr
,
temp_out
);
iadst4_dspr2
(
outptr
,
temp_out
);
for
(
j
=
0
;
j
<
4
;
++
j
)
dest
[
j
*
dest_stride
+
i
]
=
...
...
@@ -400,7 +400,7 @@ void vp9_iht4x4_16_add_dspr2(const int16_t *input, uint8_t *dest,
break
;
case
DCT_ADST
:
// DCT in vertical, ADST in horizontal
for
(
i
=
0
;
i
<
4
;
++
i
)
{
iadst4_
1d_
dspr2
(
input
,
outptr
);
iadst4_dspr2
(
input
,
outptr
);
input
+=
4
;
outptr
+=
4
;
}
...
...
@@ -410,11 +410,11 @@ void vp9_iht4x4_16_add_dspr2(const int16_t *input, uint8_t *dest,
temp_in
[
i
*
4
+
j
]
=
out
[
j
*
4
+
i
];
}
}
vp9_idct4_
1d_
columns_add_blk_dspr2
(
&
temp_in
[
0
],
dest
,
dest_stride
);
vp9_idct4_columns_add_blk_dspr2
(
&
temp_in
[
0
],
dest
,
dest_stride
);
break
;
case
ADST_ADST
:
// ADST in both directions
for
(
i
=
0
;
i
<
4
;
++
i
)
{
iadst4_
1d_
dspr2
(
input
,
outptr
);
iadst4_dspr2
(
input
,
outptr
);
input
+=
4
;
outptr
+=
4
;
}
...
...
@@ -422,7 +422,7 @@ void vp9_iht4x4_16_add_dspr2(const int16_t *input, uint8_t *dest,
for
(
i
=
0
;
i
<
4
;
++
i
)
{
for
(
j
=
0
;
j
<
4
;
++
j
)
temp_in
[
j
]
=
out
[
j
*
4
+
i
];
iadst4_
1d_
dspr2
(
temp_in
,
temp_out
);
iadst4_dspr2
(
temp_in
,
temp_out
);
for
(
j
=
0
;
j
<
4
;
++
j
)
dest
[
j
*
dest_stride
+
i
]
=
...
...
vp9/common/mips/dspr2/vp9_itrans8_dspr2.c
View file @
4a1a7919
...
...
@@ -19,8 +19,8 @@
#include
"vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2
static
void
idct8_
1d_
rows_dspr2
(
const
int16_t
*
input
,
int16_t
*
output
,
uint32_t
no_rows
)
{
static
void
idct8_rows_dspr2
(
const
int16_t
*
input
,
int16_t
*
output
,
uint32_t
no_rows
)
{
int
step1_0
,
step1_1
,
step1_2
,
step1_3
,
step1_4
,
step1_5
,
step1_6
,
step1_7
;
const
int
const_2_power_13
=
8192
;
int
Temp0
,
Temp1
,
Temp2
,
Temp3
,
Temp4
;
...
...
@@ -200,8 +200,8 @@ static void idct8_1d_rows_dspr2(const int16_t *input, int16_t *output,
}
}
static
void
idct8_
1d_
columns_add_blk_dspr2
(
int16_t
*
input
,
uint8_t
*
dest
,
int
dest_stride
)
{
static
void
idct8_columns_add_blk_dspr2
(
int16_t
*
input
,
uint8_t
*
dest
,
int
dest_stride
)
{
int
step1_0
,
step1_1
,
step1_2
,
step1_3
,
step1_4
,
step1_5
,
step1_6
,
step1_7
;
int
Temp0
,
Temp1
,
Temp2
,
Temp3
;
int
i
;
...
...
@@ -462,13 +462,13 @@ void vp9_idct8x8_64_add_dspr2(const int16_t *input, uint8_t *dest,
);
// First transform rows
idct8_
1d_
rows_dspr2
(
input
,
outptr
,
8
);
idct8_rows_dspr2
(
input
,
outptr
,
8
);
// Then transform columns and add to dest
idct8_
1d_
columns_add_blk_dspr2
(
&
out
[
0
],
dest
,
dest_stride
);
idct8_columns_add_blk_dspr2
(
&
out
[
0
],
dest
,
dest_stride
);
}
static
void
iadst8_
1d_
dspr2
(
const
int16_t
*
input
,
int16_t
*
output
)
{
static
void
iadst8_dspr2
(
const
int16_t
*
input
,
int16_t
*
output
)
{
int
s0
,
s1
,
s2
,
s3
,
s4
,
s5
,
s6
,
s7
;
int
x0
,
x1
,
x2
,
x3
,
x4
,
x5
,
x6
,
x7
;
...
...
@@ -563,14 +563,14 @@ void vp9_iht8x8_64_add_dspr2(const int16_t *input, uint8_t *dest,
switch
(
tx_type
)
{
case
DCT_DCT
:
// DCT in both horizontal and vertical
idct8_
1d_
rows_dspr2
(
input
,
outptr
,
8
);
idct8_
1d_
columns_add_blk_dspr2
(
&
out
[
0
],
dest
,
dest_stride
);
idct8_rows_dspr2
(
input
,
outptr
,
8
);
idct8_columns_add_blk_dspr2
(
&
out
[
0
],
dest
,
dest_stride
);
break
;
case
ADST_DCT
:
// ADST in vertical, DCT in horizontal
idct8_
1d_
rows_dspr2
(
input
,
outptr
,
8
);
idct8_rows_dspr2
(
input
,
outptr
,
8
);
for
(
i
=
0
;
i
<
8
;
++
i
)
{
iadst8_
1d_
dspr2
(
&
out
[
i
*
8
],
temp_out
);
iadst8_dspr2
(
&
out
[
i
*
8
],
temp_out
);
for
(
j
=
0
;
j
<
8
;
++
j
)
dest
[
j
*
dest_stride
+
i
]
=
...
...
@@ -580,7 +580,7 @@ void vp9_iht8x8_64_add_dspr2(const int16_t *input, uint8_t *dest,
break
;
case
DCT_ADST
:
// DCT in vertical, ADST in horizontal
for
(
i
=
0
;
i
<
8
;
++
i
)
{
iadst8_
1d_
dspr2
(
input
,
outptr
);
iadst8_dspr2
(
input
,
outptr
);
input
+=
8
;
outptr
+=
8
;
}
...
...
@@ -590,11 +590,11 @@ void vp9_iht8x8_64_add_dspr2(const int16_t *input, uint8_t *dest,
temp_in
[
i
*
8
+
j
]
=
out
[
j
*
8
+
i
];
}
}
idct8_
1d_
columns_add_blk_dspr2
(
&
temp_in
[
0
],
dest
,
dest_stride
);
idct8_columns_add_blk_dspr2
(
&
temp_in
[
0
],
dest
,
dest_stride
);
break
;
case
ADST_ADST
:
// ADST in both directions
for
(
i
=
0
;
i
<
8
;
++
i
)
{
iadst8_
1d_
dspr2
(
input
,
outptr
);
iadst8_dspr2
(
input
,
outptr
);
input
+=
8
;
outptr
+=
8
;
}
...
...
@@ -603,7 +603,7 @@ void vp9_iht8x8_64_add_dspr2(const int16_t *input, uint8_t *dest,
for
(
j
=
0
;
j
<
8
;
++
j
)
temp_in
[
j
]
=
out
[
j
*
8
+
i
];
iadst8_
1d_
dspr2
(
temp_in
,
temp_out
);
iadst8_dspr2
(
temp_in
,
temp_out
);
for
(
j
=
0
;
j
<
8
;
++
j
)
dest
[
j
*
dest_stride
+
i
]
=
...
...
@@ -631,7 +631,7 @@ void vp9_idct8x8_10_add_dspr2(const int16_t *input, uint8_t *dest,
);
// First transform rows
idct8_
1d_
rows_dspr2
(
input
,
outptr
,
4
);
idct8_rows_dspr2
(
input
,
outptr
,
4
);
outptr
+=
4
;
...
...
@@ -659,7 +659,7 @@ void vp9_idct8x8_10_add_dspr2(const int16_t *input, uint8_t *dest,
// Then transform columns and add to dest
idct8_
1d_
columns_add_blk_dspr2
(
&
out
[
0
],
dest
,
dest_stride
);
idct8_columns_add_blk_dspr2
(
&
out
[
0
],
dest
,
dest_stride
);
}
void
vp9_idct8x8_1_add_dspr2
(
const
int16_t
*
input
,
uint8_t
*
dest
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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