From 4735edd00f6a7b4131b9b9c33b220bfaf0d5a68a Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Fri, 17 Jul 2015 11:46:20 -0700 Subject: [PATCH] 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 --- .../mips/loopfilter_filters_dspr2.c | 8 ++++---- .../mips/loopfilter_filters_dspr2.h | 2 +- .../mips/loopfilter_macros_dspr2.h | 2 +- .../mips/loopfilter_masks_dspr2.h | 2 +- .../mips/loopfilter_mb_dspr2.c | 8 ++++---- .../mips/loopfilter_mb_horiz_dspr2.c | 8 ++++---- .../mips/loopfilter_mb_vert_dspr2.c | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) rename vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c => vpx_dsp/mips/loopfilter_filters_dspr2.c (98%) rename vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h => vpx_dsp/mips/loopfilter_filters_dspr2.h (99%) rename vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h => vpx_dsp/mips/loopfilter_macros_dspr2.h (99%) rename vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h => vpx_dsp/mips/loopfilter_masks_dspr2.h (99%) rename vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c => vpx_dsp/mips/loopfilter_mb_dspr2.c (99%) rename vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c => vpx_dsp/mips/loopfilter_mb_horiz_dspr2.c (99%) rename vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c => vpx_dsp/mips/loopfilter_mb_vert_dspr2.c (99%) diff --git a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c b/vpx_dsp/mips/loopfilter_filters_dspr2.c similarity index 98% rename from vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c rename to vpx_dsp/mips/loopfilter_filters_dspr2.c index 29eaa7931..a9cbc2bf1 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c +++ b/vpx_dsp/mips/loopfilter_filters_dspr2.c @@ -10,12 +10,12 @@ #include -#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 5ff25e33d..f0efad9ca 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h +++ b/vpx_dsp/mips/loopfilter_filters_dspr2.h @@ -13,7 +13,7 @@ #include -#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 df4cb00c4..994ff185a 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h +++ b/vpx_dsp/mips/loopfilter_macros_dspr2.h @@ -13,7 +13,7 @@ #include -#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 a6fc3f05a..3a69441ba 100644 --- a/vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h +++ b/vpx_dsp/mips/loopfilter_masks_dspr2.h @@ -13,7 +13,7 @@ #include -#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 99% rename from vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c rename to vpx_dsp/mips/loopfilter_mb_dspr2.c index 61eedd84d..f0abf50ec 100644 --- a/vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c +++ b/vpx_dsp/mips/loopfilter_mb_dspr2.c @@ -10,12 +10,12 @@ #include -#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 99% rename from vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c rename to vpx_dsp/mips/loopfilter_mb_horiz_dspr2.c index 64aec08e8..c5d4f11f6 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 -#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 99% rename from vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c rename to vpx_dsp/mips/loopfilter_mb_vert_dspr2.c index 97e080136..c9f6a1e63 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 -#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 -- 2.40.0