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

flacdec: simplify loop in decode_residuals()

This commit is contained in:
Mans Rullgard 2012-07-02 22:39:34 +01:00
parent 957521e7a4
commit ea98507db0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/flacdec.c
View File

@ -207,6 +207,7 @@ static int get_metadata_size(const uint8_t *buf, int buf_size)
static int decode_residuals(FLACContext *s, int channel, int pred_order)
{
int i, tmp, partition, method_type, rice_order;
int rice_bits, rice_esc;
int sample = 0, samples;
method_type = get_bits(&s->gb, 2);
@ -225,11 +226,14 @@ static int decode_residuals(FLACContext *s, int channel, int pred_order)
return -1;
}
rice_bits = 4 + method_type;
rice_esc = (1 << rice_bits) - 1;
sample=
i= pred_order;
for (partition = 0; partition < (1 << rice_order); partition++) {
tmp = get_bits(&s->gb, method_type == 0 ? 4 : 5);
if (tmp == (method_type == 0 ? 15 : 31)) {
tmp = get_bits(&s->gb, rice_bits);
if (tmp == rice_esc) {
tmp = get_bits(&s->gb, 5);
for (; i < samples; i++, sample++)
s->decoded[channel][sample] = get_sbits_long(&s->gb, tmp);