summaryrefslogtreecommitdiffstats
path: root/apps/codecs/libfaad
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2011-06-02 14:59:15 +0000
committerNils Wallménius <nils@rockbox.org>2011-06-02 14:59:15 +0000
commit4909e09267ad1f2638d48d91b4b273d5508ec380 (patch)
tree768a0131e0b7e4d66f7e5130fb27ce3f85b1f8ae /apps/codecs/libfaad
parentb58d3656d79e5f9752a22d55c139294412084e4f (diff)
downloadrockbox-4909e09267ad1f2638d48d91b4b273d5508ec380.tar.gz
rockbox-4909e09267ad1f2638d48d91b4b273d5508ec380.tar.bz2
rockbox-4909e09267ad1f2638d48d91b4b273d5508ec380.zip
FS#12141 by Sean Bartell
Some of these were found with http://www.samba.org/junkcode/#findstatic. Changes of note: * The old MDCT has been removed. * Makefile.test files that create test programs for libatrac, libcook, and libffmpegFLAC have been removed, as they don't work. My project will have a replacement that works with all codecs. * I've tried not to remove anything useful. CLIP_TO_15 was removed from libtremor because there's another copy (also commented) in codeclib. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29945 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libfaad')
-rw-r--r--apps/codecs/libfaad/decoder.c3
-rw-r--r--apps/codecs/libfaad/mp4.c3
-rw-r--r--apps/codecs/libfaad/mp4.h2
-rw-r--r--apps/codecs/libfaad/tns.c6
4 files changed, 13 insertions, 1 deletions
diff --git a/apps/codecs/libfaad/decoder.c b/apps/codecs/libfaad/decoder.c
index caedda7f55..d68d093b0b 100644
--- a/apps/codecs/libfaad/decoder.c
+++ b/apps/codecs/libfaad/decoder.c
@@ -88,6 +88,8 @@ char* NEAACDECAPI NeAACDecGetErrorMessage(uint8_t errcode)
return err_msg[errcode];
}
+/* rockbox: not used */
+#if 0
uint32_t NEAACDECAPI NeAACDecGetCapabilities(void)
{
uint32_t cap = 0;
@@ -113,6 +115,7 @@ uint32_t NEAACDECAPI NeAACDecGetCapabilities(void)
return cap;
}
+#endif
NeAACDecHandle NEAACDECAPI NeAACDecOpen(void)
{
diff --git a/apps/codecs/libfaad/mp4.c b/apps/codecs/libfaad/mp4.c
index fb0999fb01..94e1a1daaa 100644
--- a/apps/codecs/libfaad/mp4.c
+++ b/apps/codecs/libfaad/mp4.c
@@ -119,12 +119,13 @@ static uint8_t ObjectTypesTable[32] = {
};
/* Table 1.6.1 */
+/* rockbox: not used
int8_t NEAACDECAPI NeAACDecAudioSpecificConfig(uint8_t *pBuffer,
uint32_t buffer_size,
mp4AudioSpecificConfig *mp4ASC)
{
return AudioSpecificConfig2(pBuffer, buffer_size, mp4ASC, NULL);
-}
+}*/
int8_t AudioSpecificConfig2(uint8_t *pBuffer,
uint32_t buffer_size,
diff --git a/apps/codecs/libfaad/mp4.h b/apps/codecs/libfaad/mp4.h
index f647b67067..afcf094796 100644
--- a/apps/codecs/libfaad/mp4.h
+++ b/apps/codecs/libfaad/mp4.h
@@ -34,9 +34,11 @@ extern "C" {
#include "decoder.h"
+/* rockbox: not used
int8_t NEAACDECAPI NeAACDecAudioSpecificConfig(uint8_t *pBuffer,
uint32_t buffer_size,
mp4AudioSpecificConfig *mp4ASC);
+*/
int8_t AudioSpecificConfig2(uint8_t *pBuffer,
uint32_t buffer_size,
diff --git a/apps/codecs/libfaad/tns.c b/apps/codecs/libfaad/tns.c
index a759174196..a2bec86519 100644
--- a/apps/codecs/libfaad/tns.c
+++ b/apps/codecs/libfaad/tns.c
@@ -37,8 +37,10 @@ static void tns_decode_coef(uint8_t order, uint8_t coef_res_bits, uint8_t coef_c
uint8_t *coef, real_t *a);
static void tns_ar_filter(real_t *spectrum, uint16_t size, int8_t inc, real_t *lpc,
int8_t order);
+#ifdef LTP_DEC
static void tns_ma_filter(real_t *spectrum, uint16_t size, int8_t inc, real_t *lpc,
int8_t order);
+#endif
#ifdef _MSC_VER
@@ -129,6 +131,7 @@ void tns_decode_frame(ic_stream *ics, tns_info *tns, uint8_t sr_index,
}
}
+#ifdef LTP_DEC
/* TNS encoding for one channel and frame */
void tns_encode_frame(ic_stream *ics, tns_info *tns, uint8_t sr_index,
uint8_t object_type, real_t *spec, uint16_t frame_len)
@@ -182,6 +185,7 @@ void tns_encode_frame(ic_stream *ics, tns_info *tns, uint8_t sr_index,
}
}
}
+#endif
/* Decoder transmitted coefficients for one TNS filter */
static void tns_decode_coef(uint8_t order, uint8_t coef_res_bits, uint8_t coef_compress,
@@ -268,6 +272,7 @@ static void tns_ar_filter(real_t *spectrum, uint16_t size, int8_t inc, real_t *l
}
}
+#ifdef LTP_DEC
static void tns_ma_filter(real_t *spectrum, uint16_t size, int8_t inc, real_t *lpc,
int8_t order)
{
@@ -304,3 +309,4 @@ static void tns_ma_filter(real_t *spectrum, uint16_t size, int8_t inc, real_t *l
spectrum += inc;
}
}
+#endif