diff options
| author | Monty <xiphmont@xiph.org> | 2003-03-29 03:07:21 +0000 |
|---|---|---|
| committer | Monty <xiphmont@xiph.org> | 2003-03-29 03:07:21 +0000 |
| commit | 3c764af8013b5b153d3e97311d56a8741536f4cf (patch) | |
| tree | b8201ccdd984c9b5b682641996a19cca15b6593c /ivorbisfile.h | |
| parent | a80cb134d84683d6c4961e2c33fddf3a24b378fa (diff) | |
| download | tremor-3c764af8013b5b153d3e97311d56a8741536f4cf.tar.gz | |
Roll all recent optimizations and fixes to mainline vorbisfile into Tremor
First mainline deployment of libogg 2 (embedded into Tremor)
git-svn-id: https://svn.xiph.org/trunk/Tremor@4565 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'ivorbisfile.h')
| -rw-r--r-- | ivorbisfile.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ivorbisfile.h b/ivorbisfile.h index 3a668f7..dd77378 100644 --- a/ivorbisfile.h +++ b/ivorbisfile.h @@ -26,8 +26,7 @@ extern "C" #include <stdio.h> #include "ivorbiscodec.h" -#define CHUNKSIZE 8192 - +#define CHUNKSIZE 1024 /* The function prototypes for the callbacks are basically the same as for * the stdio functions fread, fseek, fclose, ftell. * The one difference is that the FILE * arguments have been replaced with @@ -56,14 +55,14 @@ typedef struct OggVorbis_File { int seekable; ogg_int64_t offset; ogg_int64_t end; - ogg_sync_state oy; + ogg_sync_state *oy; /* If the FILE handle isn't seekable (eg, a pipe), only the current stream appears */ int links; ogg_int64_t *offsets; ogg_int64_t *dataoffsets; - long *serialnos; + ogg_uint32_t *serialnos; ogg_int64_t *pcmlengths; vorbis_info *vi; vorbis_comment *vc; @@ -71,13 +70,13 @@ typedef struct OggVorbis_File { /* Decoding working state local storage */ ogg_int64_t pcm_offset; int ready_state; - long current_serialno; + ogg_uint32_t current_serialno; int current_link; ogg_int64_t bittrack; ogg_int64_t samptrack; - ogg_stream_state os; /* take physical pages, weld into a logical + ogg_stream_state *os; /* take physical pages, weld into a logical stream of packets */ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ vorbis_block vb; /* local working space for packet->PCM decode */ @@ -106,7 +105,7 @@ extern ogg_int64_t ov_raw_total(OggVorbis_File *vf,int i); extern ogg_int64_t ov_pcm_total(OggVorbis_File *vf,int i); extern ogg_int64_t ov_time_total(OggVorbis_File *vf,int i); -extern int ov_raw_seek(OggVorbis_File *vf,long pos); +extern int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos); extern int ov_pcm_seek(OggVorbis_File *vf,ogg_int64_t pos); extern int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos); extern int ov_time_seek(OggVorbis_File *vf,ogg_int64_t pos); |