[libav-devel] [PATCH 127/132] fdct: Move x86-specific declarations to a header in the x86 directory

[Diego Biurrun]

---
 libavcodec/dct-test.c                     |  1 +
 libavcodec/dct.h                          |  4 ----
 libavcodec/x86/fdct.c                     |  1 +
 libavcodec/x86/{fdctdsp_init.c => fdct.h} | 30 +++++++-----------------------
 libavcodec/x86/fdctdsp_init.c             |  2 +-
 libavcodec/x86/mpegvideoenc_template.c    |  1 +
 6 files changed, 11 insertions(+), 28 deletions(-)
 copy libavcodec/x86/{fdctdsp_init.c => fdct.h} (50%)

diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 10aedcd..3e5a5dc 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -45,6 +45,7 @@
 #include "aandcttab.h"
 #include "faandct.h"
 #include "faanidct.h"
+#include "x86/fdct.h"
 #include "x86/idct_permutation.h"
 #include "x86/idct_xvid.h"
 #include "dctref.h"
diff --git a/libavcodec/dct.h b/libavcodec/dct.h
index 3de10b9..3fd4e27 100644
--- a/libavcodec/dct.h
+++ b/libavcodec/dct.h
@@ -60,8 +60,4 @@ void ff_fdct248_islow_10(int16_t *data);
 
 void ff_j_rev_dct(int16_t *data);
 
-void ff_fdct_mmx(int16_t *block);
-void ff_fdct_mmxext(int16_t *block);
-void ff_fdct_sse2(int16_t *block);
-
 #endif /* AVCODEC_DCT_H */
diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c
index 6c95439..253be63 100644
--- a/libavcodec/x86/fdct.c
+++ b/libavcodec/x86/fdct.c
@@ -33,6 +33,7 @@
 #include "libavutil/common.h"
 #include "libavutil/x86/asm.h"
 #include "libavcodec/dct.h"
+#include "fdct.h"
 
 #if HAVE_MMX_INLINE
 
diff --git a/libavcodec/x86/fdctdsp_init.c b/libavcodec/x86/fdct.h
similarity index 50%
copy from libavcodec/x86/fdctdsp_init.c
copy to libavcodec/x86/fdct.h
index 93fdd65..c94a977 100644
--- a/libavcodec/x86/fdctdsp_init.c
+++ b/libavcodec/x86/fdct.h
@@ -16,29 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/attributes.h"
-#include "libavutil/cpu.h"
-#include "libavutil/x86/cpu.h"
-#include "libavcodec/avcodec.h"
-#include "libavcodec/dct.h"
-#include "libavcodec/fdctdsp.h"
+#ifndef AVCODEC_X86_FDCT_H
+#define AVCODEC_X86_FDCT_H
 
-av_cold void ff_fdctdsp_init_x86(FDCTDSPContext *c, AVCodecContext *avctx,
-                                 unsigned high_bit_depth)
-{
-    int cpu_flags = av_get_cpu_flags();
-    const int dct_algo = avctx->dct_algo;
+#include <stdint.h>
 
-    if (!high_bit_depth) {
-        if ((dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX)) {
-            if (INLINE_MMX(cpu_flags))
-                c->fdct = ff_fdct_mmx;
+void ff_fdct_mmx(int16_t *block);
+void ff_fdct_mmxext(int16_t *block);
+void ff_fdct_sse2(int16_t *block);
 
-            if (INLINE_MMXEXT(cpu_flags))
-                c->fdct = ff_fdct_mmxext;
-
-            if (INLINE_SSE2(cpu_flags))
-                c->fdct = ff_fdct_sse2;
-        }
-    }
-}
+#endif /* AVCODEC_X86_FDCT_H */
diff --git a/libavcodec/x86/fdctdsp_init.c b/libavcodec/x86/fdctdsp_init.c
index 93fdd65..4e8e4eb 100644
--- a/libavcodec/x86/fdctdsp_init.c
+++ b/libavcodec/x86/fdctdsp_init.c
@@ -20,8 +20,8 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dct.h"
 #include "libavcodec/fdctdsp.h"
+#include "fdct.h"
 
 av_cold void ff_fdctdsp_init_x86(FDCTDSPContext *c, AVCodecContext *avctx,
                                  unsigned high_bit_depth)
diff --git a/libavcodec/x86/mpegvideoenc_template.c 
b/libavcodec/x86/mpegvideoenc_template.c
index 487da00..fe88f0f 100644
--- a/libavcodec/x86/mpegvideoenc_template.c
+++ b/libavcodec/x86/mpegvideoenc_template.c
@@ -25,6 +25,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/x86/asm.h"
 #include "libavcodec/mpegvideo.h"
+#include "fdct.h"
 
 #undef MMREG_WIDTH
 #undef MM
-- 
1.8.3.2

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel