videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avcodec/dca: simplify condition 

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
foo86 2016-03-02 22:32:10 +03:00 committed by Michael Niedermayer
parent 8981348749
commit 00e3717b4a
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/dca_xll.c
View File

@ -460,19 +460,14 @@ static int chs_parse_band_data(DCAXllDecoder *s, DCAXllChSet *c, int band, int s
// Unpack Rice coding flag
// 0 - linear code, 1 - Rice code
c->rice_code_flag[i] = get_bits1(&s->gb);
if (!c->seg_common && c->rice_code_flag[i]) {
// Unpack Hybrid Rice coding flag
// 0 - Rice code, 1 - Hybrid Rice code
if (get_bits1(&s->gb))
// Unpack binary code length for isolated samples
c->bitalloc_hybrid_linear[i] = get_bits(&s->gb, c->nabits) + 1;
else
// 0 indicates no Hybrid Rice coding
c->bitalloc_hybrid_linear[i] = 0;
} else {
// Unpack Hybrid Rice coding flag
// 0 - Rice code, 1 - Hybrid Rice code
if (!c->seg_common && c->rice_code_flag[i] && get_bits1(&s->gb))
// Unpack binary code length for isolated samples
c->bitalloc_hybrid_linear[i] = get_bits(&s->gb, c->nabits) + 1;
else
// 0 indicates no Hybrid Rice coding
c->bitalloc_hybrid_linear[i] = 0;
}
}
// Unpack coding parameters