From patchwork Wed Dec 28 02:43:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Turner X-Patchwork-Id: 1956 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1754581vsb; Tue, 27 Dec 2016 18:43:35 -0800 (PST) X-Received: by 10.28.129.208 with SMTP id c199mr27354867wmd.53.1482893015332; Tue, 27 Dec 2016 18:43:35 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kb9si52111074wjc.139.2016.12.27.18.43.34; Tue, 27 Dec 2016 18:43:35 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=QUARANTINE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77859689D6C; Wed, 28 Dec 2016 04:43:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4B90689818 for ; Wed, 28 Dec 2016 04:43:21 +0200 (EET) Received: by mail-pg0-f67.google.com with SMTP id n5so14156031pgh.3 for ; Tue, 27 Dec 2016 18:43:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=u6+sG8hiiC0sar62+pKPKJJB5HkNFKtEd/8YDPKpFXY=; b=DQt7GwNOIdm8kg/6sMn+aJw8YdRPo4cVDjJPRHREZnCntGkEAsxNASBxHvWaxVG4kJ gyXqT/BT5xKcILzAd+wp0KiWg3vDmGByP8WktONdYrVjCMxpJ0Xr1Rjt6tSsnqcwMEAU 2IjT93NDspF1OLWmhbRM2/3MrECJDVvHDxqKJx8nPX7+bmOg7YTjWCSwDuPVUzutUXCb OFgCmyi7/jDSNY8NapnB+qyzdCpGvsFi7pXOcE0UAEidGTAchknb3zZ3R1bxSDJGSK62 GkK3R76DzFgbu3pk+ZH/MZrySw/5YwJqX0brGhuhGw/OqiUesvK2MGRY2lkGcIbJT7Zj FJVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=u6+sG8hiiC0sar62+pKPKJJB5HkNFKtEd/8YDPKpFXY=; b=oIQcI1kPpkO9llnbm7ql5w2kPhZ4Mf/FKjmjaqjYdhSV9V1fsA2EIqb07ZTrE7R5EN eV5qwMbnuAUAXq91GJ1Qn7ihrzT4E+TDzpMC7B0miUBc96FgYgRkG0F8b6F+5nquJHt8 kRoiroEhYTUHRE/kTN5oBkLhpsUiTy8Xj7gFcKk43R2h9gBJ5rvyJ21InhQliSZQvpM4 OAg2j7IxUdwFFAhmQZZZtysK2VxOmYEzEJ+q86ZuW/LygHHJQjfni4X1sd7pAp0VpeWv 60d42qS0iHfBehlE95pZCtzBQj4zQLydrDa7cdlJkQn109xdQbeFt8xNFLDbe7Jfmi2e kOmQ== X-Gm-Message-State: AIkVDXL4gB+xGOj2J9sXKE0JqiSLAL+yJvYdjsxCbXWwPd+tAnUAEjxfviN0TIhvQGN4GQ== X-Received: by 10.98.76.8 with SMTP id z8mr31997312pfa.167.1482893002798; Tue, 27 Dec 2016 18:43:22 -0800 (PST) Received: from Zany.fios-router.home ([47.147.141.23]) by smtp.gmail.com with ESMTPSA id t3sm49850560pfb.60.2016.12.27.18.43.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Dec 2016 18:43:22 -0800 (PST) From: Thomas Turner To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Dec 2016 18:43:18 -0800 Message-Id: <1482893000-29962-1-git-send-email-thomastdt@googlemail.com> X-Mailer: git-send-email 1.9.1 Subject: [FFmpeg-devel] [PATCH 1/3] avutil/tests/audio_fifo.c: use av_malloc() family of functions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: James Almer MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer Signed-off-by: Thomas Turner --- 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 34c8573..9dc6054 100644 --- a/libavutil/tests/audio_fifo.c +++ b/libavutil/tests/audio_fifo.c @@ -19,6 +19,7 @@ #include #include #include +#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); }