Commit 3220083c authored by Michael Niedermayer's avatar Michael Niedermayer

ra144: Try to fix int16/uint16 warnings from pgc

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent cc6f848d
...@@ -1694,12 +1694,12 @@ int ff_irms(const int16_t *data) ...@@ -1694,12 +1694,12 @@ int ff_irms(const int16_t *data)
return 0x20000000 / (ff_t_sqrt(sum) >> 8); return 0x20000000 / (ff_t_sqrt(sum) >> 8);
} }
void ff_subblock_synthesis(RA144Context *ractx, const uint16_t *lpc_coefs, void ff_subblock_synthesis(RA144Context *ractx, const int16_t *lpc_coefs,
int cba_idx, int cb1_idx, int cb2_idx, int cba_idx, int cb1_idx, int cb2_idx,
int gval, int gain) int gval, int gain)
{ {
uint16_t buffer_a[BLOCKSIZE]; int16_t buffer_a[BLOCKSIZE];
uint16_t *block; int16_t *block;
int m[3]; int m[3];
if (cba_idx) { if (cba_idx) {
......
...@@ -56,7 +56,7 @@ typedef struct RA144Context { ...@@ -56,7 +56,7 @@ typedef struct RA144Context {
/** Adaptive codebook, its size is two units bigger to avoid a /** Adaptive codebook, its size is two units bigger to avoid a
* buffer overflow. */ * buffer overflow. */
uint16_t adapt_cb[146+2]; int16_t adapt_cb[146+2];
} RA144Context; } RA144Context;
void ff_copy_and_dup(int16_t *target, const int16_t *source, int offset); void ff_copy_and_dup(int16_t *target, const int16_t *source, int offset);
...@@ -69,7 +69,7 @@ int ff_interp(RA144Context *ractx, int16_t *out, int a, int copyold, ...@@ -69,7 +69,7 @@ int ff_interp(RA144Context *ractx, int16_t *out, int a, int copyold,
int energy); int energy);
unsigned int ff_rescale_rms(unsigned int rms, unsigned int energy); unsigned int ff_rescale_rms(unsigned int rms, unsigned int energy);
int ff_irms(const int16_t *data); int ff_irms(const int16_t *data);
void ff_subblock_synthesis(RA144Context *ractx, const uint16_t *lpc_coefs, void ff_subblock_synthesis(RA144Context *ractx, const int16_t *lpc_coefs,
int cba_idx, int cb1_idx, int cb2_idx, int cba_idx, int cb1_idx, int cb2_idx,
int gval, int gain); int gval, int gain);
......
...@@ -45,7 +45,7 @@ static av_cold int ra144_decode_init(AVCodecContext * avctx) ...@@ -45,7 +45,7 @@ static av_cold int ra144_decode_init(AVCodecContext * avctx)
return 0; return 0;
} }
static void do_output_subblock(RA144Context *ractx, const uint16_t *lpc_coefs, static void do_output_subblock(RA144Context *ractx, const int16_t *lpc_coefs,
int gval, GetBitContext *gb) int gval, GetBitContext *gb)
{ {
int cba_idx = get_bits(gb, 7); // index of the adaptive CB, 0 if none int cba_idx = get_bits(gb, 7); // index of the adaptive CB, 0 if none
...@@ -66,7 +66,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data, ...@@ -66,7 +66,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
int buf_size = avpkt->size; int buf_size = avpkt->size;
static const uint8_t sizes[LPC_ORDER] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2}; static const uint8_t sizes[LPC_ORDER] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2};
unsigned int refl_rms[NBLOCKS]; // RMS of the reflection coefficients unsigned int refl_rms[NBLOCKS]; // RMS of the reflection coefficients
uint16_t block_coefs[NBLOCKS][LPC_ORDER]; // LPC coefficients of each sub-block int16_t block_coefs[NBLOCKS][LPC_ORDER]; // LPC coefficients of each sub-block
unsigned int lpc_refl[LPC_ORDER]; // LPC reflection coefficients of the frame unsigned int lpc_refl[LPC_ORDER]; // LPC reflection coefficients of the frame
int i, j; int i, j;
int ret; int ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment