Changeset 4957:45ba4cf2abe3 in roaraudio for roard/codecfilter_celt.c

Timestamp:

05/13/11 23:30:17 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use roar_mm_*() where possible

File:

• roard/codecfilter_celt.c (modified) (5 diffs)

roard/codecfilter_celt.c

@@ -34 +34 @@
                                             struct roar_stream_server * info,
                                             struct roar_codecfilter   * filter) {
- struct codecfilter_celt_inst * self = malloc(sizeof(struct codecfilter_celt_inst));
+ struct codecfilter_celt_inst * self = roar_mm_malloc(sizeof(struct codecfilter_celt_inst));
  struct roar_stream * s = ROAR_STREAM(info);
 
@@ -62 +62 @@
  self->opened_decoder       = 0;
  self->s_buf                = s->info.channels * self->frame_size * 2;
- self->ibuf                 = malloc(self->s_buf);
- self->obuf                 = malloc(self->s_buf);
- self->i_rest               = malloc(self->s_buf);
- self->o_rest               = malloc(self->s_buf);
+ self->ibuf                 = roar_mm_malloc(self->s_buf);
+ self->obuf                 = roar_mm_malloc(self->s_buf);
+ self->i_rest               = roar_mm_malloc(self->s_buf);
+ self->o_rest               = roar_mm_malloc(self->s_buf);
  self->fi_rest              = 0;
  self->fo_rest              = 0;
 
  if ( !(self->ibuf && self->obuf && self->i_rest && self->o_rest) ) {
-  if ( self->ibuf )
-   free(self->ibuf);
-
-  if ( self->obuf )
-   free(self->obuf);
-
-  if ( self->i_rest )
-   free(self->o_rest);
-
-  if ( self->o_rest )
-   free(self->o_rest);
-
-  free(self);
+  if ( self->ibuf != NULL )
+   roar_mm_free(self->ibuf);
+
+  if ( self->obuf != NULL )
+   roar_mm_free(self->obuf);
+
+  if ( self->i_rest != NULL )
+   roar_mm_free(self->o_rest);
+
+  if ( self->o_rest != NULL )
+   roar_mm_free(self->o_rest);
+
+  roar_mm_free(self);
   return -1;
  }
@@ -93 +93 @@
 
  if ( !self->mode ) {
-  free(self);
+  roar_mm_free(self);
   return -1;
  }
@@ -119 +119 @@
  } else {
   celt_mode_destroy(self->mode);
-  free(self);
+  roar_mm_free(self);
   return -1;
  }
@@ -137 +137 @@
   return -1;
 
- if ( self->encoder )
+ if ( self->encoder != NULL )
   celt_encoder_destroy(self->encoder);
 
- if ( self->decoder )
+ if ( self->decoder != NULL )
   celt_decoder_destroy(self->decoder);
 
- if ( self->mode )
+ if ( self->mode != NULL )
   celt_mode_destroy(self->mode);
 
- if ( self->ibuf )
-  free(self->ibuf);
-
- if ( self->obuf )
-  free(self->obuf);
-
- if ( self->i_rest )
-  free(self->i_rest);
-
- if ( self->o_rest )
-  free(self->o_rest);
-
- free(inst);
+ if ( self->ibuf != NULL )
+  roar_mm_free(self->ibuf);
+
+ if ( self->obuf != NULL )
+  roar_mm_free(self->obuf);
+
+ if ( self->i_rest != NULL )
+  roar_mm_free(self->i_rest);
+
+ if ( self->o_rest != NULL )
+  roar_mm_free(self->o_rest);
+
+ roar_mm_free(inst);
  return 0;
 }