functions. Originally committed as revision 24987 to svn://svn.ffmpeg.org/ffmpeg/trunktags/n0.8
@@ -173,7 +173,7 @@ static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride) | |||||
); | ); | ||||
} | } | ||||
add_pixels_clamped_mmx(b2, dst, stride); | |||||
ff_add_pixels_clamped_mmx(b2, dst, stride); | |||||
} | } | ||||
/***************************************************************************** | /***************************************************************************** | ||||
@@ -228,7 +228,7 @@ DECLARE_ALIGNED(16, const double, ff_pd_2)[2] = { 2.0, 2.0 }; | |||||
/***********************************/ | /***********************************/ | ||||
/* standard MMX */ | /* standard MMX */ | ||||
void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size) | |||||
void ff_put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size) | |||||
{ | { | ||||
const DCTELEM *p; | const DCTELEM *p; | ||||
uint8_t *pix; | uint8_t *pix; | ||||
@@ -304,7 +304,7 @@ DECLARE_ASM_CONST(8, uint8_t, ff_vector128)[8] = | |||||
"movq %%mm3, (%0, %3, 2) \n\t"\ | "movq %%mm3, (%0, %3, 2) \n\t"\ | ||||
"movq %%mm4, (%0, %1) \n\t" | "movq %%mm4, (%0, %1) \n\t" | ||||
void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size) | |||||
void ff_put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size) | |||||
{ | { | ||||
x86_reg line_skip = line_size; | x86_reg line_skip = line_size; | ||||
x86_reg line_skip3; | x86_reg line_skip3; | ||||
@@ -320,7 +320,7 @@ void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int li | |||||
:"memory"); | :"memory"); | ||||
} | } | ||||
void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size) | |||||
void ff_add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size) | |||||
{ | { | ||||
const DCTELEM *p; | const DCTELEM *p; | ||||
uint8_t *pix; | uint8_t *pix; | ||||
@@ -1851,43 +1851,43 @@ void ff_avg_vc1_mspel_mc00_mmx2(uint8_t *dst, const uint8_t *src, int stride, in | |||||
static void ff_libmpeg2mmx_idct_put(uint8_t *dest, int line_size, DCTELEM *block) | static void ff_libmpeg2mmx_idct_put(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_mmx_idct (block); | ff_mmx_idct (block); | ||||
put_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_put_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
static void ff_libmpeg2mmx_idct_add(uint8_t *dest, int line_size, DCTELEM *block) | static void ff_libmpeg2mmx_idct_add(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_mmx_idct (block); | ff_mmx_idct (block); | ||||
add_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_add_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
static void ff_libmpeg2mmx2_idct_put(uint8_t *dest, int line_size, DCTELEM *block) | static void ff_libmpeg2mmx2_idct_put(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_mmxext_idct (block); | ff_mmxext_idct (block); | ||||
put_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_put_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
static void ff_libmpeg2mmx2_idct_add(uint8_t *dest, int line_size, DCTELEM *block) | static void ff_libmpeg2mmx2_idct_add(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_mmxext_idct (block); | ff_mmxext_idct (block); | ||||
add_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_add_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
#endif | #endif | ||||
static void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, DCTELEM *block) | static void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_idct_xvid_mmx (block); | ff_idct_xvid_mmx (block); | ||||
put_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_put_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
static void ff_idct_xvid_mmx_add(uint8_t *dest, int line_size, DCTELEM *block) | static void ff_idct_xvid_mmx_add(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_idct_xvid_mmx (block); | ff_idct_xvid_mmx (block); | ||||
add_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_add_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
static void ff_idct_xvid_mmx2_put(uint8_t *dest, int line_size, DCTELEM *block) | static void ff_idct_xvid_mmx2_put(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_idct_xvid_mmx2 (block); | ff_idct_xvid_mmx2 (block); | ||||
put_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_put_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
static void ff_idct_xvid_mmx2_add(uint8_t *dest, int line_size, DCTELEM *block) | static void ff_idct_xvid_mmx2_add(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_idct_xvid_mmx2 (block); | ff_idct_xvid_mmx2 (block); | ||||
add_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_add_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize) | static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize) | ||||
@@ -2579,9 +2579,9 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) | |||||
} | } | ||||
} | } | ||||
c->put_pixels_clamped = put_pixels_clamped_mmx; | |||||
c->put_signed_pixels_clamped = put_signed_pixels_clamped_mmx; | |||||
c->add_pixels_clamped = add_pixels_clamped_mmx; | |||||
c->put_pixels_clamped = ff_put_pixels_clamped_mmx; | |||||
c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_mmx; | |||||
c->add_pixels_clamped = ff_add_pixels_clamped_mmx; | |||||
c->clear_block = clear_block_mmx; | c->clear_block = clear_block_mmx; | ||||
c->clear_blocks = clear_blocks_mmx; | c->clear_blocks = clear_blocks_mmx; | ||||
if ((mm_flags & FF_MM_SSE) && | if ((mm_flags & FF_MM_SSE) && | ||||
@@ -158,9 +158,9 @@ extern const double ff_pd_2[2]; | |||||
void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx); | void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx); | ||||
void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); | void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); | ||||
void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); | |||||
void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); | |||||
void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); | |||||
void ff_add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); | |||||
void ff_put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); | |||||
void ff_put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); | |||||
void ff_put_cavs_qpel8_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride); | void ff_put_cavs_qpel8_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride); | ||||
void ff_avg_cavs_qpel8_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride); | void ff_avg_cavs_qpel8_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride); | ||||
@@ -212,7 +212,7 @@ static void ff_h264_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride) | |||||
); | ); | ||||
} | } | ||||
add_pixels_clamped_mmx(b2, dst, stride); | |||||
ff_add_pixels_clamped_mmx(b2, dst, stride); | |||||
} | } | ||||
#define STORE_DIFF_8P( p, d, t, z )\ | #define STORE_DIFF_8P( p, d, t, z )\ | ||||
@@ -385,11 +385,11 @@ inline void ff_idct_xvid_sse2(short *block) | |||||
void ff_idct_xvid_sse2_put(uint8_t *dest, int line_size, short *block) | void ff_idct_xvid_sse2_put(uint8_t *dest, int line_size, short *block) | ||||
{ | { | ||||
ff_idct_xvid_sse2(block); | ff_idct_xvid_sse2(block); | ||||
put_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_put_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
void ff_idct_xvid_sse2_add(uint8_t *dest, int line_size, short *block) | void ff_idct_xvid_sse2_add(uint8_t *dest, int line_size, short *block) | ||||
{ | { | ||||
ff_idct_xvid_sse2(block); | ff_idct_xvid_sse2(block); | ||||
add_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_add_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } |
@@ -1287,10 +1287,10 @@ void ff_simple_idct_mmx(int16_t *block) | |||||
void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block) | void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
idct(block); | idct(block); | ||||
put_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_put_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block) | void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
idct(block); | idct(block); | ||||
add_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_add_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } |
@@ -387,13 +387,13 @@ void ff_vp3_idct_mmx(int16_t *output_data) | |||||
void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block) | void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_vp3_idct_mmx(block); | ff_vp3_idct_mmx(block); | ||||
put_signed_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_put_signed_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block) | void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_vp3_idct_mmx(block); | ff_vp3_idct_mmx(block); | ||||
add_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_add_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
void ff_vp3_idct_dc_add_mmx2(uint8_t *dest, int linesize, const DCTELEM *block) | void ff_vp3_idct_dc_add_mmx2(uint8_t *dest, int linesize, const DCTELEM *block) | ||||
@@ -177,11 +177,11 @@ 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_put_sse2(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_vp3_idct_sse2(block); | ff_vp3_idct_sse2(block); | ||||
put_signed_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_put_signed_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } | ||||
void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block) | void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block) | ||||
{ | { | ||||
ff_vp3_idct_sse2(block); | ff_vp3_idct_sse2(block); | ||||
add_pixels_clamped_mmx(block, dest, line_size); | |||||
ff_add_pixels_clamped_mmx(block, dest, line_size); | |||||
} | } |