From patchwork Tue Jun 2 15:26:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20121 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8143D449383 for ; Tue, 2 Jun 2020 18:28:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C8C368B31C; Tue, 2 Jun 2020 18:28:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D782A68B0B8 for ; Tue, 2 Jun 2020 18:28:49 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id 64so5191078pfg.8 for ; Tue, 02 Jun 2020 08:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/qr4dxvHMpRtE/8FbrYFhNpl5V1nwzHb3e5HoX+zdSw=; b=JM5KeX8X/c9Xuwbvf/OnIz9+Pare8CXNmhZ8Iq0WQHErpoJRXNYrX5YiJSBwKvpe4s EOX2ibhVN0WfHfgznUaJhc9M7mKwXdeSSHB2HN8eazJyGK+VFFhP3RHH0u08FVWPFmGo wgtKo//y6iLR5gZDPy2QrmkAmU8sZR3HRoBjq5MK/SmLCFyOVHjCPRLOXDSaBVFhJtiP qNEwmFd46KpbmG7X0OnDgLNpCpXiBBHqD34bPdTGbk6rChaQCPQO/yjs2JAZRGuhT2jP b25+eEmincdcO3sLfPg9X8ucdU1cpdMbnfoPXfc1Uoe1gqvY7HDt/gEc4RljI8biiYBq HmKg== 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:in-reply-to :references; bh=/qr4dxvHMpRtE/8FbrYFhNpl5V1nwzHb3e5HoX+zdSw=; b=dexxLyD7G2b1hAXFYfV7LMHDWSEYHPNOpiRwCHIa17qjuQm34CkYqJ4fo1WjM1Mv7U Hp3S91km90/6dUlqCbpcPgE/egtEBj3C4ZDHfMfan0xJB+mhKgRi8iL01Xu8Bljrk/xH VzJLvpJ6nYrFAdJJ6bXOj/wfzLt1eop1A/Ur9L4fmypde4v7GRo1kkvYdZar+/CyUmKN YhtTf5cCmJJTI9/dvEibrHT8wCHCx3SIkjBhJ4bsp1n9NpmJLa+iuDL06khbke2m68xM XjenoCNiSqRrGeK2c5fD13hxpV32WPhijwpRRZEugL3EoHzBLZtlpmUlO7HVkOMoIQaM SOIQ== X-Gm-Message-State: AOAM5329875GbpZRlwzRtY4sFh6t7qoDOOp374/lX2+laPr+EowxWf/c iAlf2MiZpE5HRDNoMyyQq4Vn5RlZ X-Google-Smtp-Source: ABdhPJzui6y79qutd4SE6KVKE0O8KnTIthIQ+VhexFCdN3jTVBQEZzbNr0dY+2fQDhUPWon9ZUIWrQ== X-Received: by 2002:a62:a518:: with SMTP id v24mr24286193pfm.295.1591111728141; Tue, 02 Jun 2020 08:28:48 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.28.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:28:47 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:51 +0800 Message-Id: <1591111618-15778-17-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591111618-15778-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> <1591111618-15778-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 17/24] avcodec/iirfilter: remove FF_ALLOCZ_OR_GOTO and gotos label 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/iirfilter.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c index 749fa57..ddd42c2 100644 --- a/libavcodec/iirfilter.c +++ b/libavcodec/iirfilter.c @@ -171,12 +171,10 @@ av_cold struct FFIIRFilterCoeffs *ff_iir_filter_init_coeffs(void *avc, if (order <= 0 || order > MAXORDER || cutoff_ratio >= 1.0) return NULL; - FF_ALLOCZ_OR_GOTO(avc, c, sizeof(FFIIRFilterCoeffs), - init_fail); - FF_ALLOC_OR_GOTO(avc, c->cx, sizeof(c->cx[0]) * ((order >> 1) + 1), - init_fail); - FF_ALLOC_OR_GOTO(avc, c->cy, sizeof(c->cy[0]) * order, - init_fail); + if (!(c = av_mallocz(sizeof(*c))) || + !(c->cx = av_malloc (sizeof(c->cx[0]) * ((order >> 1) + 1))) || + !(c->cy = av_malloc (sizeof(c->cy[0]) * order))) + return NULL; c->order = order; switch (filt_type) { @@ -190,13 +188,11 @@ av_cold struct FFIIRFilterCoeffs *ff_iir_filter_init_coeffs(void *avc, break; default: av_log(avc, AV_LOG_ERROR, "filter type is not currently implemented\n"); - goto init_fail; + return NULL; } if (!ret) return c; - -init_fail: return NULL; }