diff options
author | Thom Johansen <thomj@rockbox.org> | 2006-02-13 19:26:18 +0000 |
---|---|---|
committer | Thom Johansen <thomj@rockbox.org> | 2006-02-13 19:26:18 +0000 |
commit | 37a165d7964cbb09cbab375ddeeabf304b8c558b (patch) | |
tree | 8f02ba48e5175c8b8820ed5beaded1a126709936 | |
parent | 153f906d74eeff933a44fdf038b292d8d543e8f0 (diff) | |
download | rockbox-37a165d7964cbb09cbab375ddeeabf304b8c558b.tar.gz rockbox-37a165d7964cbb09cbab375ddeeabf304b8c558b.zip |
Convert to use common internal sample format.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8681 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/libalac/decomp.h | 4 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/decoder.h | 2 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/shndec.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/codecs/libalac/decomp.h b/apps/codecs/libalac/decomp.h index 853c9d884a..162811084f 100644 --- a/apps/codecs/libalac/decomp.h +++ b/apps/codecs/libalac/decomp.h | |||
@@ -1,8 +1,8 @@ | |||
1 | #ifndef __ALAC__DECOMP_H | 1 | #ifndef __ALAC__DECOMP_H |
2 | #define __ALAC__DECOMP_H | 2 | #define __ALAC__DECOMP_H |
3 | 3 | ||
4 | /* Always output samples shifted to 28 bits */ | 4 | /* Always output samples shifted to 28 bits + sign*/ |
5 | #define ALAC_OUTPUT_DEPTH 28 | 5 | #define ALAC_OUTPUT_DEPTH 29 |
6 | #define SCALE16 (ALAC_OUTPUT_DEPTH - 16) | 6 | #define SCALE16 (ALAC_OUTPUT_DEPTH - 16) |
7 | #define ALAC_MAX_CHANNELS 2 | 7 | #define ALAC_MAX_CHANNELS 2 |
8 | #define ALAC_BLOCKSIZE 4096 /* Number of samples per channel per block */ | 8 | #define ALAC_BLOCKSIZE 4096 /* Number of samples per channel per block */ |
diff --git a/apps/codecs/libffmpegFLAC/decoder.h b/apps/codecs/libffmpegFLAC/decoder.h index 9e2240fea3..632bb1b823 100644 --- a/apps/codecs/libffmpegFLAC/decoder.h +++ b/apps/codecs/libffmpegFLAC/decoder.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #define MAX_BLOCKSIZE 4608 /* Maxsize in samples of one uncompressed frame */ | 7 | #define MAX_BLOCKSIZE 4608 /* Maxsize in samples of one uncompressed frame */ |
8 | #define MAX_FRAMESIZE 32768 /* Maxsize in bytes of one compressed frame */ | 8 | #define MAX_FRAMESIZE 32768 /* Maxsize in bytes of one compressed frame */ |
9 | 9 | ||
10 | #define FLAC_OUTPUT_DEPTH 28 /* Provide samples left-shifted to 28-bits */ | 10 | #define FLAC_OUTPUT_DEPTH 29 /* Provide samples left-shifted to 28 bits+sign */ |
11 | 11 | ||
12 | enum decorrelation_type { | 12 | enum decorrelation_type { |
13 | INDEPENDENT, | 13 | INDEPENDENT, |
diff --git a/apps/codecs/libffmpegFLAC/shndec.h b/apps/codecs/libffmpegFLAC/shndec.h index 713a5b56dc..068f4faf28 100644 --- a/apps/codecs/libffmpegFLAC/shndec.h +++ b/apps/codecs/libffmpegFLAC/shndec.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #include "bitstream.h" | 1 | #include "bitstream.h" |
2 | 2 | ||
3 | #define SHN_OUTPUT_DEPTH 28 | 3 | #define SHN_OUTPUT_DEPTH 29 /* 28 bits + sign */ |
4 | 4 | ||
5 | #define MAX_CHANNELS 2 | 5 | #define MAX_CHANNELS 2 |
6 | #define MAX_PRED_ORDER 16 | 6 | #define MAX_PRED_ORDER 16 |