4 files changed, 47 insertions, 69 deletions

diff --git a/apps/codecs/libtremor/block.c b/apps/codecs/libtremor/block.c
index 3947b90239..8a461e325f 100644
--- a/apps/codecs/libtremor/block.c
+++ b/apps/codecs/libtremor/block.c
@@ -283,7 +283,7 @@ void vorbis_dsp_clear(vorbis_dsp_state *v){
     codec_setup_info *ci=(codec_setup_info *)(vi?vi->codec_setup:NULL);
     private_state *b=(private_state *)v->backend_state;
 
-    if(NULL == v->iram_double_pcm)
+    if(NULL == v->iram_double_pcm && vi != NULL)
     {
       /* pcm buffer came from oggmalloc rather than iram */
       for(i=0;i<vi->channels;i++)
diff --git a/apps/codecs/libtremor/oggmalloc.c b/apps/codecs/libtremor/oggmalloc.c
index 6da7cfcedc..3d60370641 100644
--- a/apps/codecs/libtremor/oggmalloc.c
+++ b/apps/codecs/libtremor/oggmalloc.c
@@ -1,85 +1,63 @@
 #include "os_types.h"
+#include "../lib/tlsf/src/tlsf.h"
 
-#if defined(CPU_ARM) || defined(CPU_COLDFIRE)
+#if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS)
 #include <setjmp.h>
 extern jmp_buf rb_jump_buf;
+#define LONGJMP(x)  longjmp(rb_jump_buf, x)
+#elif defined(SIMULATOR)
+#define LONGJMP(x)  do { DEBUGF("Vorbis: allocation failed!\n"); return NULL; } while (false)
+#else
+#define LONGJMP(x)  return NULL
 #endif
 
-static size_t tmp_ptr;
-
 void ogg_malloc_init(void)
 {
-    mallocbuf = ci->codec_get_buffer(&bufsize);
-    tmp_ptr = bufsize & ~3;
-    mem_ptr = 0;
+    size_t bufsize;
+    void* buf = ci->codec_get_buffer(&bufsize);
+    init_memory_pool(bufsize, buf);
 }
 
-void *ogg_malloc(size_t size)
+void ogg_malloc_destroy()
 {
-    void* x;
-
-    size = (size + 3) & ~3;
-
-    if (mem_ptr + size > tmp_ptr)
-#if defined(CPU_ARM) || defined(CPU_COLDFIRE)
-        longjmp(rb_jump_buf, 1);
-#else
-        return NULL;
-#endif
-    
-    x = &mallocbuf[mem_ptr];
-    mem_ptr += size; /* Keep memory 32-bit aligned */
-
-    return x;
+    size_t bufsize;
+    void* buf = ci->codec_get_buffer(&bufsize);
+    destroy_memory_pool(buf);
 }
 
-void *ogg_tmpmalloc(size_t size)
+void *ogg_malloc(size_t size)
 {
-    size = (size + 3) & ~3;
+    void* x = tlsf_malloc(size);
 
-    if (mem_ptr + size > tmp_ptr)
-        return NULL;
+    if (x == NULL)
+        LONGJMP(1);
     
-    tmp_ptr -= size;
-    return &mallocbuf[tmp_ptr];
+    return x;
 }
 
 void *ogg_calloc(size_t nmemb, size_t size)
 {
-    void *x;
-    x = ogg_malloc(nmemb * size);
-    if (x == NULL)
-        return NULL;
-    ci->memset(x, 0, nmemb * size);
-    return x;
-}
+    void *x = tlsf_calloc(nmemb, size);
 
-void *ogg_tmpcalloc(size_t nmemb, size_t size)
-{
-    void *x;
-    x = ogg_tmpmalloc(nmemb * size);
     if (x == NULL)
-        return NULL;
-    ci->memset(x, 0, nmemb * size);
+        LONGJMP(1);
+    
     return x;
 }
 
 void *ogg_realloc(void *ptr, size_t size)
 {
-    void *x;
-    (void)ptr;
-    x = ogg_malloc(size);
-    return x;
-}
+    void *x = tlsf_realloc(ptr, size);
 
-long ogg_tmpmalloc_pos(void)
-{
-    return tmp_ptr;
+    if (x == NULL)
+        LONGJMP(1);
+    
+    return x;
 }
 
-void ogg_tmpmalloc_free(long pos)
+void ogg_free(void* ptr)
 {
-    tmp_ptr = pos;
+    tlsf_free(ptr);
 }
 
 /* Allocate IRAM buffer */
diff --git a/apps/codecs/libtremor/os_types.h b/apps/codecs/libtremor/os_types.h
index 4c7d17ef3a..337c055d54 100644
--- a/apps/codecs/libtremor/os_types.h
+++ b/apps/codecs/libtremor/os_types.h
@@ -38,16 +38,14 @@
 #define _ogg_malloc  ogg_malloc
 #define _ogg_calloc  ogg_calloc
 #define _ogg_realloc ogg_realloc
-#define _ogg_free(x) do { } while(0)
+#define _ogg_free    ogg_free
 
 void ogg_malloc_init(void);
+void ogg_malloc_destroy(void);
 void *ogg_malloc(size_t size);
-void *ogg_tmpmalloc(size_t size);
 void *ogg_calloc(size_t nmemb, size_t size);
-void *ogg_tmpcalloc(size_t nmemb, size_t size);
 void *ogg_realloc(void *ptr, size_t size);
-long ogg_tmpmalloc_pos(void);
-void ogg_tmpmalloc_free(long pos);
+void ogg_free(void *ptr);
 void iram_malloc_init(void);
 void *iram_malloc(size_t size);
 
diff --git a/apps/codecs/libtremor/sharedbook.c b/apps/codecs/libtremor/sharedbook.c
index edabf3ccb3..853d1f5d61 100644
--- a/apps/codecs/libtremor/sharedbook.c
+++ b/apps/codecs/libtremor/sharedbook.c
@@ -71,7 +71,7 @@ static ogg_int32_t _float32_unpack(long val,int *point){
 static ogg_uint32_t *_make_words(long *l,long n,long sparsecount){
   long i,j,count=0;
   ogg_uint32_t marker[33];
-  ogg_uint32_t *r=(ogg_uint32_t *)ogg_tmpmalloc((sparsecount?sparsecount:n)*sizeof(*r));
+  ogg_uint32_t *r=(ogg_uint32_t *)_ogg_malloc((sparsecount?sparsecount:n)*sizeof(*r));
   memset(marker,0,sizeof(marker));
 
   for(i=0;i<n;i++){
@@ -87,7 +87,7 @@ static ogg_uint32_t *_make_words(long *l,long n,long sparsecount){
       /* update ourself */
       if(length<32 && (entry>>length)){
         /* error condition; the lengths must specify an overpopulated tree */
-        /* _ogg_free(r); */
+        _ogg_free(r);
         return(NULL);
       }
       r[count++]=entry;
@@ -188,9 +188,8 @@ static ogg_int32_t *_book_unquantize(const static_codebook *b,int n,
     ogg_int32_t mindel=_float32_unpack(b->q_min,&minpoint);
     ogg_int32_t delta=_float32_unpack(b->q_delta,&delpoint);
     ogg_int32_t *r=(ogg_int32_t *)_ogg_calloc(n*b->dim,sizeof(*r));
-    int *rp=(int *)ogg_tmpcalloc(n*b->dim,sizeof(*rp));
+    int *rp=(int *)_ogg_calloc(n*b->dim,sizeof(*rp));
 
-    memset(rp, 0, n*b->dim*sizeof(*rp));
     *maxpoint=minpoint;
 
     /* maptype 1 and 2 both use a quantized value vector, but
@@ -277,7 +276,7 @@ static ogg_int32_t *_book_unquantize(const static_codebook *b,int n,
       if(rp[j]<*maxpoint)
         r[j]>>=*maxpoint-rp[j];
             
-    /* _ogg_free(rp); */
+    _ogg_free(rp);
     return(r);
   }
   return(NULL);
@@ -325,7 +324,6 @@ static int sort32a(const void *a,const void *b){
 int vorbis_book_init_decode(codebook *c,const static_codebook *s){
   int i,j,n=0,tabn;
   int *sortindex;
-  long pos = ogg_tmpmalloc_pos();
   memset(c,0,sizeof(*c));
   
   /* count actually used entries */
@@ -350,9 +348,13 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){
     
     /* perform sort */
     ogg_uint32_t *codes=_make_words(s->lengthlist,s->entries,c->used_entries);
-    ogg_uint32_t **codep=(ogg_uint32_t **)ogg_tmpmalloc(sizeof(*codep)*n);
+    ogg_uint32_t **codep=(ogg_uint32_t **)_ogg_malloc(sizeof(*codep)*n);
     
-    if(codes==NULL||codep==NULL)goto err_out;
+    if(codes==NULL||codep==NULL){
+        _ogg_free(codep);
+        _ogg_free(codes);
+        goto err_out;
+    }
 
     for(i=0;i<n;i++){
       codes[i]=bitreverse(codes[i]);
@@ -361,7 +363,7 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){
 
     qsort(codep,n,sizeof(*codep),sort32a);
 
-    sortindex=(int *)ogg_tmpmalloc(n*sizeof(*sortindex));
+    sortindex=(int *)_ogg_malloc(n*sizeof(*sortindex));
     c->codelist=(ogg_uint32_t *)_ogg_malloc(n*sizeof(*c->codelist));
     /* the index is a reverse index */
     for(i=0;i<n;i++){
@@ -371,7 +373,8 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){
 
     for(i=0;i<n;i++)
       c->codelist[sortindex[i]]=codes[i];
-    /* _ogg_free(codes); */
+    _ogg_free(codep);
+    _ogg_free(codes);
     
     
     
@@ -387,6 +390,7 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){
       if(s->lengthlist[i]>0)
         c->dec_codelengths[sortindex[n++]]=s->lengthlist[i];
     
+    _ogg_free(sortindex);
     c->dec_firsttablen=_ilog(c->used_entries)-4; /* this is magic */
     if(c->dec_firsttablen<5)c->dec_firsttablen=5;
     if(c->dec_firsttablen>8)c->dec_firsttablen=8;
@@ -434,10 +438,8 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){
     }
   }
 
-  ogg_tmpmalloc_free(pos);
   return(0);
  err_out:
-  ogg_tmpmalloc_free(pos);
   vorbis_book_clear(c);
   return(-1);
 }