virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

fmtconvert: Explicitly use int32_t instead of int

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Christophe Gisquet 2012-12-27 22:33:51 +01:00 committed by Martin Storsjö
parent 50612484e0
commit b6293e2798
10 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ac3dec.c
View File

@ -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]; int end_freq = s->end_freq[ch_index];
uint8_t *baps = s->bap[ch_index]; uint8_t *baps = s->bap[ch_index];
int8_t *exps = s->dexps[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]; int dither = (ch_index == CPL_CH) || s->dither_flag[ch_index];
GetBitContext *gbc = &s->gbc; GetBitContext *gbc = &s->gbc;
int freq; int freq;

2
libavcodec/ac3dec.h
View File

@ -203,7 +203,7 @@ typedef struct AC3DecodeContext {
float *dlyptr[AC3_MAX_CHANNELS]; float *dlyptr[AC3_MAX_CHANNELS];
///@name Aligned arrays ///@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, 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, delay)[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]; ///< delay - added to the next block
DECLARE_ALIGNED(32, float, window)[AC3_BLOCK_SIZE]; ///< window coefficients DECLARE_ALIGNED(32, float, window)[AC3_BLOCK_SIZE]; ///< window coefficients

4
libavcodec/arm/dca.h
View File

@ -30,9 +30,9 @@
#define decode_blockcodes decode_blockcodes #define decode_blockcodes decode_blockcodes
static inline int decode_blockcodes(int code1, int code2, int levels, 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" __asm__ ("smmul %8, %14, %18 \n"
"smmul %11, %15, %18 \n" "smmul %11, %15, %18 \n"

2
libavcodec/arm/fmtconvert_init_arm.c
View File

@ -25,7 +25,7 @@
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/fmtconvert.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); float mul, int len);
void ff_float_to_int16_neon(int16_t *dst, const float *src, long len); void ff_float_to_int16_neon(int16_t *dst, const float *src, long len);

6
libavcodec/dcadec.c
View File

@ -1097,7 +1097,7 @@ static void dca_downmix(float **samples, int srcfmt,
#ifndef decode_blockcodes #ifndef decode_blockcodes
/* Very compact version of the block code decoder that does not use table /* Very compact version of the block code decoder that does not use table
* look-up but is slightly slower */ * 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 i;
int offset = (levels - 1) >> 1; int offset = (levels - 1) >> 1;
@ -1111,7 +1111,7 @@ static int decode_blockcode(int code, int levels, int *values)
return code; 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) | return decode_blockcode(code1, levels, values) |
decode_blockcode(code2, levels, values + 4); decode_blockcode(code2, levels, values + 4);
@ -1140,7 +1140,7 @@ static int dca_subsubframe(DCAContext *s, int base_channel, int block_index)
/* FIXME */ /* FIXME */
float (*subband_samples)[DCA_SUBBANDS][8] = s->subband_samples[block_index]; 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 * Audio data

4
libavcodec/fmtconvert.c
View File

@ -24,7 +24,9 @@
#include "fmtconvert.h" #include "fmtconvert.h"
#include "libavutil/common.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; int i;
for(i=0; i<len; i++) for(i=0; i<len; i++)
dst[i] = src[i] * mul; dst[i] = src[i] * mul;

3
libavcodec/fmtconvert.h
View File

@ -35,7 +35,8 @@ typedef struct FmtConvertContext {
* @param len number of elements to convert. * @param len number of elements to convert.
* constraints: multiple of 8 * 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. * Convert an array of float to an array of int16_t.

2
libavcodec/ppc/fmtconvert_altivec.c
View File

@ -27,7 +27,7 @@
#if HAVE_ALTIVEC #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) float mul, int len)
{ {
union { union {

2
libavcodec/x86/fmtconvert.asm
View File

@ -32,7 +32,7 @@ SECTION_TEXT
%endmacro %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 %macro INT32_TO_FLOAT_FMUL_SCALAR 1
%if UNIX64 %if UNIX64

4
libavcodec/x86/fmtconvert_init.c
View File

@ -30,8 +30,8 @@
#if HAVE_YASM #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_sse (float *dst, const int32_t *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_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_3dnow(int16_t *dst, const float *src, long len);
void ff_float_to_int16_sse (int16_t *dst, const float *src, long len); void ff_float_to_int16_sse (int16_t *dst, const float *src, long len);