forked from len0rd/rockbox
from ffmpeg: Add support for FLAC's new RICE2 entropy coding method. fixes 24-bit FLAC files encoded with flac-1.2.1
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15517 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
7685544b02
commit
d74a8ec85d
1 changed files with 3 additions and 3 deletions
|
@ -144,7 +144,7 @@ static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order)
|
|||
int sample = 0, samples;
|
||||
|
||||
method_type = get_bits(&s->gb, 2);
|
||||
if (method_type != 0){
|
||||
if (method_type > 1){
|
||||
//fprintf(stderr,"illegal residual coding method %d\n", method_type);
|
||||
return -3;
|
||||
}
|
||||
|
@ -157,8 +157,8 @@ static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order)
|
|||
i= pred_order;
|
||||
for (partition = 0; partition < (1 << rice_order); partition++)
|
||||
{
|
||||
tmp = get_bits(&s->gb, 4);
|
||||
if (tmp == 15)
|
||||
tmp = get_bits(&s->gb, method_type == 0 ? 4 : 5);
|
||||
if (tmp == (method_type == 0 ? 15 : 31))
|
||||
{
|
||||
//fprintf(stderr,"fixed len partition\n");
|
||||
tmp = get_bits(&s->gb, 5);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue