Originally committed as revision 10763 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -19,6 +19,9 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef FFMPEG_DSPUTIL_IWMMXT_RND_H | |||||
| #define FFMPEG_DSPUTIL_IWMMXT_RND_H | |||||
| void DEF(put, pixels8)(uint8_t *block, const uint8_t *pixels, const int line_size, int h) | void DEF(put, pixels8)(uint8_t *block, const uint8_t *pixels, const int line_size, int h) | ||||
| { | { | ||||
| int stride = line_size; | int stride = line_size; | ||||
| @@ -1112,3 +1115,5 @@ void DEF(avg, pixels16_xy2)(uint8_t *block, const uint8_t *pixels, const int lin | |||||
| : [line_size]"r"(line_size) | : [line_size]"r"(line_size) | ||||
| : "r12", "memory"); | : "r12", "memory"); | ||||
| } | } | ||||
| #endif /* FFMPEG_DSPUTIL_IWMMXT_RND_H */ | |||||
| @@ -29,6 +29,10 @@ DEFUN(put_pixels_clamped,mL1, | |||||
| rts; | rts; | ||||
| */ | */ | ||||
| #ifndef FFMPEG_CONFIG_BFIN_H | |||||
| #define FFMPEG_CONFIG_BFIN_H | |||||
| #ifndef DEFUN | #ifndef DEFUN | ||||
| #ifndef mL1 | #ifndef mL1 | ||||
| @@ -49,3 +53,4 @@ DEFUN(put_pixels_clamped,mL1, | |||||
| #endif | #endif | ||||
| #endif /* FFMPEG_CONFIG_BFIN_H */ | |||||
| @@ -24,6 +24,9 @@ | |||||
| * Various defines for YUV<->RGB conversion | * Various defines for YUV<->RGB conversion | ||||
| */ | */ | ||||
| #ifndef FFMPEG_COLORSPACE_H | |||||
| #define FFMPEG_COLORSPACE_H | |||||
| #define SCALEBITS 10 | #define SCALEBITS 10 | ||||
| #define ONE_HALF (1 << (SCALEBITS - 1)) | #define ONE_HALF (1 << (SCALEBITS - 1)) | ||||
| #define FIX(x) ((int) ((x) * (1<<SCALEBITS) + 0.5)) | #define FIX(x) ((int) ((x) * (1<<SCALEBITS) + 0.5)) | ||||
| @@ -105,3 +108,4 @@ static inline int C_JPEG_TO_CCIR(int y) { | |||||
| (((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 - \ | (((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 - \ | ||||
| FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) | FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) | ||||
| #endif /* FFMPEG_COLORSPACE_H */ | |||||
| @@ -24,6 +24,9 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef FFMPEG_DSPUTIL_MMX_AVG_H | |||||
| #define FFMPEG_DSPUTIL_MMX_AVG_H | |||||
| /* XXX: we use explicit registers to avoid a gcc 2.95.2 register asm | /* XXX: we use explicit registers to avoid a gcc 2.95.2 register asm | ||||
| clobber bug - now it will work with 2.95.2 and also with -fPIC | clobber bug - now it will work with 2.95.2 and also with -fPIC | ||||
| */ | */ | ||||
| @@ -869,3 +872,5 @@ QPEL_2TAP_L3(avg_) | |||||
| QPEL_2TAP_L3(put_) | QPEL_2TAP_L3(put_) | ||||
| #undef STORE_OP | #undef STORE_OP | ||||
| #undef QPEL_2TAP_L3 | #undef QPEL_2TAP_L3 | ||||
| #endif /* FFMPEG_DSPUTIL_MMX_AVG_H */ | |||||
| @@ -22,6 +22,9 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef FFMPEG_DSPUTIL_MMX_QNS_H | |||||
| #define FFMPEG_DSPUTIL_MMX_QNS_H | |||||
| #define MAX_ABS (512 >> (SCALE_OFFSET>0 ? SCALE_OFFSET : 0)) | #define MAX_ABS (512 >> (SCALE_OFFSET>0 ? SCALE_OFFSET : 0)) | ||||
| static int DEF(try_8x8basis)(int16_t rem[64], int16_t weight[64], int16_t basis[64], int scale) | static int DEF(try_8x8basis)(int16_t rem[64], int16_t weight[64], int16_t basis[64], int scale) | ||||
| @@ -100,3 +103,4 @@ static void DEF(add_8x8basis)(int16_t rem[64], int16_t basis[64], int scale) | |||||
| } | } | ||||
| } | } | ||||
| #endif /* FFMPEG_DSPUTIL_MMX_QNS_H */ | |||||
| @@ -24,6 +24,9 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef FFMPEG_DSPUTIL_MMX_RND_H | |||||
| #define FFMPEG_DSPUTIL_MMX_RND_H | |||||
| // put_pixels | // put_pixels | ||||
| static void DEF(put, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h) | static void DEF(put, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h) | ||||
| { | { | ||||
| @@ -589,4 +592,4 @@ static void DEF(avg, pixels16_xy2)(uint8_t *block, const uint8_t *pixels, int li | |||||
| DEF(avg, pixels8_xy2)(block+8, pixels+8, line_size, h); | DEF(avg, pixels8_xy2)(block+8, pixels+8, line_size, h); | ||||
| } | } | ||||
| #endif /* FFMPEG_DSPUTIL_MMX_RND_H */ | |||||