summaryrefslogtreecommitdiffstats
path: root/apps/codecs
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-06-24 18:48:04 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-06-24 18:48:04 +0000
commitd7ee0fe076e5fd15c9bf1d46af266a5871dbe3c7 (patch)
treebad659cbb722350d491ac703b93044a5ae542d0f /apps/codecs
parent9079cddd832366fce51d853926cba3bad14837d4 (diff)
downloadrockbox-d7ee0fe076e5fd15c9bf1d46af266a5871dbe3c7.tar.gz
rockbox-d7ee0fe076e5fd15c9bf1d46af266a5871dbe3c7.zip
Housekeeping. Comment musepack code seqments unused in rockbox.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27111 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r--apps/codecs/libmusepack/internal.h3
-rw-r--r--apps/codecs/libmusepack/mpc_decoder.c2
-rw-r--r--apps/codecs/libmusepack/mpc_demux.c10
-rw-r--r--apps/codecs/libmusepack/mpcdec.h10
4 files changed, 23 insertions, 2 deletions
diff --git a/apps/codecs/libmusepack/internal.h b/apps/codecs/libmusepack/internal.h
index c4d789f617..760f50b02d 100644
--- a/apps/codecs/libmusepack/internal.h
+++ b/apps/codecs/libmusepack/internal.h
@@ -78,10 +78,11 @@ struct mpc_demux_t {
mpc_uint32_t seek_table_size; /// used size in seek_table
// chapters
+/* rockbox: not used
mpc_seek_t chap_pos; /// supposed position of the first chapter block
mpc_int_t chap_nb; /// number of chapters (-1 if unknown, 0 if no chapter)
mpc_chap_info * chap; /// chapters position and tag
-
+*/
};
/**
diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c
index 7032049c7a..7ff677aa27 100644
--- a/apps/codecs/libmusepack/mpc_decoder.c
+++ b/apps/codecs/libmusepack/mpc_decoder.c
@@ -272,10 +272,12 @@ mpc_decoder * mpc_decoder_init(mpc_streaminfo *si)
return p_tmp;
}
+/* rockbox: not used
void mpc_decoder_exit(mpc_decoder *d)
{
(void)d;
}
+*/
void mpc_decoder_decode_frame(mpc_decoder * d,
mpc_bits_reader * r,
diff --git a/apps/codecs/libmusepack/mpc_demux.c b/apps/codecs/libmusepack/mpc_demux.c
index 70ac3bd416..9b47802ac2 100644
--- a/apps/codecs/libmusepack/mpc_demux.c
+++ b/apps/codecs/libmusepack/mpc_demux.c
@@ -155,7 +155,7 @@ mpc_demux_seek(mpc_demux * d, mpc_seek_t fpos, mpc_uint32_t min_bytes) {
* @param d demuxer context
* @return current stream position in bits
*/
-mpc_seek_t mpc_demux_pos(mpc_demux * d)
+static mpc_seek_t mpc_demux_pos(mpc_demux * d)
{
return (((mpc_seek_t)(d->r->tell(d->r)) - d->bytes_total +
d->bits_reader.buff - d->buffer) << 3) + 8 - d->bits_reader.count;
@@ -300,8 +300,10 @@ static void mpc_demux_SP(mpc_demux * d, int size, int block_size)
mpc_demux_seek(d, (ptr - size) * 8 + cur, 11);
st_head_size = mpc_bits_get_block(&d->bits_reader, &b);
if (memcmp(b.key, "ST", 2) == 0) {
+/* rockbox: not used
d->chap_pos = (ptr - size + b.size + st_head_size) * 8 + cur;
d->chap_nb = -1;
+*/
mpc_demux_fill(d, (mpc_uint32_t) b.size, 0);
mpc_demux_ST(d);
}
@@ -480,7 +482,9 @@ mpc_demux * mpc_demux_init(mpc_reader * p_reader)
memset(p_tmp, 0, sizeof(mpc_demux));
p_tmp->buffer = g_buffer;
p_tmp->r = p_reader;
+/* rockbox: not used
p_tmp->chap_nb = -1;
+*/
mpc_demux_clear_buff(p_tmp);
if (mpc_demux_header(p_tmp) == MPC_STATUS_OK &&
mpc_demux_seek_init(p_tmp) == MPC_STATUS_OK) {
@@ -495,11 +499,13 @@ mpc_demux * mpc_demux_init(mpc_reader * p_reader)
return p_tmp;
}
+/* rockbox: not used
void mpc_demux_exit(mpc_demux * d)
{
mpc_decoder_exit(d->d);
memset(d->seek_table, 0, sizeof(g_seek_table));
}
+*/
void mpc_demux_get_info(mpc_demux * d, mpc_streaminfo * i)
{
@@ -567,10 +573,12 @@ error:
return MPC_STATUS_INVALIDSV;
}
+/* rockbox: not used
mpc_status mpc_demux_seek_second(mpc_demux * d, double seconds)
{
return mpc_demux_seek_sample(d, (mpc_int64_t)(seconds * (double)d->si.sample_freq + 0.5));
}
+*/
mpc_status mpc_demux_seek_sample(mpc_demux * d, mpc_uint64_t destsample)
{
diff --git a/apps/codecs/libmusepack/mpcdec.h b/apps/codecs/libmusepack/mpcdec.h
index be18cfec95..f6aab9b16e 100644
--- a/apps/codecs/libmusepack/mpcdec.h
+++ b/apps/codecs/libmusepack/mpcdec.h
@@ -95,6 +95,7 @@ typedef struct mpc_frame_info_t {
mpc_bool_t is_key_frame; /// 1 if this frame is a key frame (first in block) 0 else. Set by the demuxer.
} mpc_frame_info;
+/* rockbox: not used
typedef struct mpc_chap_info_t {
mpc_uint64_t sample; /// sample where the chapter starts
mpc_uint16_t gain; /// replaygain chapter value
@@ -102,14 +103,17 @@ typedef struct mpc_chap_info_t {
mpc_uint_t tag_size; /// size of the tag element (0 if no tag is present for this chapter)
char * tag; /// pointer to an APEv2 tag without the preamble
} mpc_chap_info;
+*/
/// Initializes mpc decoder with the supplied stream info parameters.
/// \param si streaminfo structure indicating format of source stream
/// \return pointer on the initialized decoder structure if successful, 0 if not
MPC_API mpc_decoder * mpc_decoder_init(mpc_streaminfo *si);
+/* rockbox: not used
/// Releases input mpc decoder
MPC_API void mpc_decoder_exit(mpc_decoder *p_dec);
+*/
/**
* Sets decoder sample scaling factor. All decoded samples will be multiplied
@@ -129,8 +133,10 @@ MPC_API void mpc_decoder_decode_frame(mpc_decoder * d, mpc_bits_reader * r, mpc_
* @return an initialized mpc_demux pointer
*/
MPC_API mpc_demux * mpc_demux_init(mpc_reader * p_reader);
+/* rockbox: not used
/// free demuxer
MPC_API void mpc_demux_exit(mpc_demux * d);
+*/
/**
* Calls mpc_decoder_scale_output to set the scaling factor according to the
* replay gain stream information and the supplied ouput level
@@ -150,11 +156,15 @@ MPC_API mpc_status mpc_demux_decode(mpc_demux * d, mpc_frame_info * i);
MPC_API void mpc_demux_get_info(mpc_demux * d, mpc_streaminfo * i);
/// seeks to a given sample
MPC_API mpc_status mpc_demux_seek_sample(mpc_demux * d, mpc_uint64_t destsample);
+/* rockbox: not used
/// seeks to a given second
MPC_API mpc_status mpc_demux_seek_second(mpc_demux * d, double seconds);
+*/
+/* rockbox: keep static
/// \return the current position in the stream (in bits) from the beginning of the file
MPC_API mpc_seek_t mpc_demux_pos(mpc_demux * d);
+*/
/// chapters : only for sv8 streams
/**