[FFmpeg-cvslog] r24987 - in trunk/libavcodec/x86: cavsdsp_mmx.c dsputil_mmx.c dsputil_mmx.h h264dsp_mmx.c idct_sse2_xvid.c simple_idct_mmx.c vp3dsp_mmx.c vp3dsp_sse2.c
rbultje
subversion
Mon Aug 30 18:22:28 CEST 2010
Author: rbultje
Date: Mon Aug 30 18:22:27 2010
New Revision: 24987
Log:
Put ff_ prefix on non-static {put_signed,put,add}_pixels_clamped_mmx()
functions.
Modified:
trunk/libavcodec/x86/cavsdsp_mmx.c
trunk/libavcodec/x86/dsputil_mmx.c
trunk/libavcodec/x86/dsputil_mmx.h
trunk/libavcodec/x86/h264dsp_mmx.c
trunk/libavcodec/x86/idct_sse2_xvid.c
trunk/libavcodec/x86/simple_idct_mmx.c
trunk/libavcodec/x86/vp3dsp_mmx.c
trunk/libavcodec/x86/vp3dsp_sse2.c
Modified: trunk/libavcodec/x86/cavsdsp_mmx.c
==============================================================================
--- trunk/libavcodec/x86/cavsdsp_mmx.c Mon Aug 30 00:21:29 2010 (r24986)
+++ trunk/libavcodec/x86/cavsdsp_mmx.c Mon Aug 30 18:22:27 2010 (r24987)
@@ -173,7 +173,7 @@ static void cavs_idct8_add_mmx(uint8_t *
);
}
- add_pixels_clamped_mmx(b2, dst, stride);
+ ff_add_pixels_clamped_mmx(b2, dst, stride);
}
/*****************************************************************************
Modified: trunk/libavcodec/x86/dsputil_mmx.c
==============================================================================
--- trunk/libavcodec/x86/dsputil_mmx.c Mon Aug 30 00:21:29 2010 (r24986)
+++ trunk/libavcodec/x86/dsputil_mmx.c Mon Aug 30 18:22:27 2010 (r24987)
@@ -228,7 +228,7 @@ DECLARE_ALIGNED(16, const double, ff_pd_
/***********************************/
/* 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;
uint8_t *pix;
@@ -304,7 +304,7 @@ DECLARE_ASM_CONST(8, uint8_t, ff_vector1
"movq %%mm3, (%0, %3, 2) \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_skip3;
@@ -320,7 +320,7 @@ void put_signed_pixels_clamped_mmx(const
:"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;
uint8_t *pix;
@@ -1851,43 +1851,43 @@ void ff_avg_vc1_mspel_mc00_mmx2(uint8_t
static void ff_libmpeg2mmx_idct_put(uint8_t *dest, int line_size, DCTELEM *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)
{
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)
{
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)
{
ff_mmxext_idct (block);
- add_pixels_clamped_mmx(block, dest, line_size);
+ ff_add_pixels_clamped_mmx(block, dest, line_size);
}
#endif
static void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, DCTELEM *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)
{
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)
{
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)
{
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)
@@ -2579,9 +2579,9 @@ void dsputil_init_mmx(DSPContext* c, AVC
}
}
- 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_blocks = clear_blocks_mmx;
if ((mm_flags & FF_MM_SSE) &&
Modified: trunk/libavcodec/x86/dsputil_mmx.h
==============================================================================
--- trunk/libavcodec/x86/dsputil_mmx.h Mon Aug 30 00:21:29 2010 (r24986)
+++ trunk/libavcodec/x86/dsputil_mmx.h Mon Aug 30 18:22:27 2010 (r24987)
@@ -158,9 +158,9 @@ extern const double ff_pd_2[2];
void dsputilenc_init_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_avg_cavs_qpel8_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride);
Modified: trunk/libavcodec/x86/h264dsp_mmx.c
==============================================================================
--- trunk/libavcodec/x86/h264dsp_mmx.c Mon Aug 30 00:21:29 2010 (r24986)
+++ trunk/libavcodec/x86/h264dsp_mmx.c Mon Aug 30 18:22:27 2010 (r24987)
@@ -212,7 +212,7 @@ static void ff_h264_idct8_add_mmx(uint8_
);
}
- add_pixels_clamped_mmx(b2, dst, stride);
+ ff_add_pixels_clamped_mmx(b2, dst, stride);
}
#define STORE_DIFF_8P( p, d, t, z )\
Modified: trunk/libavcodec/x86/idct_sse2_xvid.c
==============================================================================
--- trunk/libavcodec/x86/idct_sse2_xvid.c Mon Aug 30 00:21:29 2010 (r24986)
+++ trunk/libavcodec/x86/idct_sse2_xvid.c Mon Aug 30 18:22:27 2010 (r24987)
@@ -385,11 +385,11 @@ inline void ff_idct_xvid_sse2(short *blo
void ff_idct_xvid_sse2_put(uint8_t *dest, int line_size, short *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)
{
ff_idct_xvid_sse2(block);
- add_pixels_clamped_mmx(block, dest, line_size);
+ ff_add_pixels_clamped_mmx(block, dest, line_size);
}
Modified: trunk/libavcodec/x86/simple_idct_mmx.c
==============================================================================
--- trunk/libavcodec/x86/simple_idct_mmx.c Mon Aug 30 00:21:29 2010 (r24986)
+++ trunk/libavcodec/x86/simple_idct_mmx.c Mon Aug 30 18:22:27 2010 (r24987)
@@ -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)
{
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)
{
idct(block);
- add_pixels_clamped_mmx(block, dest, line_size);
+ ff_add_pixels_clamped_mmx(block, dest, line_size);
}
Modified: trunk/libavcodec/x86/vp3dsp_mmx.c
==============================================================================
--- trunk/libavcodec/x86/vp3dsp_mmx.c Mon Aug 30 00:21:29 2010 (r24986)
+++ trunk/libavcodec/x86/vp3dsp_mmx.c Mon Aug 30 18:22:27 2010 (r24987)
@@ -387,13 +387,13 @@ void ff_vp3_idct_mmx(int16_t *output_dat
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);
+ ff_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);
+ ff_add_pixels_clamped_mmx(block, dest, line_size);
}
void ff_vp3_idct_dc_add_mmx2(uint8_t *dest, int linesize, const DCTELEM *block)
Modified: trunk/libavcodec/x86/vp3dsp_sse2.c
==============================================================================
--- trunk/libavcodec/x86/vp3dsp_sse2.c Mon Aug 30 00:21:29 2010 (r24986)
+++ trunk/libavcodec/x86/vp3dsp_sse2.c Mon Aug 30 18:22:27 2010 (r24987)
@@ -177,11 +177,11 @@ void ff_vp3_idct_sse2(int16_t *input_dat
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);
+ ff_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);
+ ff_add_pixels_clamped_mmx(block, dest, line_size);
}
More information about the ffmpeg-cvslog
mailing list