[FFmpeg-cvslog] avutil/tests/audio_fifo.c: use av_malloc() family of functions
Thomas Turner
git at videolan.org
Sat Dec 31 18:20:16 EET 2016
ffmpeg | branch: master | Thomas Turner <thomastdt at googlemail.com> | Tue Dec 27 18:43:18 2016 -0800| [11b7cad3dc1797ed76725ba3cfba2df1a987eec7] | committer: Michael Niedermayer
avutil/tests/audio_fifo.c: use av_malloc() family of functions
Signed-off-by: Thomas Turner <thomastdt at googlemail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11b7cad3dc1797ed76725ba3cfba2df1a987eec7
---
libavutil/tests/audio_fifo.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/libavutil/tests/audio_fifo.c b/libavutil/tests/audio_fifo.c
index 381f709..4a82a50 100644
--- a/libavutil/tests/audio_fifo.c
+++ b/libavutil/tests/audio_fifo.c
@@ -19,6 +19,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <inttypes.h>
+#include "libavutil/mem.h"
#include "libavutil/audio_fifo.c"
#define MAX_CHANNELS 32
@@ -50,15 +51,6 @@ static void ERROR(const char *str)
exit(1);
}
-static void* allocate_memory(size_t size)
-{
- void *ptr = malloc(size);
- if (ptr == NULL){
- ERROR("failed to allocate memory!");
- }
- return ptr;
-}
-
static void print_audio_bytes(const TestStruct *test_sample, void **data_planes, int nb_samples)
{
int p, b, f;
@@ -85,11 +77,15 @@ static int read_samples_from_audio_fifo(AVAudioFifo* afifo, void ***output, int
int samples = FFMIN(nb_samples, afifo->nb_samples);
int tot_elements = !av_sample_fmt_is_planar(afifo->sample_fmt)
? samples : afifo->channels * samples;
- void **data_planes = allocate_memory(sizeof(void*) * afifo->nb_buffers);
+ void **data_planes = av_malloc_array(afifo->nb_buffers, sizeof(void*));
+ if (!data_planes)
+ ERROR("failed to allocate memory!");
*output = data_planes;
for (i = 0; i < afifo->nb_buffers; ++i){
- data_planes[i] = allocate_memory(afifo->sample_size * tot_elements);
+ data_planes[i] = av_malloc_array(tot_elements, afifo->sample_size);
+ if (!data_planes[i])
+ ERROR("failed to allocate memory!");
}
return av_audio_fifo_read(afifo, *output, nb_samples);
@@ -178,9 +174,9 @@ static void test_function(const TestStruct test_sample)
/* deallocate */
for (i = 0; i < afifo->nb_buffers; ++i){
- free(output_data[i]);
+ av_freep(&output_data[i]);
}
- free(output_data);
+ av_freep(&output_data);
av_audio_fifo_free(afifo);
}
More information about the ffmpeg-cvslog
mailing list