diff options
author | Michael Giacomelli <giac2000@hotmail.com> | 2010-11-17 00:49:09 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2010-11-17 00:49:09 +0000 |
commit | b965c24c0b33cdff5f2ff83c5861369c3aa9be65 (patch) | |
tree | ae07f0cecb051e834d9eb7bf925115d5731204d2 | |
parent | 7270e5eafd7dc54f5c85517dc8ddc04f077429ca (diff) | |
download | rockbox-b965c24c0b33cdff5f2ff83c5861369c3aa9be65.tar.gz rockbox-b965c24c0b33cdff5f2ff83c5861369c3aa9be65.zip |
ffmpeg flac does actually support up to 192k sample rates, and my test file seems to decode fine, so lets enable it. Note that using 192khz is over 6 times slower then 44.1khz on my test file, so I recommend sticking to more reasonable bitrates.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28609 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/libffmpegFLAC/decoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/apps/codecs/libffmpegFLAC/decoder.c index 7e77424567..1fafec17fb 100644 --- a/apps/codecs/libffmpegFLAC/decoder.c +++ b/apps/codecs/libffmpegFLAC/decoder.c | |||
@@ -49,7 +49,7 @@ | |||
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | static const int sample_rate_table[] ICONST_ATTR = | 51 | static const int sample_rate_table[] ICONST_ATTR = |
52 | { 0, 0, 0, 0, | 52 | { 0, 88200, 176400, 192000, |
53 | 8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000, | 53 | 8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000, |
54 | 0, 0, 0, 0 }; | 54 | 0, 0, 0, 0 }; |
55 | 55 | ||
@@ -454,7 +454,7 @@ static int decode_frame(FLACContext *s, | |||
454 | 454 | ||
455 | if (sample_rate_code == 0){ | 455 | if (sample_rate_code == 0){ |
456 | samplerate= s->samplerate; | 456 | samplerate= s->samplerate; |
457 | }else if ((sample_rate_code > 3) && (sample_rate_code < 12)) | 457 | }else if ((sample_rate_code < 12)) |
458 | samplerate = sample_rate_table[sample_rate_code]; | 458 | samplerate = sample_rate_table[sample_rate_code]; |
459 | else if (sample_rate_code == 12) | 459 | else if (sample_rate_code == 12) |
460 | samplerate = get_bits(&s->gb, 8) * 1000; | 460 | samplerate = get_bits(&s->gb, 8) * 1000; |