Changeset 3063:955233719a84 in roaraudio for libroardsp/convert.c

Timestamp:

12/26/09 20:36:31 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use memory functions from libroar, not libc, fixed a small memory leak

File:

• libroardsp/convert.c (modified) (14 diffs)

libroardsp/convert.c

@@ -548 +548 @@
  double radio = (double) to / (double) from;
  int outsamples = radio * samples;
- float * inf  = malloc(samples*sizeof(float));
- float * outf = malloc(outsamples*sizeof(float));
+ float * inf  = roar_mm_malloc(samples*sizeof(float));
+ float * outf = roar_mm_malloc(outsamples*sizeof(float));
  int i;
  SRC_DATA srcdata;
@@ -557 +557 @@
  if ( inf == NULL ) {
   if ( outf != NULL )
-   free(outf);
+   roar_mm_free(outf);
 
   return -1;
@@ -564 +564 @@
  if ( outf == NULL ) {
   if ( inf != NULL )
-   free(inf);
+   roar_mm_free(inf);
 
   return -1;
@@ -583 +583 @@
    break;
   default:
-    free(outf);
-    free(inf);
+    roar_mm_free(outf);
+    roar_mm_free(inf);
     return -1;
  }
@@ -595 +595 @@
 
  if ( src_simple(&srcdata, SRC_ZERO_ORDER_HOLD, channels) != 0 ) {
-  free(outf);
-  free(inf);
+  roar_mm_free(outf);
+  roar_mm_free(inf);
   return -1;
  }
@@ -616 +616 @@
  }
 
- free(outf);
- free(inf);
+ roar_mm_free(outf);
+ roar_mm_free(inf);
 
  return 0;
@@ -883 +883 @@
   real_out = out;
 
-  if ( (out = malloc(from_size)) == NULL )
-   return -1;
-
-  ROAR_DBG("roar_conv(*): malloc(%i)=%p", (int)from_size, out);
+  if ( (out = roar_mm_malloc(from_size)) == NULL )
+   return -1;
+
+  ROAR_DBG("roar_conv(*): roar_mm_malloc(%i)=%p", (int)from_size, out);
  }
 
@@ -895 +895 @@
   if ( roar_conv_endian(out, ip, samples, ROAR_CODEC_BYTE_ORDER(from->codec), ROAR_CODEC_NATIVE_ENDIAN, from->bits) == -1 ) {
    if ( to_size < from_size )
-    free(out);
+    roar_mm_free(out);
    return -1;
   } else {
@@ -905 +905 @@
   if ( roar_conv_bits(out, ip, samples, from->bits, to->bits) == -1 ) {
    if ( to_size < from_size )
-    free(out);
+    roar_mm_free(out);
    return -1;
   } else {
@@ -915 +915 @@
   if ( roar_conv_signedness(out, ip, samples, ROAR_CODEC_IS_SIGNED(from->codec), ROAR_CODEC_IS_SIGNED(to->codec), to->bits) == -1 ) {
    if ( to_size < from_size )
-    free(out);
+    roar_mm_free(out);
    return -1;
   } else {
@@ -935 +935 @@
    ROAR_DBG("roar_conv(*): failed to convert rate %i->%i (%ich%ibits)", from->rate, to->rate, to->bits, from->channels);
    if ( to_size < from_size )
-    free(out);
+    roar_mm_free(out);
    return -1;
   } else {
@@ -946 +946 @@
   if ( roar_conv_chans(out, ip, samples, from->channels, to->channels, to->bits) == -1 ) {
    if ( to_size < from_size )
-    free(out);
+    roar_mm_free(out);
    return -1;
   } else {
@@ -956 +956 @@
   if ( roar_conv_endian(out, ip, samples, ROAR_CODEC_NATIVE_ENDIAN, ROAR_CODEC_BYTE_ORDER(to->codec), to->bits) == -1 ) {
    if ( to_size < from_size )
-    free(out);
+    roar_mm_free(out);
    return -1;
   } else {
@@ -966 +966 @@
   ROAR_DBG("roar_conv(*): memcpy(%p, %p, %i) = ?", real_out, out, (int)to_size);
   memcpy(real_out, out, to_size);
-  free(out);
+  roar_mm_free(out);
   ROAR_DBG("roar_conv(*): free(%p): OK!", out);
  }