diff options
author | Diego Biurrun <diego@biurrun.de> | 2016-09-07 17:02:06 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2016-09-29 14:48:03 +0200 |
commit | 2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428 (patch) | |
tree | da4a550527ba5dc67e81e3f384b048fc2250f583 /libavcodec/x86 | |
parent | b2939a75270bc7e971462648168aa3a2a48c1c8c (diff) | |
download | ffmpeg-streaming-2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428.zip ffmpeg-streaming-2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428.tar.gz |
idct: Change type of array stride parameters to ptrdiff_t
ptrdiff_t is the correct type for array strides and similar.
Diffstat (limited to 'libavcodec/x86')
-rw-r--r-- | libavcodec/x86/idctdsp.h | 7 | ||||
-rw-r--r-- | libavcodec/x86/idctdsp_mmx.c | 6 | ||||
-rw-r--r-- | libavcodec/x86/simple_idct.c | 4 | ||||
-rw-r--r-- | libavcodec/x86/simple_idct.h | 5 | ||||
-rw-r--r-- | libavcodec/x86/vc1dsp_mmx.c | 60 | ||||
-rw-r--r-- | libavcodec/x86/xvididct.h | 13 | ||||
-rw-r--r-- | libavcodec/x86/xvididct_mmx.c | 8 | ||||
-rw-r--r-- | libavcodec/x86/xvididct_sse2.c | 4 |
8 files changed, 55 insertions, 52 deletions
diff --git a/libavcodec/x86/idctdsp.h b/libavcodec/x86/idctdsp.h index 22df3dd..6e6c688 100644 --- a/libavcodec/x86/idctdsp.h +++ b/libavcodec/x86/idctdsp.h @@ -19,13 +19,14 @@ #ifndef AVCODEC_X86_IDCTDSP_H #define AVCODEC_X86_IDCTDSP_H +#include <stddef.h> #include <stdint.h> void ff_add_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, - int line_size); + ptrdiff_t line_size); void ff_put_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, - int line_size); + ptrdiff_t line_size); void ff_put_signed_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, - int line_size); + ptrdiff_t line_size); #endif /* AVCODEC_X86_IDCTDSP_H */ diff --git a/libavcodec/x86/idctdsp_mmx.c b/libavcodec/x86/idctdsp_mmx.c index 7285b1d..523f368 100644 --- a/libavcodec/x86/idctdsp_mmx.c +++ b/libavcodec/x86/idctdsp_mmx.c @@ -31,7 +31,7 @@ #if HAVE_INLINE_ASM void ff_put_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, - int line_size) + ptrdiff_t line_size) { const int16_t *p; uint8_t *pix; @@ -107,7 +107,7 @@ void ff_put_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, "movq %%mm4, (%0, %1) \n\t" void ff_put_signed_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, - int line_size) + ptrdiff_t line_size) { x86_reg line_skip = line_size; x86_reg line_skip3; @@ -124,7 +124,7 @@ void ff_put_signed_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, } void ff_add_pixels_clamped_mmx(const int16_t *block, uint8_t *pixels, - int line_size) + ptrdiff_t line_size) { const int16_t *p; uint8_t *pix; diff --git a/libavcodec/x86/simple_idct.c b/libavcodec/x86/simple_idct.c index 49784e2..0939a49 100644 --- a/libavcodec/x86/simple_idct.c +++ b/libavcodec/x86/simple_idct.c @@ -904,12 +904,12 @@ void ff_simple_idct_mmx(int16_t *block) //FIXME merge add/put into the idct -void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block) +void ff_simple_idct_put_mmx(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { idct(block); ff_put_pixels_clamped(block, dest, line_size); } -void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block) +void ff_simple_idct_add_mmx(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { idct(block); ff_add_pixels_clamped(block, dest, line_size); diff --git a/libavcodec/x86/simple_idct.h b/libavcodec/x86/simple_idct.h index 4fc2914..15784a9 100644 --- a/libavcodec/x86/simple_idct.h +++ b/libavcodec/x86/simple_idct.h @@ -19,10 +19,11 @@ #ifndef AVCODEC_X86_SIMPLE_IDCT_H #define AVCODEC_X86_SIMPLE_IDCT_H +#include <stddef.h> #include <stdint.h> void ff_simple_idct_mmx(int16_t *block); -void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block); -void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block); +void ff_simple_idct_add_mmx(uint8_t *dest, ptrdiff_t line_size, int16_t *block); +void ff_simple_idct_put_mmx(uint8_t *dest, ptrdiff_t line_size, int16_t *block); #endif /* AVCODEC_X86_SIMPLE_IDCT_H */ diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 9bbc234..d64ddf0 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -498,7 +498,7 @@ DECLARE_FUNCTION(3, 1) DECLARE_FUNCTION(3, 2) DECLARE_FUNCTION(3, 3) -static void vc1_inv_trans_4x4_dc_mmxext(uint8_t *dest, int linesize, +static void vc1_inv_trans_4x4_dc_mmxext(uint8_t *dest, ptrdiff_t stride, int16_t *block) { int dc = block[0]; @@ -530,14 +530,14 @@ static void vc1_inv_trans_4x4_dc_mmxext(uint8_t *dest, int linesize, "movd %%mm3, %1 \n\t" "movd %%mm4, %2 \n\t" "movd %%mm5, %3 \n\t" - :"+m"(*(uint32_t*)(dest+0*linesize)), - "+m"(*(uint32_t*)(dest+1*linesize)), - "+m"(*(uint32_t*)(dest+2*linesize)), - "+m"(*(uint32_t*)(dest+3*linesize)) + :"+m"(*(uint32_t *)(dest + 0 * stride)), + "+m"(*(uint32_t *)(dest + 1 * stride)), + "+m"(*(uint32_t *)(dest + 2 * stride)), + "+m"(*(uint32_t *)(dest + 3 * stride)) ); } -static void vc1_inv_trans_4x8_dc_mmxext(uint8_t *dest, int linesize, +static void vc1_inv_trans_4x8_dc_mmxext(uint8_t *dest, ptrdiff_t stride, int16_t *block) { int dc = block[0]; @@ -569,12 +569,12 @@ static void vc1_inv_trans_4x8_dc_mmxext(uint8_t *dest, int linesize, "movd %%mm3, %1 \n\t" "movd %%mm4, %2 \n\t" "movd %%mm5, %3 \n\t" - :"+m"(*(uint32_t*)(dest+0*linesize)), - "+m"(*(uint32_t*)(dest+1*linesize)), - "+m"(*(uint32_t*)(dest+2*linesize)), - "+m"(*(uint32_t*)(dest+3*linesize)) + :"+m"(*(uint32_t *)(dest + 0 * stride)), + "+m"(*(uint32_t *)(dest + 1 * stride)), + "+m"(*(uint32_t *)(dest + 2 * stride)), + "+m"(*(uint32_t *)(dest + 3 * stride)) ); - dest += 4*linesize; + dest += 4 * stride; __asm__ volatile( "movd %0, %%mm2 \n\t" "movd %1, %%mm3 \n\t" @@ -592,14 +592,14 @@ static void vc1_inv_trans_4x8_dc_mmxext(uint8_t *dest, int linesize, "movd %%mm3, %1 \n\t" "movd %%mm4, %2 \n\t" "movd %%mm5, %3 \n\t" - :"+m"(*(uint32_t*)(dest+0*linesize)), - "+m"(*(uint32_t*)(dest+1*linesize)), - "+m"(*(uint32_t*)(dest+2*linesize)), - "+m"(*(uint32_t*)(dest+3*linesize)) + :"+m"(*(uint32_t *)(dest + 0 * stride)), + "+m"(*(uint32_t *)(dest + 1 * stride)), + "+m"(*(uint32_t *)(dest + 2 * stride)), + "+m"(*(uint32_t *)(dest + 3 * stride)) ); } -static void vc1_inv_trans_8x4_dc_mmxext(uint8_t *dest, int linesize, +static void vc1_inv_trans_8x4_dc_mmxext(uint8_t *dest, ptrdiff_t stride, int16_t *block) { int dc = block[0]; @@ -631,14 +631,14 @@ static void vc1_inv_trans_8x4_dc_mmxext(uint8_t *dest, int linesize, "movq %%mm3, %1 \n\t" "movq %%mm4, %2 \n\t" "movq %%mm5, %3 \n\t" - :"+m"(*(uint32_t*)(dest+0*linesize)), - "+m"(*(uint32_t*)(dest+1*linesize)), - "+m"(*(uint32_t*)(dest+2*linesize)), - "+m"(*(uint32_t*)(dest+3*linesize)) + :"+m"(*(uint32_t *)(dest + 0 * stride)), + "+m"(*(uint32_t *)(dest + 1 * stride)), + "+m"(*(uint32_t *)(dest + 2 * stride)), + "+m"(*(uint32_t *)(dest + 3 * stride)) ); } -static void vc1_inv_trans_8x8_dc_mmxext(uint8_t *dest, int linesize, +static void vc1_inv_trans_8x8_dc_mmxext(uint8_t *dest, ptrdiff_t stride, int16_t *block) { int dc = block[0]; @@ -670,12 +670,12 @@ static void vc1_inv_trans_8x8_dc_mmxext(uint8_t *dest, int linesize, "movq %%mm3, %1 \n\t" "movq %%mm4, %2 \n\t" "movq %%mm5, %3 \n\t" - :"+m"(*(uint32_t*)(dest+0*linesize)), - "+m"(*(uint32_t*)(dest+1*linesize)), - "+m"(*(uint32_t*)(dest+2*linesize)), - "+m"(*(uint32_t*)(dest+3*linesize)) + :"+m"(*(uint32_t *)(dest + 0 * stride)), + "+m"(*(uint32_t *)(dest + 1 * stride)), + "+m"(*(uint32_t *)(dest + 2 * stride)), + "+m"(*(uint32_t *)(dest + 3 * stride)) ); - dest += 4*linesize; + dest += 4 * stride; __asm__ volatile( "movq %0, %%mm2 \n\t" "movq %1, %%mm3 \n\t" @@ -693,10 +693,10 @@ static void vc1_inv_trans_8x8_dc_mmxext(uint8_t *dest, int linesize, "movq %%mm3, %1 \n\t" "movq %%mm4, %2 \n\t" "movq %%mm5, %3 \n\t" - :"+m"(*(uint32_t*)(dest+0*linesize)), - "+m"(*(uint32_t*)(dest+1*linesize)), - "+m"(*(uint32_t*)(dest+2*linesize)), - "+m"(*(uint32_t*)(dest+3*linesize)) + :"+m"(*(uint32_t *)(dest + 0 * stride)), + "+m"(*(uint32_t *)(dest + 1 * stride)), + "+m"(*(uint32_t *)(dest + 2 * stride)), + "+m"(*(uint32_t *)(dest + 3 * stride)) ); } diff --git a/libavcodec/x86/xvididct.h b/libavcodec/x86/xvididct.h index 13a4e85..6640b6b 100644 --- a/libavcodec/x86/xvididct.h +++ b/libavcodec/x86/xvididct.h @@ -26,18 +26,19 @@ #ifndef AVCODEC_X86_XVIDIDCT_H #define AVCODEC_X86_XVIDIDCT_H +#include <stddef.h> #include <stdint.h> void ff_xvid_idct_mmx(short *block); -void ff_xvid_idct_mmx_put(uint8_t *dest, int line_size, int16_t *block); -void ff_xvid_idct_mmx_add(uint8_t *dest, int line_size, int16_t *block); +void ff_xvid_idct_mmx_put(uint8_t *dest, ptrdiff_t line_size, int16_t *block); +void ff_xvid_idct_mmx_add(uint8_t *dest, ptrdiff_t line_size, int16_t *block); void ff_xvid_idct_mmxext(short *block); -void ff_xvid_idct_mmxext_put(uint8_t *dest, int line_size, int16_t *block); -void ff_xvid_idct_mmxext_add(uint8_t *dest, int line_size, int16_t *block); +void ff_xvid_idct_mmxext_put(uint8_t *dest, ptrdiff_t line_size, int16_t *block); +void ff_xvid_idct_mmxext_add(uint8_t *dest, ptrdiff_t line_size, int16_t *block); void ff_xvid_idct_sse2(short *block); -void ff_xvid_idct_sse2_put(uint8_t *dest, int line_size, short *block); -void ff_xvid_idct_sse2_add(uint8_t *dest, int line_size, short *block); +void ff_xvid_idct_sse2_put(uint8_t *dest, ptrdiff_t line_size, short *block); +void ff_xvid_idct_sse2_add(uint8_t *dest, ptrdiff_t line_size, short *block); #endif /* AVCODEC_X86_XVIDIDCT_H */ diff --git a/libavcodec/x86/xvididct_mmx.c b/libavcodec/x86/xvididct_mmx.c index e371142..9bb407c 100644 --- a/libavcodec/x86/xvididct_mmx.c +++ b/libavcodec/x86/xvididct_mmx.c @@ -494,13 +494,13 @@ void ff_xvid_idct_mmx(short *block) :: "r" (block), "r" (rounder_0), "r" (tab_i_04_mmx), "r" (tg_1_16)); } -void ff_xvid_idct_mmx_put(uint8_t *dest, int line_size, int16_t *block) +void ff_xvid_idct_mmx_put(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { ff_xvid_idct_mmx(block); ff_put_pixels_clamped_mmx(block, dest, line_size); } -void ff_xvid_idct_mmx_add(uint8_t *dest, int line_size, int16_t *block) +void ff_xvid_idct_mmx_add(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { ff_xvid_idct_mmx(block); ff_add_pixels_clamped_mmx(block, dest, line_size); @@ -533,13 +533,13 @@ void ff_xvid_idct_mmxext(short *block) :: "r" (block), "r" (rounder_0), "r" (tab_i_04_xmm), "r" (tg_1_16)); } -void ff_xvid_idct_mmxext_put(uint8_t *dest, int line_size, int16_t *block) +void ff_xvid_idct_mmxext_put(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { ff_xvid_idct_mmxext(block); ff_put_pixels_clamped_mmx(block, dest, line_size); } -void ff_xvid_idct_mmxext_add(uint8_t *dest, int line_size, int16_t *block) +void ff_xvid_idct_mmxext_add(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { ff_xvid_idct_mmxext(block); ff_add_pixels_clamped_mmx(block, dest, line_size); diff --git a/libavcodec/x86/xvididct_sse2.c b/libavcodec/x86/xvididct_sse2.c index d4f0169..f318e95 100644 --- a/libavcodec/x86/xvididct_sse2.c +++ b/libavcodec/x86/xvididct_sse2.c @@ -390,13 +390,13 @@ inline void ff_xvid_idct_sse2(short *block) "%eax", "%ecx", "%edx", "%esi", "memory"); } -void ff_xvid_idct_sse2_put(uint8_t *dest, int line_size, short *block) +void ff_xvid_idct_sse2_put(uint8_t *dest, ptrdiff_t line_size, short *block) { ff_xvid_idct_sse2(block); ff_put_pixels_clamped_mmx(block, dest, line_size); } -void ff_xvid_idct_sse2_add(uint8_t *dest, int line_size, short *block) +void ff_xvid_idct_sse2_add(uint8_t *dest, ptrdiff_t line_size, short *block) { ff_xvid_idct_sse2(block); ff_add_pixels_clamped_mmx(block, dest, line_size); |