diff options
| author | Marcoen Hirschberg <marcoen@gmail.com> | 2007-11-07 18:18:56 +0000 |
|---|---|---|
| committer | Marcoen Hirschberg <marcoen@gmail.com> | 2007-11-07 18:18:56 +0000 |
| commit | d74a8ec85dd83f50bf03938095890267d59d9825 (patch) | |
| tree | b498e50d1ffe9f66b2a6a53e8aac34edf89c2ebb /apps | |
| parent | 7685544b025749dd293802224c027056a0b6da21 (diff) | |
| download | rockbox-d74a8ec85dd83f50bf03938095890267d59d9825.tar.gz rockbox-d74a8ec85dd83f50bf03938095890267d59d9825.zip | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/codecs/libffmpegFLAC/decoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/apps/codecs/libffmpegFLAC/decoder.c index 88fcbfd0bd..1d46eda353 100644 --- a/apps/codecs/libffmpegFLAC/decoder.c +++ b/apps/codecs/libffmpegFLAC/decoder.c | |||
| @@ -144,7 +144,7 @@ static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) | |||
| 144 | int sample = 0, samples; | 144 | int sample = 0, samples; |
| 145 | 145 | ||
| 146 | method_type = get_bits(&s->gb, 2); | 146 | method_type = get_bits(&s->gb, 2); |
| 147 | if (method_type != 0){ | 147 | if (method_type > 1){ |
| 148 | //fprintf(stderr,"illegal residual coding method %d\n", method_type); | 148 | //fprintf(stderr,"illegal residual coding method %d\n", method_type); |
| 149 | return -3; | 149 | return -3; |
| 150 | } | 150 | } |
| @@ -157,8 +157,8 @@ static int decode_residuals(FLACContext *s, int32_t* decoded, int pred_order) | |||
| 157 | i= pred_order; | 157 | i= pred_order; |
| 158 | for (partition = 0; partition < (1 << rice_order); partition++) | 158 | for (partition = 0; partition < (1 << rice_order); partition++) |
| 159 | { | 159 | { |
| 160 | tmp = get_bits(&s->gb, 4); | 160 | tmp = get_bits(&s->gb, method_type == 0 ? 4 : 5); |
| 161 | if (tmp == 15) | 161 | if (tmp == (method_type == 0 ? 15 : 31)) |
| 162 | { | 162 | { |
| 163 | //fprintf(stderr,"fixed len partition\n"); | 163 | //fprintf(stderr,"fixed len partition\n"); |
| 164 | tmp = get_bits(&s->gb, 5); | 164 | tmp = get_bits(&s->gb, 5); |