virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

ra144: Try to fix int16/uint16 warnings from pgc

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-17 21:09:06 +02:00
parent cc6f848dba
commit 3220083c11
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ra144.c
View File

@ -1694,12 +1694,12 @@ int ff_irms(const int16_t *data)
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 gval, int gain)
{
uint16_t buffer_a[BLOCKSIZE];
uint16_t *block;
int16_t buffer_a[BLOCKSIZE];
int16_t *block;
int m[3];
if (cba_idx) {

4
libavcodec/ra144.h
View File

@ -56,7 +56,7 @@ typedef struct RA144Context {
/** Adaptive codebook, its size is two units bigger to avoid a
* buffer overflow. */
uint16_t adapt_cb[146+2];
int16_t adapt_cb[146+2];
} RA144Context;
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,
int energy);
unsigned int ff_rescale_rms(unsigned int rms, unsigned int energy);
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 gval, int gain);

4
libavcodec/ra144dec.c
View File

@ -45,7 +45,7 @@ static av_cold int ra144_decode_init(AVCodecContext * avctx)
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 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,
int buf_size = avpkt->size;
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
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
int i, j;
int ret;