Module: libav Branch: master Commit: b6293e2798afab60596a87010b6163fcb4ca3086
Author: Christophe Gisquet <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Thu Dec 27 22:33:51 2012 +0100 fmtconvert: Explicitly use int32_t instead of int Signed-off-by: Martin Storsjö <[email protected]> --- libavcodec/ac3dec.c | 2 +- libavcodec/ac3dec.h | 2 +- libavcodec/arm/dca.h | 4 ++-- libavcodec/arm/fmtconvert_init_arm.c | 2 +- libavcodec/dcadec.c | 6 +++--- libavcodec/fmtconvert.c | 4 +++- libavcodec/fmtconvert.h | 3 ++- libavcodec/ppc/fmtconvert_altivec.c | 2 +- libavcodec/x86/fmtconvert.asm | 2 +- libavcodec/x86/fmtconvert_init.c | 4 ++-- 10 files changed, 17 insertions(+), 14 deletions(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 6a2792e..f084493 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -429,7 +429,7 @@ static void ac3_decode_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, ma int end_freq = s->end_freq[ch_index]; uint8_t *baps = s->bap[ch_index]; int8_t *exps = s->dexps[ch_index]; - int *coeffs = s->fixed_coeffs[ch_index]; + int32_t *coeffs = s->fixed_coeffs[ch_index]; int dither = (ch_index == CPL_CH) || s->dither_flag[ch_index]; GetBitContext *gbc = &s->gbc; int freq; diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index 6707fd2..06b8544 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -203,7 +203,7 @@ typedef struct AC3DecodeContext { float *dlyptr[AC3_MAX_CHANNELS]; ///@name Aligned arrays - DECLARE_ALIGNED(16, int, fixed_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< fixed-point transform coefficients + DECLARE_ALIGNED(16, int32_t, fixed_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< fixed-point transform coefficients DECLARE_ALIGNED(32, float, transform_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< transform coefficients DECLARE_ALIGNED(32, float, delay)[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]; ///< delay - added to the next block DECLARE_ALIGNED(32, float, window)[AC3_BLOCK_SIZE]; ///< window coefficients diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h index 3e55e43..39ec2b6 100644 --- a/libavcodec/arm/dca.h +++ b/libavcodec/arm/dca.h @@ -30,9 +30,9 @@ #define decode_blockcodes decode_blockcodes static inline int decode_blockcodes(int code1, int code2, int levels, - int *values) + int32_t *values) { - int v0, v1, v2, v3, v4, v5; + int32_t v0, v1, v2, v3, v4, v5; __asm__ ("smmul %8, %14, %18 \n" "smmul %11, %15, %18 \n" diff --git a/libavcodec/arm/fmtconvert_init_arm.c b/libavcodec/arm/fmtconvert_init_arm.c index c5f8fbf..4f36729 100644 --- a/libavcodec/arm/fmtconvert_init_arm.c +++ b/libavcodec/arm/fmtconvert_init_arm.c @@ -25,7 +25,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/fmtconvert.h" -void ff_int32_to_float_fmul_scalar_neon(float *dst, const int *src, +void ff_int32_to_float_fmul_scalar_neon(float *dst, const int32_t *src, float mul, int len); void ff_float_to_int16_neon(int16_t *dst, const float *src, long len); diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 9b00d30..6fdf828 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1097,7 +1097,7 @@ static void dca_downmix(float **samples, int srcfmt, #ifndef decode_blockcodes /* Very compact version of the block code decoder that does not use table * look-up but is slightly slower */ -static int decode_blockcode(int code, int levels, int *values) +static int decode_blockcode(int code, int levels, int32_t *values) { int i; int offset = (levels - 1) >> 1; @@ -1111,7 +1111,7 @@ static int decode_blockcode(int code, int levels, int *values) return code; } -static int decode_blockcodes(int code1, int code2, int levels, int *values) +static int decode_blockcodes(int code1, int code2, int levels, int32_t *values) { return decode_blockcode(code1, levels, values) | decode_blockcode(code2, levels, values + 4); @@ -1140,7 +1140,7 @@ static int dca_subsubframe(DCAContext *s, int base_channel, int block_index) /* FIXME */ float (*subband_samples)[DCA_SUBBANDS][8] = s->subband_samples[block_index]; - LOCAL_ALIGNED_16(int, block, [8]); + LOCAL_ALIGNED_16(int32_t, block, [8]); /* * Audio data diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index 5b7ab03..54f7030 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -24,7 +24,9 @@ #include "fmtconvert.h" #include "libavutil/common.h" -static void int32_to_float_fmul_scalar_c(float *dst, const int *src, float mul, int len){ +static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src, + float mul, int len) +{ int i; for(i=0; i<len; i++) dst[i] = src[i] * mul; diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h index 93c3401..a28af36 100644 --- a/libavcodec/fmtconvert.h +++ b/libavcodec/fmtconvert.h @@ -35,7 +35,8 @@ typedef struct FmtConvertContext { * @param len number of elements to convert. * constraints: multiple of 8 */ - void (*int32_to_float_fmul_scalar)(float *dst, const int *src, float mul, int len); + void (*int32_to_float_fmul_scalar)(float *dst, const int32_t *src, + float mul, int len); /** * Convert an array of float to an array of int16_t. diff --git a/libavcodec/ppc/fmtconvert_altivec.c b/libavcodec/ppc/fmtconvert_altivec.c index c72d0a4..08e7dce 100644 --- a/libavcodec/ppc/fmtconvert_altivec.c +++ b/libavcodec/ppc/fmtconvert_altivec.c @@ -27,7 +27,7 @@ #if HAVE_ALTIVEC -static void int32_to_float_fmul_scalar_altivec(float *dst, const int *src, +static void int32_to_float_fmul_scalar_altivec(float *dst, const int32_t *src, float mul, int len) { union { diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index 8267bd4..e7803df 100644 --- a/libavcodec/x86/fmtconvert.asm +++ b/libavcodec/x86/fmtconvert.asm @@ -32,7 +32,7 @@ SECTION_TEXT %endmacro ;--------------------------------------------------------------------------------- -; void int32_to_float_fmul_scalar(float *dst, const int *src, float mul, int len); +; void int32_to_float_fmul_scalar(float *dst, const int32_t *src, float mul, int len); ;--------------------------------------------------------------------------------- %macro INT32_TO_FLOAT_FMUL_SCALAR 1 %if UNIX64 diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c index 24c81bd..020c6f9 100644 --- a/libavcodec/x86/fmtconvert_init.c +++ b/libavcodec/x86/fmtconvert_init.c @@ -30,8 +30,8 @@ #if HAVE_YASM -void ff_int32_to_float_fmul_scalar_sse (float *dst, const int *src, float mul, int len); -void ff_int32_to_float_fmul_scalar_sse2(float *dst, const int *src, float mul, int len); +void ff_int32_to_float_fmul_scalar_sse (float *dst, const int32_t *src, float mul, int len); +void ff_int32_to_float_fmul_scalar_sse2(float *dst, const int32_t *src, float mul, int len); void ff_float_to_int16_3dnow(int16_t *dst, const float *src, long len); void ff_float_to_int16_sse (int16_t *dst, const float *src, long len); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
