diff options
-rw-r--r--[-rwxr-xr-x] | apps/codecs/libmusepack/crc32.c | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/codecs/libmusepack/huffman.c | 0 | ||||
-rw-r--r-- | apps/codecs/libmusepack/internal.h | 12 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/codecs/libmusepack/minimax.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/codecs/libmusepack/mpc_bits_reader.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/codecs/libmusepack/mpc_bits_reader.h | 0 | ||||
-rw-r--r-- | apps/codecs/libmusepack/mpc_decoder.c | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/codecs/libmusepack/mpc_demux.c | 11 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/codecs/libmusepack/mpc_types.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/codecs/libmusepack/mpcdec.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/codecs/libmusepack/mpcdec_math.h | 0 | ||||
-rw-r--r-- | apps/codecs/libmusepack/requant.c | 1 | ||||
-rw-r--r-- | apps/codecs/libmusepack/streaminfo.c | 1 | ||||
-rw-r--r-- | apps/codecs/libmusepack/synth_filter.c | 1 |
14 files changed, 17 insertions, 14 deletions
diff --git a/apps/codecs/libmusepack/crc32.c b/apps/codecs/libmusepack/crc32.c index f9f3b8a73d..7613f1c2c8 100755..100644 --- a/apps/codecs/libmusepack/crc32.c +++ b/apps/codecs/libmusepack/crc32.c | |||
@@ -4,6 +4,7 @@ | |||
4 | * code from http://www.w3.org/TR/PNG/#D-CRCAppendix | 4 | * code from http://www.w3.org/TR/PNG/#D-CRCAppendix |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include "internal.h" | ||
7 | 8 | ||
8 | /* Table of CRCs of all 8-bit messages. */ | 9 | /* Table of CRCs of all 8-bit messages. */ |
9 | static unsigned long crc_table[256]; | 10 | static unsigned long crc_table[256]; |
diff --git a/apps/codecs/libmusepack/huffman.c b/apps/codecs/libmusepack/huffman.c index c304775623..c304775623 100755..100644 --- a/apps/codecs/libmusepack/huffman.c +++ b/apps/codecs/libmusepack/huffman.c | |||
diff --git a/apps/codecs/libmusepack/internal.h b/apps/codecs/libmusepack/internal.h index d12c39c96b..c4d789f617 100644 --- a/apps/codecs/libmusepack/internal.h +++ b/apps/codecs/libmusepack/internal.h | |||
@@ -100,6 +100,18 @@ static mpc_inline mpc_status mpc_check_key(char * key) | |||
100 | mpc_uint32_t mpc_random_int(mpc_decoder *d); // in synth_filter.c | 100 | mpc_uint32_t mpc_random_int(mpc_decoder *d); // in synth_filter.c |
101 | void mpc_decoder_init_quant(mpc_decoder *d, double scale_factor); | 101 | void mpc_decoder_init_quant(mpc_decoder *d, double scale_factor); |
102 | void mpc_decoder_synthese_filter_float(mpc_decoder *d, MPC_SAMPLE_FORMAT* OutData, mpc_int_t channels); | 102 | void mpc_decoder_synthese_filter_float(mpc_decoder *d, MPC_SAMPLE_FORMAT* OutData, mpc_int_t channels); |
103 | unsigned long mpc_crc32(unsigned char *buf, int len); | ||
104 | |||
105 | // streaminfo.c | ||
106 | mpc_status streaminfo_read_header_sv8(mpc_streaminfo* si, | ||
107 | const mpc_bits_reader * r_in, | ||
108 | mpc_size_t block_size); | ||
109 | mpc_status streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r_in); | ||
110 | void streaminfo_encoder_info(mpc_streaminfo* si, const mpc_bits_reader * r_in); | ||
111 | void streaminfo_gain(mpc_streaminfo* si, const mpc_bits_reader * r_in); | ||
112 | |||
113 | // mpc_decoder.c | ||
114 | void mpc_decoder_reset_scf(mpc_decoder * d, int value); | ||
103 | 115 | ||
104 | #ifdef __cplusplus | 116 | #ifdef __cplusplus |
105 | } | 117 | } |
diff --git a/apps/codecs/libmusepack/minimax.h b/apps/codecs/libmusepack/minimax.h index 1192626567..1192626567 100755..100644 --- a/apps/codecs/libmusepack/minimax.h +++ b/apps/codecs/libmusepack/minimax.h | |||
diff --git a/apps/codecs/libmusepack/mpc_bits_reader.c b/apps/codecs/libmusepack/mpc_bits_reader.c index 58b3f37e08..58b3f37e08 100755..100644 --- a/apps/codecs/libmusepack/mpc_bits_reader.c +++ b/apps/codecs/libmusepack/mpc_bits_reader.c | |||
diff --git a/apps/codecs/libmusepack/mpc_bits_reader.h b/apps/codecs/libmusepack/mpc_bits_reader.h index 1233720c74..1233720c74 100755..100644 --- a/apps/codecs/libmusepack/mpc_bits_reader.h +++ b/apps/codecs/libmusepack/mpc_bits_reader.h | |||
diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c index 3f8fbc7aad..bbc916db8b 100644 --- a/apps/codecs/libmusepack/mpc_decoder.c +++ b/apps/codecs/libmusepack/mpc_decoder.c | |||
@@ -133,7 +133,7 @@ void mpc_decoder_reset_scf(mpc_decoder * d, int value) | |||
133 | memset(d->SCF_Index_R, value, sizeof d->SCF_Index_R ); | 133 | memset(d->SCF_Index_R, value, sizeof d->SCF_Index_R ); |
134 | } | 134 | } |
135 | 135 | ||
136 | void mpc_decoder_setup(mpc_decoder *d) | 136 | static void mpc_decoder_setup(mpc_decoder *d) |
137 | { | 137 | { |
138 | memset(d, 0, sizeof *d); | 138 | memset(d, 0, sizeof *d); |
139 | 139 | ||
@@ -148,7 +148,7 @@ void mpc_decoder_setup(mpc_decoder *d) | |||
148 | mpc_decoder_init_quant(d, 1.0f); | 148 | mpc_decoder_init_quant(d, 1.0f); |
149 | } | 149 | } |
150 | 150 | ||
151 | void mpc_decoder_set_streaminfo(mpc_decoder *d, mpc_streaminfo *si) | 151 | static void mpc_decoder_set_streaminfo(mpc_decoder *d, mpc_streaminfo *si) |
152 | { | 152 | { |
153 | d->stream_version = si->stream_version; | 153 | d->stream_version = si->stream_version; |
154 | d->ms = si->ms; | 154 | d->ms = si->ms; |
diff --git a/apps/codecs/libmusepack/mpc_demux.c b/apps/codecs/libmusepack/mpc_demux.c index 75d02bae54..244ef25644 100755..100644 --- a/apps/codecs/libmusepack/mpc_demux.c +++ b/apps/codecs/libmusepack/mpc_demux.c | |||
@@ -52,17 +52,6 @@ static mpc_uint8_t g_buffer[DEMUX_BUFFER_SIZE + MAX_FRAME_SIZE]; | |||
52 | static mpc_seek_t g_seek_table[MAX_SEEK_TABLE_SIZE]; | 52 | static mpc_seek_t g_seek_table[MAX_SEEK_TABLE_SIZE]; |
53 | static mpc_demux g_mpc_demux IBSS_ATTR; | 53 | static mpc_demux g_mpc_demux IBSS_ATTR; |
54 | 54 | ||
55 | // streaminfo.c | ||
56 | mpc_status streaminfo_read_header_sv8(mpc_streaminfo* si, | ||
57 | const mpc_bits_reader * r_in, | ||
58 | mpc_size_t block_size); | ||
59 | mpc_status streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r_in); | ||
60 | void streaminfo_encoder_info(mpc_streaminfo* si, const mpc_bits_reader * r_in); | ||
61 | void streaminfo_gain(mpc_streaminfo* si, const mpc_bits_reader * r_in); | ||
62 | |||
63 | // mpc_decoder.c | ||
64 | void mpc_decoder_reset_scf(mpc_decoder * d, int value); | ||
65 | |||
66 | enum { | 55 | enum { |
67 | MPC_BUFFER_SWAP = 1, | 56 | MPC_BUFFER_SWAP = 1, |
68 | MPC_BUFFER_FULL = 2, | 57 | MPC_BUFFER_FULL = 2, |
diff --git a/apps/codecs/libmusepack/mpc_types.h b/apps/codecs/libmusepack/mpc_types.h index 61ee5ea67f..61ee5ea67f 100755..100644 --- a/apps/codecs/libmusepack/mpc_types.h +++ b/apps/codecs/libmusepack/mpc_types.h | |||
diff --git a/apps/codecs/libmusepack/mpcdec.h b/apps/codecs/libmusepack/mpcdec.h index be18cfec95..be18cfec95 100755..100644 --- a/apps/codecs/libmusepack/mpcdec.h +++ b/apps/codecs/libmusepack/mpcdec.h | |||
diff --git a/apps/codecs/libmusepack/mpcdec_math.h b/apps/codecs/libmusepack/mpcdec_math.h index 55295dba32..55295dba32 100755..100644 --- a/apps/codecs/libmusepack/mpcdec_math.h +++ b/apps/codecs/libmusepack/mpcdec_math.h | |||
diff --git a/apps/codecs/libmusepack/requant.c b/apps/codecs/libmusepack/requant.c index d8ded7ecf9..ad26867204 100644 --- a/apps/codecs/libmusepack/requant.c +++ b/apps/codecs/libmusepack/requant.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include "requant.h" | 38 | #include "requant.h" |
39 | #include "mpcdec_math.h" | 39 | #include "mpcdec_math.h" |
40 | #include "decoder.h" | 40 | #include "decoder.h" |
41 | #include "internal.h" | ||
41 | 42 | ||
42 | /* C O N S T A N T S */ | 43 | /* C O N S T A N T S */ |
43 | // Bits per sample for chosen quantizer | 44 | // Bits per sample for chosen quantizer |
diff --git a/apps/codecs/libmusepack/streaminfo.c b/apps/codecs/libmusepack/streaminfo.c index 5c135ef64a..2d8ece704a 100644 --- a/apps/codecs/libmusepack/streaminfo.c +++ b/apps/codecs/libmusepack/streaminfo.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include "huffman.h" | 42 | #include "huffman.h" |
43 | #include "mpc_bits_reader.h" | 43 | #include "mpc_bits_reader.h" |
44 | 44 | ||
45 | unsigned long mpc_crc32(unsigned char *buf, int len); | ||
46 | /* rockbox: not used | 45 | /* rockbox: not used |
47 | static const char na[] = "n.a."; | 46 | static const char na[] = "n.a."; |
48 | static char const * const versionNames[] = { | 47 | static char const * const versionNames[] = { |
diff --git a/apps/codecs/libmusepack/synth_filter.c b/apps/codecs/libmusepack/synth_filter.c index b6caf4a3d7..0f415a4838 100644 --- a/apps/codecs/libmusepack/synth_filter.c +++ b/apps/codecs/libmusepack/synth_filter.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include "mpcdec.h" | 39 | #include "mpcdec.h" |
40 | #include "decoder.h" | 40 | #include "decoder.h" |
41 | #include "mpcdec_math.h" | 41 | #include "mpcdec_math.h" |
42 | #include "internal.h" | ||
42 | 43 | ||
43 | /* C O N S T A N T S */ | 44 | /* C O N S T A N T S */ |
44 | #undef _ | 45 | #undef _ |