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
7cfdc003
Commit
7cfdc003
authored
Jul 28, 2015
by
Zoe Liu
Browse files
Refactor mips/dspr2 on convolution.
Change-Id: If59a39d5a92c261537342726f94bb7f7f26dfff3
parent
7186a2dd
Changes
21
Hide whitespace changes
Inline
Side-by-side
vp9/common/mips/dspr2/vp9_common_dspr2.c
0 → 100644
View file @
7cfdc003
/*
* Copyright (c) 2013 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h"
#if HAVE_DSPR2
uint8_t
vp9_ff_cropTbl_a
[
256
+
2
*
CROP_WIDTH
];
uint8_t
*
vp9_ff_cropTbl
;
void
vp9_dsputil_static_init
(
void
)
{
int
i
;
for
(
i
=
0
;
i
<
256
;
i
++
)
vp9_ff_cropTbl_a
[
i
+
CROP_WIDTH
]
=
i
;
for
(
i
=
0
;
i
<
CROP_WIDTH
;
i
++
)
{
vp9_ff_cropTbl_a
[
i
]
=
0
;
vp9_ff_cropTbl_a
[
i
+
CROP_WIDTH
+
256
]
=
255
;
}
vp9_ff_cropTbl
=
&
vp9_ff_cropTbl_a
[
CROP_WIDTH
];
}
#endif
vp9/common/mips/dspr2/vp9_common_dspr2.h
View file @
7cfdc003
...
...
@@ -22,7 +22,8 @@ extern "C" {
#endif
#if HAVE_DSPR2
extern
uint8_t
*
vp9_ff_cropTbl
;
extern
uint8_t
*
vpx_ff_cropTbl
;
#define DCT_CONST_ROUND_SHIFT_TWICE_COSPI_16_64(input) ({ \
\
...
...
@@ -53,35 +54,6 @@ extern uint8_t *vp9_ff_cropTbl;
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
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
void
vp9_convolve2_avg_horiz_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
void
vp9_convolve2_avg_vert_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
void
vp9_convolve2_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter
,
int
w
,
int
h
);
void
vp9_convolve2_vert_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
#endif // #if HAVE_DSPR2
#ifdef __cplusplus
}
// extern "C"
...
...
vp9/common/mips/dspr2/vp9_itrans16_dspr2.c
View file @
7cfdc003
...
...
@@ -419,17 +419,17 @@ static void idct16_cols_add_blk_dspr2(int16_t *input, uint8_t *dest,
int
result1
,
result2
,
result3
,
result4
;
const
int
const_2_power_13
=
8192
;
uint8_t
*
dest_pix
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
/* prefetch vp
9
_ff_cropTbl */
prefetch_load
(
vp
9
_ff_cropTbl
);
prefetch_load
(
vp
9
_ff_cropTbl
+
32
);
prefetch_load
(
vp
9
_ff_cropTbl
+
64
);
prefetch_load
(
vp
9
_ff_cropTbl
+
96
);
prefetch_load
(
vp
9
_ff_cropTbl
+
128
);
prefetch_load
(
vp
9
_ff_cropTbl
+
160
);
prefetch_load
(
vp
9
_ff_cropTbl
+
192
);
prefetch_load
(
vp
9
_ff_cropTbl
+
224
);
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
/* prefetch vp
x
_ff_cropTbl */
prefetch_load
(
vp
x
_ff_cropTbl
);
prefetch_load
(
vp
x
_ff_cropTbl
+
32
);
prefetch_load
(
vp
x
_ff_cropTbl
+
64
);
prefetch_load
(
vp
x
_ff_cropTbl
+
96
);
prefetch_load
(
vp
x
_ff_cropTbl
+
128
);
prefetch_load
(
vp
x
_ff_cropTbl
+
160
);
prefetch_load
(
vp
x
_ff_cropTbl
+
192
);
prefetch_load
(
vp
x
_ff_cropTbl
+
224
);
for
(
i
=
0
;
i
<
16
;
++
i
)
{
dest_pix
=
(
dest
+
i
);
...
...
vp9/common/mips/dspr2/vp9_itrans32_cols_dspr2.c
View file @
7cfdc003
...
...
@@ -41,17 +41,17 @@ void vp9_idct32_cols_add_blk_dspr2(int16_t *input, uint8_t *dest,
int
i
,
temp21
;
uint8_t
*
dest_pix
,
*
dest_pix1
;
const
int
const_2_power_13
=
8192
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
/* prefetch vp
9
_ff_cropTbl */
prefetch_load
(
vp
9
_ff_cropTbl
);
prefetch_load
(
vp
9
_ff_cropTbl
+
32
);
prefetch_load
(
vp
9
_ff_cropTbl
+
64
);
prefetch_load
(
vp
9
_ff_cropTbl
+
96
);
prefetch_load
(
vp
9
_ff_cropTbl
+
128
);
prefetch_load
(
vp
9
_ff_cropTbl
+
160
);
prefetch_load
(
vp
9
_ff_cropTbl
+
192
);
prefetch_load
(
vp
9
_ff_cropTbl
+
224
);
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
/* prefetch vp
x
_ff_cropTbl */
prefetch_load
(
vp
x
_ff_cropTbl
);
prefetch_load
(
vp
x
_ff_cropTbl
+
32
);
prefetch_load
(
vp
x
_ff_cropTbl
+
64
);
prefetch_load
(
vp
x
_ff_cropTbl
+
96
);
prefetch_load
(
vp
x
_ff_cropTbl
+
128
);
prefetch_load
(
vp
x
_ff_cropTbl
+
160
);
prefetch_load
(
vp
x
_ff_cropTbl
+
192
);
prefetch_load
(
vp
x
_ff_cropTbl
+
224
);
for
(
i
=
0
;
i
<
32
;
++
i
)
{
dest_pix
=
dest
+
i
;
...
...
vp9/common/mips/dspr2/vp9_itrans4_dspr2.c
View file @
7cfdc003
...
...
@@ -113,17 +113,17 @@ static void vp9_idct4_columns_add_blk_dspr2(int16_t *input, uint8_t *dest,
const
int
const_2_power_13
=
8192
;
int
i
;
uint8_t
*
dest_pix
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
/* prefetch vp
9
_ff_cropTbl */
prefetch_load
(
vp
9
_ff_cropTbl
);
prefetch_load
(
vp
9
_ff_cropTbl
+
32
);
prefetch_load
(
vp
9
_ff_cropTbl
+
64
);
prefetch_load
(
vp
9
_ff_cropTbl
+
96
);
prefetch_load
(
vp
9
_ff_cropTbl
+
128
);
prefetch_load
(
vp
9
_ff_cropTbl
+
160
);
prefetch_load
(
vp
9
_ff_cropTbl
+
192
);
prefetch_load
(
vp
9
_ff_cropTbl
+
224
);
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
/* prefetch vp
x
_ff_cropTbl */
prefetch_load
(
vp
x
_ff_cropTbl
);
prefetch_load
(
vp
x
_ff_cropTbl
+
32
);
prefetch_load
(
vp
x
_ff_cropTbl
+
64
);
prefetch_load
(
vp
x
_ff_cropTbl
+
96
);
prefetch_load
(
vp
x
_ff_cropTbl
+
128
);
prefetch_load
(
vp
x
_ff_cropTbl
+
160
);
prefetch_load
(
vp
x
_ff_cropTbl
+
192
);
prefetch_load
(
vp
x
_ff_cropTbl
+
224
);
for
(
i
=
0
;
i
<
4
;
++
i
)
{
dest_pix
=
(
dest
+
i
);
...
...
vp9/common/mips/dspr2/vp9_itrans8_dspr2.c
View file @
7cfdc003
...
...
@@ -208,17 +208,17 @@ static void idct8_columns_add_blk_dspr2(int16_t *input, uint8_t *dest,
int
i
;
const
int
const_2_power_13
=
8192
;
uint8_t
*
dest_pix
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
/* prefetch vp
9
_ff_cropTbl */
prefetch_load
(
vp
9
_ff_cropTbl
);
prefetch_load
(
vp
9
_ff_cropTbl
+
32
);
prefetch_load
(
vp
9
_ff_cropTbl
+
64
);
prefetch_load
(
vp
9
_ff_cropTbl
+
96
);
prefetch_load
(
vp
9
_ff_cropTbl
+
128
);
prefetch_load
(
vp
9
_ff_cropTbl
+
160
);
prefetch_load
(
vp
9
_ff_cropTbl
+
192
);
prefetch_load
(
vp
9
_ff_cropTbl
+
224
);
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
/* prefetch vp
x
_ff_cropTbl */
prefetch_load
(
vp
x
_ff_cropTbl
);
prefetch_load
(
vp
x
_ff_cropTbl
+
32
);
prefetch_load
(
vp
x
_ff_cropTbl
+
64
);
prefetch_load
(
vp
x
_ff_cropTbl
+
96
);
prefetch_load
(
vp
x
_ff_cropTbl
+
128
);
prefetch_load
(
vp
x
_ff_cropTbl
+
160
);
prefetch_load
(
vp
x
_ff_cropTbl
+
192
);
prefetch_load
(
vp
x
_ff_cropTbl
+
224
);
for
(
i
=
0
;
i
<
8
;
++
i
)
{
dest_pix
=
(
dest
+
i
);
...
...
vp9/vp9_common.mk
View file @
7cfdc003
...
...
@@ -74,16 +74,7 @@ endif
# common (c)
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_common_dspr2.h
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_convolve2_avg_dspr2.c
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_convolve2_avg_horiz_dspr2.c
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_convolve2_dspr2.c
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_convolve2_horiz_dspr2.c
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_convolve2_vert_dspr2.c
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_convolve8_avg_dspr2.c
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_convolve8_avg_horiz_dspr2.c
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_convolve8_dspr2.c
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_convolve8_horiz_dspr2.c
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_convolve8_vert_dspr2.c
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_common_dspr2.c
ifneq
($(CONFIG_VP9_HIGHBITDEPTH),yes)
VP9_COMMON_SRCS-$(HAVE_DSPR2)
+=
common/mips/dspr2/vp9_itrans4_dspr2.c
...
...
vpx_dsp/mips/intrapred4_dspr2.c
View file @
7cfdc003
...
...
@@ -11,22 +11,6 @@
#include "vpx_dsp/mips/common_dspr2.h"
#if HAVE_DSPR2
uint8_t
vpx_ff_cropTbl_a
[
256
+
2
*
CROP_WIDTH
];
uint8_t
*
vpx_ff_cropTbl
;
void
vpx_dsputil_static_init
(
void
)
{
int
i
;
for
(
i
=
0
;
i
<
256
;
i
++
)
vpx_ff_cropTbl_a
[
i
+
CROP_WIDTH
]
=
i
;
for
(
i
=
0
;
i
<
CROP_WIDTH
;
i
++
)
{
vpx_ff_cropTbl_a
[
i
]
=
0
;
vpx_ff_cropTbl_a
[
i
+
CROP_WIDTH
+
256
]
=
255
;
}
vpx_ff_cropTbl
=
&
vpx_ff_cropTbl_a
[
CROP_WIDTH
];
}
void
vpx_h_predictor_4x4_dspr2
(
uint8_t
*
dst
,
ptrdiff_t
stride
,
const
uint8_t
*
above
,
const
uint8_t
*
left
)
{
int32_t
tmp1
,
tmp2
,
tmp3
,
tmp4
;
...
...
vpx_dsp/mips/vpx_common_dspr2.h
0 → 100644
View file @
7cfdc003
/*
* Copyright (c) 2013 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VPX_DSP_MIPS_VPX_COMMON_DSPR2_H_
#define VPX_DSP_MIPS_VPX_COMMON_DSPR2_H_
#include <assert.h>
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#include "vpx_dsp/mips/common_dspr2.h"
#ifdef __cplusplus
extern
"C"
{
#endif
#if HAVE_DSPR2
extern
uint8_t
*
vpx_ff_cropTbl
;
void
vpx_convolve2_horiz_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
void
vpx_convolve2_avg_horiz_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
void
vpx_convolve2_avg_vert_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
void
vpx_convolve2_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter
,
int
w
,
int
h
);
void
vpx_convolve2_vert_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
int
w
,
int
h
);
#endif // #if HAVE_DSPR2
#ifdef __cplusplus
}
// extern "C"
#endif
#endif // VPX_DSP_MIPS_VPX_COMMON_DSPR2_H_
vp
9/common/mips/dspr2
/vp
9
_convolve2_avg_dspr2.c
→
vp
x_dsp/mips
/vp
x
_convolve2_avg_dspr2.c
View file @
7cfdc003
...
...
@@ -11,13 +11,11 @@
#include <assert.h>
#include <stdio.h>
#include "./vpx_
config
.h"
#include "
./vp9_rtcd
.h"
#include "vp
9/common
/vp
9
_co
mmon
.h"
#include "vpx/vpx_
integer
.h"
#include "./vpx_
dsp_rtcd
.h"
#include "
vpx_dsp/mips/vpx_common_dspr2
.h"
#include "vp
x_dsp
/vp
x
_co
nvolve
.h"
#include "vpx
_dsp
/vpx_
dsp_common
.h"
#include "vpx_ports/mem.h"
#include "vp9/common/vp9_convolve.h"
#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2
static
void
convolve_bi_avg_vert_4_dspr2
(
const
uint8_t
*
src
,
...
...
@@ -30,7 +28,7 @@ static void convolve_bi_avg_vert_4_dspr2(const uint8_t *src,
int32_t
x
,
y
;
const
uint8_t
*
src_ptr
;
uint8_t
*
dst_ptr
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint32_t
vector4a
=
64
;
uint32_t
load1
,
load2
;
uint32_t
p1
,
p2
;
...
...
@@ -134,7 +132,7 @@ static void convolve_bi_avg_vert_64_dspr2(const uint8_t *src,
int32_t
x
,
y
;
const
uint8_t
*
src_ptr
;
uint8_t
*
dst_ptr
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint32_t
vector4a
=
64
;
uint32_t
load1
,
load2
;
uint32_t
p1
,
p2
;
...
...
@@ -230,7 +228,7 @@ static void convolve_bi_avg_vert_64_dspr2(const uint8_t *src,
}
}
void
vp
9
_convolve2_avg_vert_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
void
vp
x
_convolve2_avg_vert_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
...
...
@@ -263,7 +261,7 @@ void vp9_convolve2_avg_vert_dspr2(const uint8_t *src, ptrdiff_t src_stride,
filter_y
,
h
);
break
;
default:
vp
9
_convolve8_avg_vert_c
(
src
,
src_stride
,
vp
x
_convolve8_avg_vert_c
(
src
,
src_stride
,
dst
,
dst_stride
,
filter_x
,
x_step_q4
,
filter_y
,
y_step_q4
,
...
...
@@ -271,7 +269,7 @@ void vp9_convolve2_avg_vert_dspr2(const uint8_t *src, ptrdiff_t src_stride,
break
;
}
}
else
{
vp
9
_convolve8_avg_vert_c
(
src
,
src_stride
,
vp
x
_convolve8_avg_vert_c
(
src
,
src_stride
,
dst
,
dst_stride
,
filter_x
,
x_step_q4
,
filter_y
,
y_step_q4
,
...
...
vp
9/common/mips/dspr2
/vp
9
_convolve2_avg_horiz_dspr2.c
→
vp
x_dsp/mips
/vp
x
_convolve2_avg_horiz_dspr2.c
View file @
7cfdc003
...
...
@@ -11,13 +11,11 @@
#include <assert.h>
#include <stdio.h>
#include "./vpx_
config
.h"
#include "
./vp9_rtcd
.h"
#include "vp
9/common
/vp
9
_co
mmon
.h"
#include "vpx/vpx_
integer
.h"
#include "./vpx_
dsp_rtcd
.h"
#include "
vpx_dsp/mips/vpx_common_dspr2
.h"
#include "vp
x_dsp
/vp
x
_co
nvolve
.h"
#include "vpx
_dsp
/vpx_
dsp_common
.h"
#include "vpx_ports/mem.h"
#include "vp9/common/vp9_convolve.h"
#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2
static
void
convolve_bi_avg_horiz_4_dspr2
(
const
uint8_t
*
src
,
...
...
@@ -27,7 +25,7 @@ static void convolve_bi_avg_horiz_4_dspr2(const uint8_t *src,
const
int16_t
*
filter_x0
,
int32_t
h
)
{
int32_t
y
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
int32_t
Temp1
,
Temp2
,
Temp3
,
Temp4
;
uint32_t
vector4a
=
64
;
uint32_t
tp1
,
tp2
;
...
...
@@ -122,7 +120,7 @@ static void convolve_bi_avg_horiz_8_dspr2(const uint8_t *src,
const
int16_t
*
filter_x0
,
int32_t
h
)
{
int32_t
y
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint32_t
vector4a
=
64
;
int32_t
Temp1
,
Temp2
,
Temp3
;
uint32_t
tp1
,
tp2
,
tp3
,
tp4
;
...
...
@@ -274,7 +272,7 @@ static void convolve_bi_avg_horiz_16_dspr2(const uint8_t *src_ptr,
int32_t
y
,
c
;
const
uint8_t
*
src
;
uint8_t
*
dst
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint32_t
vector_64
=
64
;
int32_t
Temp1
,
Temp2
,
Temp3
;
uint32_t
qload1
,
qload2
,
qload3
;
...
...
@@ -523,7 +521,7 @@ static void convolve_bi_avg_horiz_64_dspr2(const uint8_t *src_ptr,
int32_t
y
,
c
;
const
uint8_t
*
src
;
uint8_t
*
dst
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint32_t
vector_64
=
64
;
int32_t
Temp1
,
Temp2
,
Temp3
;
uint32_t
qload1
,
qload2
,
qload3
;
...
...
@@ -765,7 +763,7 @@ static void convolve_bi_avg_horiz_64_dspr2(const uint8_t *src_ptr,
}
}
void
vp
9
_convolve2_avg_horiz_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
void
vp
x
_convolve2_avg_horiz_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
...
...
@@ -815,7 +813,7 @@ void vp9_convolve2_avg_horiz_dspr2(const uint8_t *src, ptrdiff_t src_stride,
filter_x
,
h
);
break
;
default:
vp
9
_convolve8_avg_horiz_c
(
src
,
src_stride
,
vp
x
_convolve8_avg_horiz_c
(
src
,
src_stride
,
dst
,
dst_stride
,
filter_x
,
x_step_q4
,
filter_y
,
y_step_q4
,
...
...
@@ -823,7 +821,7 @@ void vp9_convolve2_avg_horiz_dspr2(const uint8_t *src, ptrdiff_t src_stride,
break
;
}
}
else
{
vp
9
_convolve8_avg_horiz_c
(
src
,
src_stride
,
vp
x
_convolve8_avg_horiz_c
(
src
,
src_stride
,
dst
,
dst_stride
,
filter_x
,
x_step_q4
,
filter_y
,
y_step_q4
,
...
...
vp
9/common/mips/dspr2
/vp
9
_convolve2_dspr2.c
→
vp
x_dsp/mips
/vp
x
_convolve2_dspr2.c
View file @
7cfdc003
...
...
@@ -11,13 +11,11 @@
#include <assert.h>
#include <stdio.h>
#include "./vpx_
config
.h"
#include "
./vp9_rtcd
.h"
#include "vp
9/common/vp9
_common.h"
#include "vpx/vpx_
integ
er.h"
#include "./vpx_
dsp_rtcd
.h"
#include "
vpx_dsp/mips/vpx_common_dspr2
.h"
#include "vp
x_dsp/vpx_dsp
_common.h"
#include "vpx
_dsp
/vpx_
filt
er.h"
#include "vpx_ports/mem.h"
#include "vp9/common/vp9_filter.h"
#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2
static
void
convolve_bi_horiz_4_transposed_dspr2
(
const
uint8_t
*
src
,
...
...
@@ -27,7 +25,7 @@ static void convolve_bi_horiz_4_transposed_dspr2(const uint8_t *src,
const
int16_t
*
filter_x0
,
int32_t
h
)
{
int32_t
y
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint8_t
*
dst_ptr
;
int32_t
Temp1
,
Temp2
;
uint32_t
vector4a
=
64
;
...
...
@@ -117,7 +115,7 @@ static void convolve_bi_horiz_8_transposed_dspr2(const uint8_t *src,
const
int16_t
*
filter_x0
,
int32_t
h
)
{
int32_t
y
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint8_t
*
dst_ptr
;
uint32_t
vector4a
=
64
;
int32_t
Temp1
,
Temp2
,
Temp3
;
...
...
@@ -257,7 +255,7 @@ static void convolve_bi_horiz_16_transposed_dspr2(const uint8_t *src_ptr,
int32_t
c
,
y
;
const
uint8_t
*
src
;
uint8_t
*
dst
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint32_t
vector_64
=
64
;
int32_t
Temp1
,
Temp2
,
Temp3
;
uint32_t
qload1
,
qload2
;
...
...
@@ -489,7 +487,7 @@ static void convolve_bi_horiz_64_transposed_dspr2(const uint8_t *src_ptr,
int32_t
c
,
y
;
const
uint8_t
*
src
;
uint8_t
*
dst
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint32_t
vector_64
=
64
;
int32_t
Temp1
,
Temp2
,
Temp3
;
uint32_t
qload1
,
qload2
;
...
...
@@ -733,7 +731,7 @@ void convolve_bi_horiz_transposed(const uint8_t *src, ptrdiff_t src_stride,
}
}
void
vp
9
_convolve2_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
void
vp
x
_convolve2_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter
,
int
w
,
int
h
)
{
...
...
vp
9/common/mips/dspr2
/vp
9
_convolve2_horiz_dspr2.c
→
vp
x_dsp/mips
/vp
x
_convolve2_horiz_dspr2.c
View file @
7cfdc003
...
...
@@ -11,13 +11,11 @@
#include <assert.h>
#include <stdio.h>
#include "./vpx_
config
.h"
#include "
./vp9_rtcd
.h"
#include "vp
9/common
/vp
9
_co
mmon
.h"
#include "vpx/vpx_
integer
.h"
#include "./vpx_
dsp_rtcd
.h"
#include "
vpx_dsp/mips/vpx_common_dspr2
.h"
#include "vp
x_dsp
/vp
x
_co
nvolve
.h"
#include "vpx
_dsp
/vpx_
dsp_common
.h"
#include "vpx_ports/mem.h"
#include "vp9/common/vp9_convolve.h"
#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2
static
void
convolve_bi_horiz_4_dspr2
(
const
uint8_t
*
src
,
...
...
@@ -27,7 +25,7 @@ static void convolve_bi_horiz_4_dspr2(const uint8_t *src,
const
int16_t
*
filter_x0
,
int32_t
h
)
{
int32_t
y
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
int32_t
Temp1
,
Temp2
,
Temp3
,
Temp4
;
uint32_t
vector4a
=
64
;
uint32_t
tp1
,
tp2
;
...
...
@@ -109,7 +107,7 @@ static void convolve_bi_horiz_8_dspr2(const uint8_t *src,
const
int16_t
*
filter_x0
,
int32_t
h
)
{
int32_t
y
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint32_t
vector4a
=
64
;
int32_t
Temp1
,
Temp2
,
Temp3
;
uint32_t
tp1
,
tp2
,
tp3
;
...
...
@@ -236,7 +234,7 @@ static void convolve_bi_horiz_16_dspr2(const uint8_t *src_ptr,
int32_t
y
,
c
;
const
uint8_t
*
src
;
uint8_t
*
dst
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint32_t
vector_64
=
64
;
int32_t
Temp1
,
Temp2
,
Temp3
;
uint32_t
qload1
,
qload2
,
qload3
;
...
...
@@ -443,7 +441,7 @@ static void convolve_bi_horiz_64_dspr2(const uint8_t *src_ptr,
int32_t
y
,
c
;
const
uint8_t
*
src
;
uint8_t
*
dst
;
uint8_t
*
cm
=
vp
9
_ff_cropTbl
;
uint8_t
*
cm
=
vp
x
_ff_cropTbl
;
uint32_t
vector_64
=
64
;
int32_t
Temp1
,
Temp2
,
Temp3
;
uint32_t
qload1
,
qload2
,
qload3
;
...
...
@@ -643,7 +641,7 @@ static void convolve_bi_horiz_64_dspr2(const uint8_t *src_ptr,
}
}
void
vp
9
_convolve2_horiz_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
void
vp
x
_convolve2_horiz_dspr2
(
const
uint8_t
*
src
,
ptrdiff_t
src_stride
,
uint8_t
*
dst
,
ptrdiff_t
dst_stride
,
const
int16_t
*
filter_x
,
int
x_step_q4
,
const
int16_t
*
filter_y
,
int
y_step_q4
,
...
...
@@ -695,7 +693,7 @@ void vp9_convolve2_horiz_dspr2(const uint8_t *src, ptrdiff_t src_stride,
filter_x
,
(
int32_t
)
h
);
break
;
default:
vp
9
_convolve8_horiz_c
(
src
,
src_stride
,
vp
x
_convolve8_horiz_c
(
src
,
src_stride
,
dst
,
dst_stride
,
filter_x
,
x_step_q4
,
filter_y
,
y_step_q4
,
...
...
@@ -703,7 +701,7 @@ void vp9_convolve2_horiz_dspr2(const uint8_t *src, ptrdiff_t src_stride,
break
;
}
}
else
{
vp
9
_convolve8_horiz_c
(
src
,
src_stride
,
vp
x
_convolve8_horiz_c
(
src
,
src_stride
,
dst
,
dst_stride
,
filter_x
,
x_step_q4
,
filter_y
,
y_step_q4
,
...
...
vp
9/common/mips/dspr2
/vp
9
_convolve2_vert_dspr2.c
→
vp
x_dsp/mips
/vp
x
_convolve2_vert_dspr2.c
View file @
7cfdc003
...
...
@@ -11,13 +11,11 @@
#include <assert.h>
#include <stdio.h>
#include "./vpx_
config
.h"
#include "
./vp9_rtcd
.h"
#include "vp
9/common
/vp
9
_co
mmon
.h"
#include "vpx/vpx_
integer
.h"
#include "./vpx_
dsp_rtcd
.h"
#include "
vpx_dsp/mips/vpx_common_dspr2
.h"
#include "vp
x_dsp
/vp
x
_co
nvolve
.h"
#include "vpx
_dsp
/vpx_
dsp_common
.h"
#include "vpx_ports/mem.h"
#include "vp9/common/vp9_convolve.h"
#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2