Mercurial > libavcodec.hg

comparison adpcm.c @ 7246:c9dc58950620 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l, forgot to replace a / 256 for r14173. Fixes MS ADPCM regression test.
author reimar
date Sat, 12 Jul 2008 07:28:45 +0000
parents b79a3cd9ed94
children 35744b4e5082
comparison
equal deleted inserted replaced
7245:b79a3cd9ed94 7246:c9dc58950620
730 730
731 static inline short adpcm_ms_expand_nibble(ADPCMChannelStatus *c, char nibble) 731 static inline short adpcm_ms_expand_nibble(ADPCMChannelStatus *c, char nibble)
732 { 732 {
733 int predictor; 733 int predictor;
734 734
735 predictor = (((c->sample1) * (c->coeff1)) + ((c->sample2) * (c->coeff2))) / 256; 735 predictor = (((c->sample1) * (c->coeff1)) + ((c->sample2) * (c->coeff2))) / 64;
736 predictor += (signed)((nibble & 0x08)?(nibble - 0x10):(nibble)) * c->idelta; 736 predictor += (signed)((nibble & 0x08)?(nibble - 0x10):(nibble)) * c->idelta;
737 737
738 c->sample2 = c->sample1; 738 c->sample2 = c->sample1;
739 c->sample1 = av_clip_int16(predictor); 739 c->sample1 = av_clip_int16(predictor);
740 c->idelta = (AdaptationTable[(int)nibble] * c->idelta) >> 8; 740 c->idelta = (AdaptationTable[(int)nibble] * c->idelta) >> 8;