summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libavcodec/ac3dec.c2
-rw-r--r--libavcodec/ac3dec.h2
-rw-r--r--libavcodec/arm/dca.h4
-rw-r--r--libavcodec/arm/fmtconvert_init_arm.c2
-rw-r--r--libavcodec/dcadec.c6
-rw-r--r--libavcodec/fmtconvert.c4
-rw-r--r--libavcodec/fmtconvert.h3
-rw-r--r--libavcodec/ppc/fmtconvert_altivec.c2
-rw-r--r--libavcodec/x86/fmtconvert.asm2
-rw-r--r--libavcodec/x86/fmtconvert_init.c4
10 files changed, 17 insertions, 14 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 6a2792e24d..f08449363d 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 6707fd2643..06b8544c82 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 3e55e433c2..39ec2b6bc8 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 c5f8fbfee3..4f36729b00 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 9b00d30b74..6fdf8288d6 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 5b7ab034ae..54f70305df 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 93c3401f57..a28af36c21 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 c72d0a4cd7..08e7dced83 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 8267bd47dc..e7803df4e5 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 24c81bdbe0..020c6f9a58 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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 23:04:23 +0000