[SCM] libav/experimental: better separation of vp3dsp functions from dsputil_mmx.c

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5b0b7054b481ccc5fb55855f0b288d105e2286da
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Wed May 16 23:23:45 2007 +0000

    better separation of vp3dsp functions from dsputil_mmx.c
    
    Originally committed as revision 9039 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index 063d023..b7a454b 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -27,6 +27,8 @@
 #include "mpegvideo.h"
 #include "x86_cpu.h"
 #include "mmx.h"
+#include "vp3dsp_mmx.h"
+#include "vp3dsp_sse2.h"
 
 //#undef NDEBUG
 //#include <assert.h>
@@ -2871,10 +2873,6 @@ void ff_avg_cavs_qpel16_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride) {
 void ff_mmx_idct(DCTELEM *block);
 void ff_mmxext_idct(DCTELEM *block);
 
-void ff_vp3_idct_sse2(int16_t *input_data);
-void ff_vp3_idct_mmx(int16_t *data);
-void ff_vp3_dsp_init_mmx(void);
-
 /* XXX: those functions should be suppressed ASAP when all IDCTs are
    converted */
 #ifdef CONFIG_GPL
@@ -2899,26 +2897,6 @@ static void ff_libmpeg2mmx2_idct_add(uint8_t *dest, int line_size, DCTELEM *bloc
     add_pixels_clamped_mmx(block, dest, line_size);
 }
 #endif
-static void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block)
-{
-    ff_vp3_idct_sse2(block);
-    put_signed_pixels_clamped_mmx(block, dest, line_size);
-}
-static void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block)
-{
-    ff_vp3_idct_sse2(block);
-    add_pixels_clamped_mmx(block, dest, line_size);
-}
-static void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block)
-{
-    ff_vp3_idct_mmx(block);
-    put_signed_pixels_clamped_mmx(block, dest, line_size);
-}
-static void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block)
-{
-    ff_vp3_idct_mmx(block);
-    add_pixels_clamped_mmx(block, dest, line_size);
-}
 static void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_idct_xvid_mmx (block);
diff --git a/libavcodec/i386/vp3dsp_mmx.c b/libavcodec/i386/vp3dsp_mmx.c
index 363ea02..d71a2b4 100644
--- a/libavcodec/i386/vp3dsp_mmx.c
+++ b/libavcodec/i386/vp3dsp_mmx.c
@@ -322,3 +322,15 @@ void ff_vp3_idct_mmx(int16_t *output_data)
 #undef J
 
 }
+
+void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block)
+{
+    ff_vp3_idct_mmx(block);
+    put_signed_pixels_clamped_mmx(block, dest, line_size);
+}
+
+void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block)
+{
+    ff_vp3_idct_mmx(block);
+    add_pixels_clamped_mmx(block, dest, line_size);
+}
diff --git a/libavcodec/xvid_internal.h b/libavcodec/i386/vp3dsp_mmx.h
similarity index 66%
copy from libavcodec/xvid_internal.h
copy to libavcodec/i386/vp3dsp_mmx.h
index 49c59c2..99c81c5 100644
--- a/libavcodec/xvid_internal.h
+++ b/libavcodec/i386/vp3dsp_mmx.h
@@ -1,5 +1,6 @@
 /*
- * copyright (C) 2006 Corey Hickey
+ * vp3dsp mmx functions declarations
+ * Copyright (c) 2007 Aurelien Jacobs <aurel at gnuage.org>
  *
  * This file is part of FFmpeg.
  *
@@ -18,15 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef XVID_INTERNAL_H
-#define XVID_INTERNAL_H
-
-/**
- * @file xvid_internal.h
- * common functions for use with the XviD wrappers
- */
+#ifndef VP3DSP_MMX_H
+#define VP3DSP_MMX_H
 
+#include "dsputil.h"
 
-int av_tempfile(char *prefix, char **filename);
+void ff_vp3_idct_mmx(int16_t *data);
+void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block);
+void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block);
+void ff_vp3_dsp_init_mmx(void);
 
-#endif /* XVID_INTERNAL_H */
+#endif /* VP3DSP_MMX_H */
diff --git a/libavcodec/i386/vp3dsp_sse2.c b/libavcodec/i386/vp3dsp_sse2.c
index 8da2e68..74cdfe9 100644
--- a/libavcodec/i386/vp3dsp_sse2.c
+++ b/libavcodec/i386/vp3dsp_sse2.c
@@ -825,3 +825,15 @@ void ff_vp3_idct_sse2(int16_t *input_data)
 
     SSE2_Column_IDCT();
 }
+
+void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block)
+{
+    ff_vp3_idct_sse2(block);
+    put_signed_pixels_clamped_mmx(block, dest, line_size);
+}
+
+void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block)
+{
+    ff_vp3_idct_sse2(block);
+    add_pixels_clamped_mmx(block, dest, line_size);
+}
diff --git a/libavcodec/xvid_internal.h b/libavcodec/i386/vp3dsp_sse2.h
similarity index 67%
copy from libavcodec/xvid_internal.h
copy to libavcodec/i386/vp3dsp_sse2.h
index 49c59c2..db5b815 100644
--- a/libavcodec/xvid_internal.h
+++ b/libavcodec/i386/vp3dsp_sse2.h
@@ -1,5 +1,6 @@
 /*
- * copyright (C) 2006 Corey Hickey
+ * vp3dsp sse2 functions declarations
+ * Copyright (c) 2007 Aurelien Jacobs <aurel at gnuage.org>
  *
  * This file is part of FFmpeg.
  *
@@ -18,15 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef XVID_INTERNAL_H
-#define XVID_INTERNAL_H
-
-/**
- * @file xvid_internal.h
- * common functions for use with the XviD wrappers
- */
+#ifndef VP3DSP_SSE2_H
+#define VP3DSP_SSE2_H
 
+#include "dsputil.h"
 
-int av_tempfile(char *prefix, char **filename);
+void ff_vp3_idct_sse2(int16_t *input_data);
+void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
+void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block);
 
-#endif /* XVID_INTERNAL_H */
+#endif /* VP3DSP_SSE2_H */

-- 
Libav/FFmpeg packaging