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/synthesis.c | |
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/synthesis.c')
-rw-r--r-- | apps/codecs/libtremor/synthesis.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/codecs/libtremor/synthesis.c b/apps/codecs/libtremor/synthesis.c index 69180b7acf..c47f381592 100644 --- a/apps/codecs/libtremor/synthesis.c +++ b/apps/codecs/libtremor/synthesis.c | |||
@@ -37,7 +37,7 @@ static inline int _vorbis_synthesis1(vorbis_block *vb,ogg_packet *op,int decodep | |||
37 | 37 | ||
38 | /* first things first. Make sure decode is ready */ | 38 | /* first things first. Make sure decode is ready */ |
39 | _vorbis_block_ripcord(vb); | 39 | _vorbis_block_ripcord(vb); |
40 | oggpack_readinit(opb,op->packet); | 40 | oggpack_readinit(opb,op->packet,op->bytes); |
41 | 41 | ||
42 | /* Check the packet type */ | 42 | /* Check the packet type */ |
43 | if(oggpack_read(opb,1)!=0){ | 43 | if(oggpack_read(opb,1)!=0){ |
@@ -102,6 +102,8 @@ int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){ | |||
102 | return _vorbis_synthesis1(vb,op,1); | 102 | return _vorbis_synthesis1(vb,op,1); |
103 | } | 103 | } |
104 | 104 | ||
105 | /* used to track pcm position without actually performing decode. | ||
106 | Useful for sequential 'fast forward' */ | ||
105 | int vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op){ | 107 | int vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op){ |
106 | return _vorbis_synthesis1(vb,op,0); | 108 | return _vorbis_synthesis1(vb,op,0); |
107 | } | 109 | } |
@@ -111,7 +113,7 @@ long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op){ | |||
111 | oggpack_buffer opb; | 113 | oggpack_buffer opb; |
112 | int mode; | 114 | int mode; |
113 | 115 | ||
114 | oggpack_readinit(&opb,op->packet); | 116 | oggpack_readinit(&opb,op->packet,op->bytes); |
115 | 117 | ||
116 | /* Check the packet type */ | 118 | /* Check the packet type */ |
117 | if(oggpack_read(&opb,1)!=0){ | 119 | if(oggpack_read(&opb,1)!=0){ |