# HG changeset patch # User michael # Date 1213657970 0 # Node ID 4b5b586a3dd0e408ee102aeb2c091c66cd449313 # Parent 589806348538158d06dad9a9f7dec315b96120e7 Support decoding of sample_g726.asf. diff -r 589806348538 -r 4b5b586a3dd0 g726.c --- a/g726.c Mon Jun 16 20:42:54 2008 +0000 +++ b/g726.c Mon Jun 16 23:12:50 2008 +0000 @@ -266,11 +266,11 @@ return av_clip(re_signal << 2, -0xffff, 0xffff); } -static av_cold int g726_reset(G726Context* c, int bit_rate) +static av_cold int g726_reset(G726Context* c, int index) { int i; - c->tbls = &G726Tables_pool[bit_rate/8000 - 2]; + c->tbls = &G726Tables_pool[index]; for (i=0; i<2; i++) { i2f(0, &c->sr[i]); c->a[i] = 0; @@ -322,6 +322,7 @@ static av_cold int g726_init(AVCodecContext * avctx) { AVG726Context* c = (AVG726Context*)avctx->priv_data; + unsigned int index= (avctx->bit_rate + avctx->sample_rate/2) / avctx->sample_rate - 2; if (avctx->channels != 1 || (avctx->bit_rate != 16000 && avctx->bit_rate != 24000 && @@ -333,7 +334,7 @@ av_log(avctx, AV_LOG_ERROR, "G726: unsupported audio format\n"); return -1; } - g726_reset(&c->c, avctx->bit_rate); + g726_reset(&c->c, index); c->code_size = c->c.tbls->bits; c->bit_buffer = 0; c->bits_left = 0;