Commit ddcf031f authored by Reimar Döffinger's avatar Reimar Döffinger

Change MS ADPCM table so they fit into int8_t and change array type.

Originally committed as revision 14173 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4972a246
...@@ -85,12 +85,12 @@ static const int AdaptationTable[] = { ...@@ -85,12 +85,12 @@ static const int AdaptationTable[] = {
768, 614, 512, 409, 307, 230, 230, 230 768, 614, 512, 409, 307, 230, 230, 230
}; };
static const int AdaptCoeff1[] = { static const int8_t AdaptCoeff1[] = {
256, 512, 0, 192, 240, 460, 392 64, 128, 0, 48, 60, 115, 98
}; };
static const int AdaptCoeff2[] = { static const int8_t AdaptCoeff2[] = {
0, -256, 0, 64, 0, -208, -232 0, -64, 0, 16, 0, -52, -58
}; };
/* These are for CD-ROM XA ADPCM */ /* These are for CD-ROM XA ADPCM */
...@@ -226,7 +226,7 @@ static inline unsigned char adpcm_ms_compress_sample(ADPCMChannelStatus *c, shor ...@@ -226,7 +226,7 @@ static inline unsigned char adpcm_ms_compress_sample(ADPCMChannelStatus *c, shor
{ {
int predictor, nibble, bias; int predictor, nibble, bias;
predictor = (((c->sample1) * (c->coeff1)) + ((c->sample2) * (c->coeff2))) / 256; predictor = (((c->sample1) * (c->coeff1)) + ((c->sample2) * (c->coeff2))) / 64;
nibble= sample - predictor; nibble= sample - predictor;
if(nibble>=0) bias= c->idelta/2; if(nibble>=0) bias= c->idelta/2;
...@@ -330,7 +330,7 @@ static void adpcm_compress_trellis(AVCodecContext *avctx, const short *samples, ...@@ -330,7 +330,7 @@ static void adpcm_compress_trellis(AVCodecContext *avctx, const short *samples,
const int step = nodes[j]->step; const int step = nodes[j]->step;
int nidx; int nidx;
if(version == CODEC_ID_ADPCM_MS) { if(version == CODEC_ID_ADPCM_MS) {
const int predictor = ((nodes[j]->sample1 * c->coeff1) + (nodes[j]->sample2 * c->coeff2)) / 256; const int predictor = ((nodes[j]->sample1 * c->coeff1) + (nodes[j]->sample2 * c->coeff2)) / 64;
const int div = (sample - predictor) / step; const int div = (sample - predictor) / step;
const int nmin = av_clip(div-range, -8, 6); const int nmin = av_clip(div-range, -8, 6);
const int nmax = av_clip(div+range, -7, 7); const int nmax = av_clip(div+range, -7, 7);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment