libtremor: merge upstream revision 17374 and some inline/icode tweaks to maintain speed.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28732 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 11 insertions, 3 deletions

diff --git a/apps/codecs/libtremor/synthesis.c b/apps/codecs/libtremor/synthesis.c
index 35d080180b..69180b7acf 100644
--- a/apps/codecs/libtremor/synthesis.c
+++ b/apps/codecs/libtremor/synthesis.c
@@ -27,9 +27,7 @@
 
 static ogg_int32_t *ipcm_vect[CHANNELS] IBSS_ATTR;
 
-int vorbis_synthesis(vorbis_block *vb,ogg_packet *op,int decodep)
-    ICODE_ATTR_TREMOR_NOT_MDCT;
-int vorbis_synthesis(vorbis_block *vb,ogg_packet *op,int decodep){
+static inline int _vorbis_synthesis1(vorbis_block *vb,ogg_packet *op,int decodep){
   vorbis_dsp_state     *vd=vb->vd;
   private_state        *b=(private_state *)vd->backend_state;
   vorbis_info          *vi=vd->vi;
@@ -98,6 +96,16 @@ int vorbis_synthesis(vorbis_block *vb,ogg_packet *op,int decodep){
   }
 }
 
+int vorbis_synthesis(vorbis_block *vb,ogg_packet *op)
+  ICODE_ATTR_TREMOR_NOT_MDCT;
+int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){
+  return _vorbis_synthesis1(vb,op,1);
+}
+
+int vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op){
+  return _vorbis_synthesis1(vb,op,0);
+}
+
 long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op){
   codec_setup_info     *ci=(codec_setup_info *)vi->codec_setup;
   oggpack_buffer       opb;