Migrate mips dspr2 loop filter implementation from vp9 to vpx This commit moves the loop filter dspr2 implementation from vp9 to vpx_dsp directory. It also fixes header file format issues. Change-Id: I09203ed4bd267d7fd76bb79a6ee84a37646206b2
diff --git a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c b/vpx_dsp/mips/loopfilter_filters_dspr2.c similarity index 97% rename from vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c rename to vpx_dsp/mips/loopfilter_filters_dspr2.c index 29eaa79..a9cbc2b 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c +++ b/vpx_dsp/mips/loopfilter_filters_dspr2.c
@@ -10,12 +10,12 @@ #include <stdlib.h> -#include "./vp9_rtcd.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_dsp_rtcd.h" #include "vpx/vpx_integer.h" #include "vpx_dsp/mips/common_dspr2.h" +#include "vpx_dsp/mips/loopfilter_filters_dspr2.h" +#include "vpx_dsp/mips/loopfilter_macros_dspr2.h" +#include "vpx_dsp/mips/loopfilter_masks_dspr2.h" #include "vpx_mem/vpx_mem.h" #if HAVE_DSPR2
diff --git a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h b/vpx_dsp/mips/loopfilter_filters_dspr2.h similarity index 99% rename from vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h rename to vpx_dsp/mips/loopfilter_filters_dspr2.h index 5ff25e3..f0efad9 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h +++ b/vpx_dsp/mips/loopfilter_filters_dspr2.h
@@ -13,7 +13,7 @@ #include <stdlib.h> -#include "./vp9_rtcd.h" +#include "./vpx_dsp_rtcd.h" #include "vpx/vpx_integer.h" #include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem.h"
diff --git a/vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h b/vpx_dsp/mips/loopfilter_macros_dspr2.h similarity index 99% rename from vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h rename to vpx_dsp/mips/loopfilter_macros_dspr2.h index df4cb00..994ff18 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h +++ b/vpx_dsp/mips/loopfilter_macros_dspr2.h
@@ -13,7 +13,7 @@ #include <stdlib.h> -#include "./vp9_rtcd.h" +#include "./vpx_dsp_rtcd.h" #include "vpx/vpx_integer.h" #include "vpx_mem/vpx_mem.h"
diff --git a/vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h b/vpx_dsp/mips/loopfilter_masks_dspr2.h similarity index 99% rename from vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h rename to vpx_dsp/mips/loopfilter_masks_dspr2.h index a6fc3f0..3a69441 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h +++ b/vpx_dsp/mips/loopfilter_masks_dspr2.h
@@ -13,7 +13,7 @@ #include <stdlib.h> -#include "./vp9_rtcd.h" +#include "./vpx_dsp_rtcd.h" #include "vpx/vpx_integer.h" #include "vpx_mem/vpx_mem.h"
diff --git a/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c b/vpx_dsp/mips/loopfilter_mb_dspr2.c similarity index 98% rename from vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c rename to vpx_dsp/mips/loopfilter_mb_dspr2.c index 61eedd8..f0abf50 100644 --- a/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c +++ b/vpx_dsp/mips/loopfilter_mb_dspr2.c
@@ -10,12 +10,12 @@ #include <stdlib.h> -#include "./vp9_rtcd.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_dsp_rtcd.h" #include "vpx/vpx_integer.h" #include "vpx_dsp/mips/common_dspr2.h" +#include "vpx_dsp/mips/loopfilter_filters_dspr2.h" +#include "vpx_dsp/mips/loopfilter_macros_dspr2.h" +#include "vpx_dsp/mips/loopfilter_masks_dspr2.h" #include "vpx_mem/vpx_mem.h" #if HAVE_DSPR2
diff --git a/vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c b/vpx_dsp/mips/loopfilter_mb_horiz_dspr2.c similarity index 98% rename from vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c rename to vpx_dsp/mips/loopfilter_mb_horiz_dspr2.c index 64aec08..c5d4f11 100644 --- a/vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c +++ b/vpx_dsp/mips/loopfilter_mb_horiz_dspr2.c
@@ -10,12 +10,12 @@ #include <stdlib.h> -#include "./vp9_rtcd.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_dsp_rtcd.h" #include "vpx/vpx_integer.h" #include "vpx_dsp/mips/common_dspr2.h" +#include "vpx_dsp/mips/loopfilter_filters_dspr2.h" +#include "vpx_dsp/mips/loopfilter_macros_dspr2.h" +#include "vpx_dsp/mips/loopfilter_masks_dspr2.h" #include "vpx_mem/vpx_mem.h" #if HAVE_DSPR2
diff --git a/vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c b/vpx_dsp/mips/loopfilter_mb_vert_dspr2.c similarity index 98% rename from vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c rename to vpx_dsp/mips/loopfilter_mb_vert_dspr2.c index 97e0801..c9f6a1e 100644 --- a/vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c +++ b/vpx_dsp/mips/loopfilter_mb_vert_dspr2.c
@@ -10,12 +10,12 @@ #include <stdlib.h> -#include "./vp9_rtcd.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_dsp_rtcd.h" #include "vpx/vpx_integer.h" #include "vpx_dsp/mips/common_dspr2.h" +#include "vpx_dsp/mips/loopfilter_filters_dspr2.h" +#include "vpx_dsp/mips/loopfilter_macros_dspr2.h" +#include "vpx_dsp/mips/loopfilter_masks_dspr2.h" #include "vpx_mem/vpx_mem.h" #if HAVE_DSPR2