virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Remove useless wrapper around ra288_decode_frame()

Browse Source 
Originally committed as revision 14041 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-06-30 19:30:27 +00:00
parent 6091357fc0
commit f38deb4452
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libavcodec/ra288.c
View File

@ -205,14 +205,24 @@ static void update(Real288_internal *glob)
colmult(glob->pr2, glob->st2, table2a, 10); colmult(glob->pr2, glob->st2, table2a, 10);
} }
static void * decode_block(AVCodecContext * avctx, const unsigned char *in, /* Decode a block (celp) */
signed short int *out, unsigned len) static int ra288_decode_frame(AVCodecContext * avctx, void *data,
int *data_size, const uint8_t * buf,
int buf_size)
{ {
int16_t *out = data;
int x, y; int x, y;
Real288_internal *glob = avctx->priv_data; Real288_internal *glob = avctx->priv_data;
GetBitContext gb; GetBitContext gb;
init_get_bits(&gb, in, len * 8); if (buf_size < avctx->block_align) {
av_log(avctx, AV_LOG_ERROR,
"Error! Input buffer is too small [%d<%d]\n",
buf_size, avctx->block_align);
return 0;
}
init_get_bits(&gb, buf, avctx->block_align * 8);
for (x=0; x < 32; x++) { for (x=0; x < 32; x++) {
int amp_coef = get_bits(&gb, 3); int amp_coef = get_bits(&gb, 3);
@ -226,27 +236,7 @@ static void * decode_block(AVCodecContext * avctx, const unsigned char *in,
update(glob); update(glob);
} }
return out; *data_size = (char *)out - (char *)data;
}
/* Decode a block (celp) */
static int ra288_decode_frame(AVCodecContext * avctx, void *data,
int *data_size, const uint8_t * buf,
int buf_size)
{
void *datao;
if (buf_size < avctx->block_align) {
av_log(avctx, AV_LOG_ERROR,
"Error! Input buffer is too small [%d<%d]\n",
buf_size, avctx->block_align);
return 0;
}
datao = data;
data = decode_block(avctx, buf, (signed short *)data, avctx->block_align);
*data_size = (char *)data - (char *)datao;
return avctx->block_align; return avctx->block_align;
} }