diff options
author | Nils Wallménius <nils@rockbox.org> | 2010-12-06 14:36:52 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2010-12-06 14:36:52 +0000 |
commit | 67efbc13870ee87ce3df442f7c396c13481921ec (patch) | |
tree | eaf63d36c5bf2d41a6b3bb2addecb4d3c05f7eef /apps/codecs/libtremor/ivorbisfile.h | |
parent | 1f64b7fb1fa5058e3b7871078055156eac0c511d (diff) | |
download | rockbox-67efbc13870ee87ce3df442f7c396c13481921ec.tar.gz rockbox-67efbc13870ee87ce3df442f7c396c13481921ec.zip |
libtremor:
Merge in upstream revision 17375.
This removes tremor's internal ogg code and now uses libogg instead so a bunch of changes are just adjusting to the new api. Also brings in improvements to vorbisfile which fixes FS#10484.
Disabled a lot of unused code in the libogg files and moved some small functions into the ogg.h header so they can be inlined. Some small tweaks to fix warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28742 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libtremor/ivorbisfile.h')
-rw-r--r-- | apps/codecs/libtremor/ivorbisfile.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/codecs/libtremor/ivorbisfile.h b/apps/codecs/libtremor/ivorbisfile.h index 39a648961a..1aeb0ca84b 100644 --- a/apps/codecs/libtremor/ivorbisfile.h +++ b/apps/codecs/libtremor/ivorbisfile.h | |||
@@ -56,7 +56,7 @@ typedef struct OggVorbis_File { | |||
56 | int seekable; | 56 | int seekable; |
57 | ogg_int64_t offset; | 57 | ogg_int64_t offset; |
58 | ogg_int64_t end; | 58 | ogg_int64_t end; |
59 | ogg_sync_state *oy; | 59 | ogg_sync_state oy; |
60 | 60 | ||
61 | /* If the FILE handle isn't seekable (eg, a pipe), only the current | 61 | /* If the FILE handle isn't seekable (eg, a pipe), only the current |
62 | stream appears */ | 62 | stream appears */ |
@@ -77,7 +77,7 @@ typedef struct OggVorbis_File { | |||
77 | ogg_int64_t bittrack; | 77 | ogg_int64_t bittrack; |
78 | ogg_int64_t samptrack; | 78 | ogg_int64_t samptrack; |
79 | 79 | ||
80 | ogg_stream_state *os; /* take physical pages, weld into a logical | 80 | ogg_stream_state os; /* take physical pages, weld into a logical |
81 | stream of packets */ | 81 | stream of packets */ |
82 | vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ | 82 | vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ |
83 | vorbis_block vb; /* local working space for packet->PCM decode */ | 83 | vorbis_block vb; /* local working space for packet->PCM decode */ |
@@ -87,13 +87,11 @@ typedef struct OggVorbis_File { | |||
87 | } OggVorbis_File; | 87 | } OggVorbis_File; |
88 | 88 | ||
89 | extern int ov_clear(OggVorbis_File *vf); | 89 | extern int ov_clear(OggVorbis_File *vf); |
90 | //extern int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes); | ||
91 | extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf, | 90 | extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf, |
92 | char *initial, long ibytes, ov_callbacks callbacks); | 91 | const char *initial, long ibytes, ov_callbacks callbacks); |
93 | 92 | ||
94 | //extern int ov_test(FILE *f,OggVorbis_File *vf,char *initial,long ibytes); | ||
95 | extern int ov_test_callbacks(void *datasource, OggVorbis_File *vf, | 93 | extern int ov_test_callbacks(void *datasource, OggVorbis_File *vf, |
96 | char *initial, long ibytes, ov_callbacks callbacks); | 94 | const char *initial, long ibytes, ov_callbacks callbacks); |
97 | extern int ov_test_open(OggVorbis_File *vf); | 95 | extern int ov_test_open(OggVorbis_File *vf); |
98 | 96 | ||
99 | extern long ov_bitrate(OggVorbis_File *vf,int i); | 97 | extern long ov_bitrate(OggVorbis_File *vf,int i); |