From 8eefb36ca979857c8f297316536329e0965ed2e5 Mon Sep 17 00:00:00 2001
From: Jingning Han <jingning@google.com>
Date: Mon, 27 Jul 2015 14:56:43 -0700
Subject: [PATCH] Move forward dct sse2 header file to vpx_dsp

Change-Id: Iba03852ce778c956200818e3473cfb2b48cf8d8e
---
 vp9/encoder/x86/vp9_dct_sse2.c                              | 2 +-
 vp9/vp9cx.mk                                                | 1 -
 vpx_dsp/vpx_dsp.mk                                          | 1 +
 vpx_dsp/x86/fwd_txfm_impl_sse2.h                            | 2 +-
 .../x86/vp9_dct_sse2.h => vpx_dsp/x86/fwd_txfm_sse2.h       | 6 +++---
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename vp9/encoder/x86/vp9_dct_sse2.h => vpx_dsp/x86/fwd_txfm_sse2.h (99%)

diff --git a/vp9/encoder/x86/vp9_dct_sse2.c b/vp9/encoder/x86/vp9_dct_sse2.c
index fe2619838..f263c8440 100644
--- a/vp9/encoder/x86/vp9_dct_sse2.c
+++ b/vp9/encoder/x86/vp9_dct_sse2.c
@@ -13,8 +13,8 @@
 
 #include "./vp9_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp9/encoder/x86/vp9_dct_sse2.h"
 #include "vpx_dsp/txfm_common.h"
+#include "vpx_dsp/x86/fwd_txfm_sse2.h"
 #include "vpx_dsp/x86/txfm_common_sse2.h"
 #include "vpx_ports/mem.h"
 
diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk
index 50d52ed80..bfd77c29b 100644
--- a/vp9/vp9cx.mk
+++ b/vp9/vp9cx.mk
@@ -118,7 +118,6 @@ VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt_x86_64.asm
 
 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c
 VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3.c
-VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.h
 VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct32x32_sse2_impl.h
 
 ifeq ($(CONFIG_VP9_TEMPORAL_DENOISING),yes)
diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk
index 1f31651bf..e3bf5a2c5 100644
--- a/vpx_dsp/vpx_dsp.mk
+++ b/vpx_dsp/vpx_dsp.mk
@@ -68,6 +68,7 @@ DSP_SRCS-$(HAVE_MSA)    += mips/txfm_macros_msa.h
 ifeq ($(CONFIG_VP9_ENCODER),yes)
 DSP_SRCS-yes            += fwd_txfm.c
 DSP_SRCS-yes            += fwd_txfm.h
+DSP_SRCS-$(HAVE_SSE2)   += x86/fwd_txfm_sse2.h
 DSP_SRCS-$(HAVE_SSE2)   += x86/fwd_txfm_sse2.c
 DSP_SRCS-$(HAVE_SSE2)   += x86/fwd_txfm_impl_sse2.h
 ifeq ($(ARCH_X86_64),yes)
diff --git a/vpx_dsp/x86/fwd_txfm_impl_sse2.h b/vpx_dsp/x86/fwd_txfm_impl_sse2.h
index abe06aae2..1f6b30256 100644
--- a/vpx_dsp/x86/fwd_txfm_impl_sse2.h
+++ b/vpx_dsp/x86/fwd_txfm_impl_sse2.h
@@ -11,8 +11,8 @@
 #include <emmintrin.h>  // SSE2
 
 #include "./vpx_dsp_rtcd.h"
-#include "vp9/encoder/x86/vp9_dct_sse2.h"
 #include "vpx_dsp/txfm_common.h"
+#include "vpx_dsp/x86/fwd_txfm_sse2.h"
 #include "vpx_dsp/x86/txfm_common_sse2.h"
 #include "vpx_ports/mem.h"
 
diff --git a/vp9/encoder/x86/vp9_dct_sse2.h b/vpx_dsp/x86/fwd_txfm_sse2.h
similarity index 99%
rename from vp9/encoder/x86/vp9_dct_sse2.h
rename to vpx_dsp/x86/fwd_txfm_sse2.h
index e2d8666fd..94d5befbf 100644
--- a/vp9/encoder/x86/vp9_dct_sse2.h
+++ b/vpx_dsp/x86/fwd_txfm_sse2.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef VP9_ENCODER_X86_VP9_DCT_SSE2_H_
-#define VP9_ENCODER_X86_VP9_DCT_SSE2_H_
+#ifndef VPX_DSP_X86_FWD_TXFM_SSE2_H_
+#define VPX_DSP_X86_FWD_TXFM_SSE2_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -451,4 +451,4 @@ static INLINE void transpose_and_output8x8(
 }  // extern "C"
 #endif
 
-#endif  // VP9_ENCODER_X86_VP9_DCT_SSE2_H_
+#endif  // VPX_DSP_X86_FWD_TXFM_SSE2_H_
-- 
2.49.0