{
int delta = sample - c->prev_sample;
int nibble = FFMIN(7, abs(delta)*4/step_table[c->step_index]) + (delta<0)*8;
- c->prev_sample = c->prev_sample + ((step_table[c->step_index] * yamaha_difflookup[nibble]) / 8);
+ c->prev_sample += ((step_table[c->step_index] * yamaha_difflookup[nibble]) / 8);
c->prev_sample = av_clip_int16(c->prev_sample);
c->step_index = av_clip(c->step_index + index_table[nibble], 0, 88);
return nibble;
nibble= av_clip(nibble, -8, 7)&0x0F;
predictor += (signed)((nibble & 0x08)?(nibble - 0x10):(nibble)) * c->idelta;
- predictor = av_clip_int16(predictor);
c->sample2 = c->sample1;
- c->sample1 = predictor;
+ c->sample1 = av_clip_int16(predictor);
c->idelta = (AdaptationTable[(int)nibble] * c->idelta) >> 8;
if (c->idelta < 16) c->idelta = 16;
nibble = FFMIN(7, abs(delta)*4/c->step) + (delta<0)*8;
- c->predictor = c->predictor + ((c->step * yamaha_difflookup[nibble]) / 8);
+ c->predictor += ((c->step * yamaha_difflookup[nibble]) / 8);
c->predictor = av_clip_int16(c->predictor);
c->step = (c->step * yamaha_indexscale[nibble]) >> 8;
c->step = av_clip(c->step, 127, 24567);
if (sign) predictor -= diff;
else predictor += diff;
- predictor = av_clip_int16(predictor);
- c->predictor = predictor;
+ c->predictor = av_clip_int16(predictor);
c->step_index = step_index;
- return (short)predictor;
+ return (short)c->predictor;
}
static inline short adpcm_ms_expand_nibble(ADPCMChannelStatus *c, char nibble)
predictor = (((c->sample1) * (c->coeff1)) + ((c->sample2) * (c->coeff2))) / 256;
predictor += (signed)((nibble & 0x08)?(nibble - 0x10):(nibble)) * c->idelta;
- predictor = av_clip_int16(predictor);
c->sample2 = c->sample1;
- c->sample1 = predictor;
+ c->sample1 = av_clip_int16(predictor);
c->idelta = (AdaptationTable[(int)nibble] * c->idelta) >> 8;
if (c->idelta < 16) c->idelta = 16;
- return (short)predictor;
+ return c->sample1;
}
static inline short adpcm_ct_expand_nibble(ADPCMChannelStatus *c, char nibble)
if(c->step > 32767)
c->step = 32767;
- predictor = av_clip_int16(predictor);
- c->predictor = predictor;
- return (short)predictor;
+ c->predictor = av_clip_int16(predictor);
+ return (short)c->predictor;
}
static inline short adpcm_sbpro_expand_nibble(ADPCMChannelStatus *c, char nibble, int size, int shift)
t = (signed char)(d<<4)>>4;
s = ( t<<shift ) + ((s_1*f0 + s_2*f1+32)>>6);
- s = av_clip_int16(s);
- *out = s;
- out += inc;
s_2 = s_1;
- s_1 = s;
+ s_1 = av_clip_int16(s);
+ *out = s_1;
+ out += inc;
}
if (inc==2) { /* stereo */
t = (signed char)d >> 4;
s = ( t<<shift ) + ((s_1*f0 + s_2*f1+32)>>6);
- s = av_clip_int16(s);
- *out = s;
- out += inc;
s_2 = s_1;
- s_1 = s;
+ s_1 = av_clip_int16(s);
+ *out = s_1;
+ out += inc;
}
if (inc==2) { /* stereo */
next_right_sample = (next_right_sample +
(current_right_sample * coeff1r) +
(previous_right_sample * coeff2r) + 0x80) >> 8;
- next_left_sample = av_clip_int16(next_left_sample);
- next_right_sample = av_clip_int16(next_right_sample);
previous_left_sample = current_left_sample;
- current_left_sample = next_left_sample;
+ current_left_sample = av_clip_int16(next_left_sample);
previous_right_sample = current_right_sample;
- current_right_sample = next_right_sample;
+ current_right_sample = av_clip_int16(next_right_sample);
*samples++ = (unsigned short)current_left_sample;
*samples++ = (unsigned short)current_right_sample;
}
sampledat = ((prev[ch][0]*factor1
+ prev[ch][1]*factor2) >> 11) + (sampledat>>exp);
- sampledat = av_clip_int16(sampledat);
- *samples = sampledat;
+ *samples = av_clip_int16(sampledat);
prev[ch][1] = prev[ch][0];
prev[ch][0] = *samples++;