[FFmpeg-cvslog] r15730 - in trunk/libavcodec: armv4l/dsputil_iwmmxt.c armv4l/dsputil_iwmmxt_rnd.h armv4l/dsputil_iwmmxt_rnd_template.c i386/dsputil_mmx.c i386/dsputil_mmx_avg.h i386/dsputil_mmx_avg_template.c i386/dsputil_mmx_qns.h i386/dsputil_mmx_qns_template.c i386/dsputil_mmx_rnd.h i386/dsputil_mmx_rnd_template.c i386/dsputilenc_mmx.c imgconvert.c imgconvert_template.c imgconvert_template.h

flameeyes subversion
Mon Oct 27 15:35:58 CET 2008


Author: flameeyes
Date: Mon Oct 27 15:35:58 2008
New Revision: 15730

Log:
Rename template included sources from .h to _template.c.

There are multiple source files that are #include'd rather than
compiled, as they are used as template for generation of similar code,
like asm-optimised code. Some of these files are right now named with
a .h extension, although they are not header in any reasonable sense.

Rename them so that instead of being named with .h extension they are
named with _template.c as final part.



Added:
   trunk/libavcodec/armv4l/dsputil_iwmmxt_rnd_template.c   (props changed)
      - copied unchanged from r15728, /trunk/libavcodec/armv4l/dsputil_iwmmxt_rnd.h
   trunk/libavcodec/i386/dsputil_mmx_avg_template.c   (props changed)
      - copied unchanged from r15728, /trunk/libavcodec/i386/dsputil_mmx_avg.h
   trunk/libavcodec/i386/dsputil_mmx_qns_template.c   (props changed)
      - copied unchanged from r15728, /trunk/libavcodec/i386/dsputil_mmx_qns.h
   trunk/libavcodec/i386/dsputil_mmx_rnd_template.c   (props changed)
      - copied unchanged from r15728, /trunk/libavcodec/i386/dsputil_mmx_rnd.h
   trunk/libavcodec/imgconvert_template.c   (props changed)
      - copied unchanged from r15728, /trunk/libavcodec/imgconvert_template.h
Removed:
   trunk/libavcodec/armv4l/dsputil_iwmmxt_rnd.h
   trunk/libavcodec/i386/dsputil_mmx_avg.h
   trunk/libavcodec/i386/dsputil_mmx_qns.h
   trunk/libavcodec/i386/dsputil_mmx_rnd.h
   trunk/libavcodec/imgconvert_template.h
Modified:
   trunk/libavcodec/armv4l/dsputil_iwmmxt.c
   trunk/libavcodec/i386/dsputil_mmx.c
   trunk/libavcodec/i386/dsputilenc_mmx.c
   trunk/libavcodec/imgconvert.c

Modified: trunk/libavcodec/armv4l/dsputil_iwmmxt.c
==============================================================================
--- trunk/libavcodec/armv4l/dsputil_iwmmxt.c	(original)
+++ trunk/libavcodec/armv4l/dsputil_iwmmxt.c	Mon Oct 27 15:35:58 2008
@@ -24,7 +24,7 @@
 #define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt
 #define SET_RND(regd)  __asm__ volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12");
 #define WAVG2B "wavg2b"
-#include "dsputil_iwmmxt_rnd.h"
+#include "dsputil_iwmmxt_rnd_template.c"
 #undef DEF
 #undef SET_RND
 #undef WAVG2B
@@ -32,7 +32,7 @@
 #define DEF(x, y) x ## _ ## y ##_iwmmxt
 #define SET_RND(regd)  __asm__ volatile ("mov r12, #2 \n\t tbcsth " #regd ", r12":::"r12");
 #define WAVG2B "wavg2br"
-#include "dsputil_iwmmxt_rnd.h"
+#include "dsputil_iwmmxt_rnd_template.c"
 #undef DEF
 #undef SET_RND
 #undef WAVG2BR

Modified: trunk/libavcodec/i386/dsputil_mmx.c
==============================================================================
--- trunk/libavcodec/i386/dsputil_mmx.c	(original)
+++ trunk/libavcodec/i386/dsputil_mmx.c	Mon Oct 27 15:35:58 2008
@@ -155,7 +155,7 @@ DECLARE_ALIGNED_16(const double, ff_pd_2
 #define PAVGBP(a, b, c, d, e, f)        PAVGBP_MMX_NO_RND(a, b, c, d, e, f)
 #define PAVGB(a, b, c, e)               PAVGB_MMX_NO_RND(a, b, c, e)
 
-#include "dsputil_mmx_rnd.h"
+#include "dsputil_mmx_rnd_template.c"
 
 #undef DEF
 #undef SET_RND
@@ -169,7 +169,7 @@ DECLARE_ALIGNED_16(const double, ff_pd_2
 #define PAVGBP(a, b, c, d, e, f)        PAVGBP_MMX(a, b, c, d, e, f)
 #define PAVGB(a, b, c, e)               PAVGB_MMX(a, b, c, e)
 
-#include "dsputil_mmx_rnd.h"
+#include "dsputil_mmx_rnd_template.c"
 
 #undef DEF
 #undef SET_RND
@@ -182,7 +182,7 @@ DECLARE_ALIGNED_16(const double, ff_pd_2
 #define DEF(x) x ## _3dnow
 #define PAVGB "pavgusb"
 
-#include "dsputil_mmx_avg.h"
+#include "dsputil_mmx_avg_template.c"
 
 #undef DEF
 #undef PAVGB
@@ -195,7 +195,7 @@ DECLARE_ALIGNED_16(const double, ff_pd_2
 /* Introduced only in MMX2 set */
 #define PAVGB "pavgb"
 
-#include "dsputil_mmx_avg.h"
+#include "dsputil_mmx_avg_template.c"
 
 #undef DEF
 #undef PAVGB

Modified: trunk/libavcodec/i386/dsputilenc_mmx.c
==============================================================================
--- trunk/libavcodec/i386/dsputilenc_mmx.c	(original)
+++ trunk/libavcodec/i386/dsputilenc_mmx.c	Mon Oct 27 15:35:58 2008
@@ -1304,7 +1304,7 @@ static int ssd_int8_vs_int16_mmx(const i
 #define SET_RND MOVQ_WONE
 #define SCALE_OFFSET 1
 
-#include "dsputil_mmx_qns.h"
+#include "dsputil_mmx_qns_template.c"
 
 #undef DEF
 #undef SET_RND
@@ -1318,7 +1318,7 @@ static int ssd_int8_vs_int16_mmx(const i
     "pmulhrw " #s ", "#x "           \n\t"\
     "pmulhrw " #s ", "#y "           \n\t"
 
-#include "dsputil_mmx_qns.h"
+#include "dsputil_mmx_qns_template.c"
 
 #undef DEF
 #undef SET_RND
@@ -1337,7 +1337,7 @@ static int ssd_int8_vs_int16_mmx(const i
     "pmulhrsw " #s ", "#x "          \n\t"\
     "pmulhrsw " #s ", "#y "          \n\t"
 
-#include "dsputil_mmx_qns.h"
+#include "dsputil_mmx_qns_template.c"
 
 #undef DEF
 #undef SET_RND

Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c	(original)
+++ trunk/libavcodec/imgconvert.c	Mon Oct 27 15:35:58 2008
@@ -1416,7 +1416,7 @@ static inline unsigned int bitcopy_n(uns
 
 #define BPP 2
 
-#include "imgconvert_template.h"
+#include "imgconvert_template.c"
 
 /* rgb565 handling */
 
@@ -1437,7 +1437,7 @@ static inline unsigned int bitcopy_n(uns
 
 #define BPP 2
 
-#include "imgconvert_template.h"
+#include "imgconvert_template.c"
 
 /* bgr24 handling */
 
@@ -1459,7 +1459,7 @@ static inline unsigned int bitcopy_n(uns
 
 #define BPP 3
 
-#include "imgconvert_template.h"
+#include "imgconvert_template.c"
 
 #undef RGB_IN
 #undef RGB_OUT
@@ -1486,7 +1486,7 @@ static inline unsigned int bitcopy_n(uns
 
 #define BPP 3
 
-#include "imgconvert_template.h"
+#include "imgconvert_template.c"
 
 /* rgb32 handling */
 
@@ -1517,7 +1517,7 @@ static inline unsigned int bitcopy_n(uns
 
 #define BPP 4
 
-#include "imgconvert_template.h"
+#include "imgconvert_template.c"
 
 static void mono_to_gray(AVPicture *dst, const AVPicture *src,
                          int width, int height, int xor_mask)




More information about the ffmpeg-cvslog mailing list