RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support decoding of sample_g726.asf. 

Originally committed as revision 13784 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-06-16 23:12:50 +00:00
parent ded4241bb0
commit 8161c28c67
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/g726.c
View File

@ -266,11 +266,11 @@ static inline int16_t g726_iterate(G726Context* c, int16_t I)
return av_clip(re_signal << 2, -0xffff, 0xffff); 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; int i;
c->tbls = &G726Tables_pool[bit_rate/8000 - 2]; c->tbls = &G726Tables_pool[index];
for (i=0; i<2; i++) { for (i=0; i<2; i++) {
i2f(0, &c->sr[i]); i2f(0, &c->sr[i]);
c->a[i] = 0; c->a[i] = 0;
@ -322,6 +322,7 @@ typedef struct AVG726Context {
static av_cold int g726_init(AVCodecContext * avctx) static av_cold int g726_init(AVCodecContext * avctx)
{ {
AVG726Context* c = (AVG726Context*)avctx->priv_data; AVG726Context* c = (AVG726Context*)avctx->priv_data;
unsigned int index= (avctx->bit_rate + avctx->sample_rate/2) / avctx->sample_rate - 2;
if (avctx->channels != 1 || if (avctx->channels != 1 ||
(avctx->bit_rate != 16000 && avctx->bit_rate != 24000 && (avctx->bit_rate != 16000 && avctx->bit_rate != 24000 &&
@ -333,7 +334,7 @@ static av_cold int g726_init(AVCodecContext * avctx)
av_log(avctx, AV_LOG_ERROR, "G726: unsupported audio format\n"); av_log(avctx, AV_LOG_ERROR, "G726: unsupported audio format\n");
return -1; return -1;
} }
g726_reset(&c->c, avctx->bit_rate); g726_reset(&c->c, index);
c->code_size = c->c.tbls->bits; c->code_size = c->c.tbls->bits;
c->bit_buffer = 0; c->bit_buffer = 0;
c->bits_left = 0; c->bits_left = 0;