diff options
| author | Jingning Han <jingning@google.com> | 2015-07-17 10:37:31 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2015-07-17 10:38:35 -0700 |
| commit | d0750d287f053d3b7685b7efc8747081123b7b79 (patch) | |
| tree | 33ddcac1356ef5b9f662339e5b0b30b0e772884a /vp9 | |
| parent | 55e80a3cc6a2ba123b9f8df25e51a58bedc5fbfc (diff) | |
| download | libvpx-d0750d287f053d3b7685b7efc8747081123b7b79.tar.gz | |
Resolve dspr2 loop filter dependency complexity
Narrow the scope of dependency required by the dspr2 implementation
of loop filters.
Change-Id: Ib8d99dc7d9c231f69dd31d02e0a89e5bd0545a28
Diffstat (limited to 'vp9')
7 files changed, 14 insertions, 18 deletions
diff --git a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c b/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c index 41be90053..29eaa7931 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c +++ b/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c @@ -11,13 +11,12 @@ #include <stdlib.h> #include "./vp9_rtcd.h" -#include "vp9/common/vp9_common.h" -#include "vp9/common/vp9_loopfilter.h" -#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h" +#include "vpx/vpx_integer.h" #include "vpx_dsp/mips/common_dspr2.h" +#include "vpx_mem/vpx_mem.h" #if HAVE_DSPR2 void vp9_lpf_horizontal_4_dspr2(unsigned char *s, diff --git a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h b/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h index 675db654a..5ff25e33d 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h +++ b/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h @@ -14,9 +14,9 @@ #include <stdlib.h> #include "./vp9_rtcd.h" +#include "vpx/vpx_integer.h" +#include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem.h" -#include "vp9/common/vp9_common.h" -#include "vp9/common/vp9_onyxc_int.h" #ifdef __cplusplus extern "C" { diff --git a/vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h b/vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h index ca01a6a10..df4cb00c4 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h +++ b/vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h @@ -14,8 +14,8 @@ #include <stdlib.h> #include "./vp9_rtcd.h" -#include "vp9/common/vp9_common.h" -#include "vp9/common/vp9_onyxc_int.h" +#include "vpx/vpx_integer.h" +#include "vpx_mem/vpx_mem.h" #ifdef __cplusplus extern "C" { diff --git a/vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h b/vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h index 5b0d9cc9b..a6fc3f05a 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h +++ b/vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h @@ -14,8 +14,8 @@ #include <stdlib.h> #include "./vp9_rtcd.h" -#include "vp9/common/vp9_common.h" -#include "vp9/common/vp9_onyxc_int.h" +#include "vpx/vpx_integer.h" +#include "vpx_mem/vpx_mem.h" #ifdef __cplusplus extern "C" { diff --git a/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c b/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c index 93fbc2765..61eedd84d 100644 --- a/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c +++ b/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c @@ -11,13 +11,12 @@ #include <stdlib.h> #include "./vp9_rtcd.h" -#include "vp9/common/vp9_common.h" -#include "vp9/common/vp9_loopfilter.h" -#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h" +#include "vpx/vpx_integer.h" #include "vpx_dsp/mips/common_dspr2.h" +#include "vpx_mem/vpx_mem.h" #if HAVE_DSPR2 void vp9_lpf_horizontal_8_dspr2(unsigned char *s, diff --git a/vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c b/vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c index 5dc86fe4f..64aec08e8 100644 --- a/vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c +++ b/vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c @@ -11,13 +11,12 @@ #include <stdlib.h> #include "./vp9_rtcd.h" -#include "vp9/common/vp9_common.h" -#include "vp9/common/vp9_loopfilter.h" -#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h" +#include "vpx/vpx_integer.h" #include "vpx_dsp/mips/common_dspr2.h" +#include "vpx_mem/vpx_mem.h" #if HAVE_DSPR2 void vp9_lpf_horizontal_16_dspr2(unsigned char *s, diff --git a/vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c b/vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c index 65ea49aa7..97e080136 100644 --- a/vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c +++ b/vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c @@ -11,13 +11,12 @@ #include <stdlib.h> #include "./vp9_rtcd.h" -#include "vp9/common/vp9_common.h" -#include "vp9/common/vp9_loopfilter.h" -#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h" #include "vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h" +#include "vpx/vpx_integer.h" #include "vpx_dsp/mips/common_dspr2.h" +#include "vpx_mem/vpx_mem.h" #if HAVE_DSPR2 void vp9_lpf_vertical_16_dspr2(uint8_t *s, |