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. Originally committed as revision 15730 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -24,7 +24,7 @@ | |||||
#define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt | #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 SET_RND(regd) __asm__ volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12"); | ||||
#define WAVG2B "wavg2b" | #define WAVG2B "wavg2b" | ||||
#include "dsputil_iwmmxt_rnd.h" | |||||
#include "dsputil_iwmmxt_rnd_template.c" | |||||
#undef DEF | #undef DEF | ||||
#undef SET_RND | #undef SET_RND | ||||
#undef WAVG2B | #undef WAVG2B | ||||
@@ -32,7 +32,7 @@ | |||||
#define DEF(x, y) x ## _ ## y ##_iwmmxt | #define DEF(x, y) x ## _ ## y ##_iwmmxt | ||||
#define SET_RND(regd) __asm__ volatile ("mov r12, #2 \n\t tbcsth " #regd ", r12":::"r12"); | #define SET_RND(regd) __asm__ volatile ("mov r12, #2 \n\t tbcsth " #regd ", r12":::"r12"); | ||||
#define WAVG2B "wavg2br" | #define WAVG2B "wavg2br" | ||||
#include "dsputil_iwmmxt_rnd.h" | |||||
#include "dsputil_iwmmxt_rnd_template.c" | |||||
#undef DEF | #undef DEF | ||||
#undef SET_RND | #undef SET_RND | ||||
#undef WAVG2BR | #undef WAVG2BR | ||||
@@ -155,7 +155,7 @@ DECLARE_ALIGNED_16(const double, ff_pd_2[2]) = { 2.0, 2.0 }; | |||||
#define PAVGBP(a, b, c, d, e, f) PAVGBP_MMX_NO_RND(a, b, c, d, e, f) | #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) | #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 DEF | ||||
#undef SET_RND | #undef SET_RND | ||||
@@ -169,7 +169,7 @@ DECLARE_ALIGNED_16(const double, ff_pd_2[2]) = { 2.0, 2.0 }; | |||||
#define PAVGBP(a, b, c, d, e, f) PAVGBP_MMX(a, b, c, d, e, f) | #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) | #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 DEF | ||||
#undef SET_RND | #undef SET_RND | ||||
@@ -182,7 +182,7 @@ DECLARE_ALIGNED_16(const double, ff_pd_2[2]) = { 2.0, 2.0 }; | |||||
#define DEF(x) x ## _3dnow | #define DEF(x) x ## _3dnow | ||||
#define PAVGB "pavgusb" | #define PAVGB "pavgusb" | ||||
#include "dsputil_mmx_avg.h" | |||||
#include "dsputil_mmx_avg_template.c" | |||||
#undef DEF | #undef DEF | ||||
#undef PAVGB | #undef PAVGB | ||||
@@ -195,7 +195,7 @@ DECLARE_ALIGNED_16(const double, ff_pd_2[2]) = { 2.0, 2.0 }; | |||||
/* Introduced only in MMX2 set */ | /* Introduced only in MMX2 set */ | ||||
#define PAVGB "pavgb" | #define PAVGB "pavgb" | ||||
#include "dsputil_mmx_avg.h" | |||||
#include "dsputil_mmx_avg_template.c" | |||||
#undef DEF | #undef DEF | ||||
#undef PAVGB | #undef PAVGB | ||||
@@ -1304,7 +1304,7 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, int si | |||||
#define SET_RND MOVQ_WONE | #define SET_RND MOVQ_WONE | ||||
#define SCALE_OFFSET 1 | #define SCALE_OFFSET 1 | ||||
#include "dsputil_mmx_qns.h" | |||||
#include "dsputil_mmx_qns_template.c" | |||||
#undef DEF | #undef DEF | ||||
#undef SET_RND | #undef SET_RND | ||||
@@ -1318,7 +1318,7 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, int si | |||||
"pmulhrw " #s ", "#x " \n\t"\ | "pmulhrw " #s ", "#x " \n\t"\ | ||||
"pmulhrw " #s ", "#y " \n\t" | "pmulhrw " #s ", "#y " \n\t" | ||||
#include "dsputil_mmx_qns.h" | |||||
#include "dsputil_mmx_qns_template.c" | |||||
#undef DEF | #undef DEF | ||||
#undef SET_RND | #undef SET_RND | ||||
@@ -1337,7 +1337,7 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, int si | |||||
"pmulhrsw " #s ", "#x " \n\t"\ | "pmulhrsw " #s ", "#x " \n\t"\ | ||||
"pmulhrsw " #s ", "#y " \n\t" | "pmulhrsw " #s ", "#y " \n\t" | ||||
#include "dsputil_mmx_qns.h" | |||||
#include "dsputil_mmx_qns_template.c" | |||||
#undef DEF | #undef DEF | ||||
#undef SET_RND | #undef SET_RND | ||||
@@ -1416,7 +1416,7 @@ static inline unsigned int bitcopy_n(unsigned int a, int n) | |||||
#define BPP 2 | #define BPP 2 | ||||
#include "imgconvert_template.h" | |||||
#include "imgconvert_template.c" | |||||
/* rgb565 handling */ | /* rgb565 handling */ | ||||
@@ -1437,7 +1437,7 @@ static inline unsigned int bitcopy_n(unsigned int a, int n) | |||||
#define BPP 2 | #define BPP 2 | ||||
#include "imgconvert_template.h" | |||||
#include "imgconvert_template.c" | |||||
/* bgr24 handling */ | /* bgr24 handling */ | ||||
@@ -1459,7 +1459,7 @@ static inline unsigned int bitcopy_n(unsigned int a, int n) | |||||
#define BPP 3 | #define BPP 3 | ||||
#include "imgconvert_template.h" | |||||
#include "imgconvert_template.c" | |||||
#undef RGB_IN | #undef RGB_IN | ||||
#undef RGB_OUT | #undef RGB_OUT | ||||
@@ -1486,7 +1486,7 @@ static inline unsigned int bitcopy_n(unsigned int a, int n) | |||||
#define BPP 3 | #define BPP 3 | ||||
#include "imgconvert_template.h" | |||||
#include "imgconvert_template.c" | |||||
/* rgb32 handling */ | /* rgb32 handling */ | ||||
@@ -1517,7 +1517,7 @@ static inline unsigned int bitcopy_n(unsigned int a, int n) | |||||
#define BPP 4 | #define BPP 4 | ||||
#include "imgconvert_template.h" | |||||
#include "imgconvert_template.c" | |||||
static void mono_to_gray(AVPicture *dst, const AVPicture *src, | static void mono_to_gray(AVPicture *dst, const AVPicture *src, | ||||
int width, int height, int xor_mask) | int width, int height, int xor_mask) | ||||