har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cosmetic, indentation

Browse Source 
Originally committed as revision 9960 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2007-08-06 08:42:05 +00:00
parent 43a2ce000a
commit d0fa156fc5
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
libavcodec/adpcm.c
View File

@ -1287,48 +1287,47 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
signmask = 1 << (nb_bits-1); signmask = 1 << (nb_bits-1);
while (get_bits_count(&gb) <= size - 22*avctx->channels) { while (get_bits_count(&gb) <= size - 22*avctx->channels) {
for (i = 0; i < avctx->channels; i++) {
*samples++ = c->status[i].predictor = get_sbits(&gb, 16);
c->status[i].step_index = get_bits(&gb, 6);
}
for (count = 0; get_bits_count(&gb) <= size - nb_bits*avctx->channels && count < 4095; count++)
{
int i;
for (i = 0; i < avctx->channels; i++) { for (i = 0; i < avctx->channels; i++) {
// similar to IMA adpcm *samples++ = c->status[i].predictor = get_sbits(&gb, 16);
int delta = get_bits(&gb, nb_bits); c->status[i].step_index = get_bits(&gb, 6);
int step = step_table[c->status[i].step_index]; }
long vpdiff = 0; // vpdiff = (delta+0.5)*step/4
int k = k0;
do { for (count = 0; get_bits_count(&gb) <= size - nb_bits*avctx->channels && count < 4095; count++) {
if (delta & k) int i;
vpdiff += step;
step >>= 1;
k >>= 1;
} while(k);
vpdiff += step;
if (delta & signmask) for (i = 0; i < avctx->channels; i++) {
c->status[i].predictor -= vpdiff; // similar to IMA adpcm
else int delta = get_bits(&gb, nb_bits);
c->status[i].predictor += vpdiff; int step = step_table[c->status[i].step_index];
long vpdiff = 0; // vpdiff = (delta+0.5)*step/4
int k = k0;
c->status[i].step_index += table[delta & (~signmask)]; do {
if (delta & k)
vpdiff += step;
step >>= 1;
k >>= 1;
} while(k);
vpdiff += step;
c->status[i].step_index = av_clip(c->status[i].step_index, 0, 88); if (delta & signmask)
c->status[i].predictor = av_clip(c->status[i].predictor, -32768, 32767); c->status[i].predictor -= vpdiff;
else
c->status[i].predictor += vpdiff;
*samples++ = c->status[i].predictor; c->status[i].step_index += table[delta & (~signmask)];
if (samples >= samples_end) {
av_log(avctx, AV_LOG_ERROR, "allocated output buffer is too small\n"); c->status[i].step_index = av_clip(c->status[i].step_index, 0, 88);
return -1; c->status[i].predictor = av_clip(c->status[i].predictor, -32768, 32767);
*samples++ = c->status[i].predictor;
if (samples >= samples_end) {
av_log(avctx, AV_LOG_ERROR, "allocated output buffer is too small\n");
return -1;
}
} }
} }
} }
}
src += buf_size; src += buf_size;
break; break;
} }