summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2006-02-13 19:26:18 +0000
committerThom Johansen <thomj@rockbox.org>2006-02-13 19:26:18 +0000
commit37a165d7964cbb09cbab375ddeeabf304b8c558b (patch)
tree8f02ba48e5175c8b8820ed5beaded1a126709936
parent153f906d74eeff933a44fdf038b292d8d543e8f0 (diff)
downloadrockbox-37a165d7964cbb09cbab375ddeeabf304b8c558b.tar.gz
rockbox-37a165d7964cbb09cbab375ddeeabf304b8c558b.tar.bz2
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.h4
-rw-r--r--apps/codecs/libffmpegFLAC/decoder.h2
-rw-r--r--apps/codecs/libffmpegFLAC/shndec.h2
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 @@
#ifndef __ALAC__DECOMP_H
#define __ALAC__DECOMP_H
-/* Always output samples shifted to 28 bits */
-#define ALAC_OUTPUT_DEPTH 28
+/* Always output samples shifted to 28 bits + sign*/
+#define ALAC_OUTPUT_DEPTH 29
#define SCALE16 (ALAC_OUTPUT_DEPTH - 16)
#define ALAC_MAX_CHANNELS 2
#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 @@
#define MAX_BLOCKSIZE 4608 /* Maxsize in samples of one uncompressed frame */
#define MAX_FRAMESIZE 32768 /* Maxsize in bytes of one compressed frame */
-#define FLAC_OUTPUT_DEPTH 28 /* Provide samples left-shifted to 28-bits */
+#define FLAC_OUTPUT_DEPTH 29 /* Provide samples left-shifted to 28 bits+sign */
enum decorrelation_type {
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 @@
#include "bitstream.h"
-#define SHN_OUTPUT_DEPTH 28
+#define SHN_OUTPUT_DEPTH 29 /* 28 bits + sign */
#define MAX_CHANNELS 2
#define MAX_PRED_ORDER 16