Changeset 3 for trunk/src/mpc_decoder.c


Ignore:
Timestamp:
08/12/06 16:21:35 (18 years ago)
Author:
zorg
Message:

Update to 1.2 (work in progress)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/mpc_decoder.c

    r1 r3  
    3636/// Core decoding routines and logic.
    3737
    38 #include "musepack/musepack.h"
    39 #include "musepack/internal.h"
    40 #include "musepack/requant.h"
    41 #include "musepack/huffman.h"
     38#include <mpcdec/mpcdec.h>
     39#include <mpcdec/internal.h>
     40#include <mpcdec/requant.h>
     41#include <mpcdec/huffman.h>
    4242
    4343//------------------------------------------------------------------------------
     
    6262void mpc_decoder_read_bitstream_sv7(mpc_decoder *d);
    6363void mpc_decoder_update_buffer(mpc_decoder *d, mpc_uint32_t RING);
    64 BOOL mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample);
     64mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample);
    6565void mpc_decoder_requantisierung(mpc_decoder *d, const mpc_int32_t Last_Band);
    6666
     
    7373};
    7474
    75 static BOOL f_seek(mpc_decoder *d, mpc_int32_t offset)
     75static mpc_bool_t f_seek(mpc_decoder *d, mpc_int32_t offset)
    7676{
    7777    return d->r->seek(d->r->data, offset);
     
    992992        case -1:
    993993            for (k=0; k<36; k++ ) {
    994                 tmp  = random_int(d);
     994                tmp  = mpc_random_int(d);
    995995                *L++ = ((tmp >> 24) & 0xFF) + ((tmp >> 16) & 0xFF) + ((tmp >>  8) & 0xFF) + ((tmp >>  0) & 0xFF) - 510;
    996996            }
     
    10521052        case -1:
    10531053                for (k=0; k<36; k++ ) {
    1054                     tmp  = random_int(d);
     1054                    tmp  = mpc_random_int(d);
    10551055                    *R++ = ((tmp >> 24) & 0xFF) + ((tmp >> 16) & 0xFF) + ((tmp >>  8) & 0xFF) + ((tmp >>  0) & 0xFF) - 510;
    10561056                }
     
    11921192}
    11931193
    1194 BOOL mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si)
     1194mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si)
    11951195{
    11961196    mpc_decoder_set_streaminfo(d, si);
     
    12651265}
    12661266
    1267 BOOL mpc_decoder_seek_seconds(mpc_decoder *d, double seconds)
     1267mpc_bool_t mpc_decoder_seek_seconds(mpc_decoder *d, double seconds)
    12681268{
    12691269    return mpc_decoder_seek_sample(d, (mpc_int64_t)(seconds * (double)d->SampleRate + 0.5));
    12701270}
    12711271
    1272 BOOL mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample)
     1272mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample)
    12731273{
    12741274    mpc_uint32_t fpos;
Note: See TracChangeset for help on using the changeset viewer.