From patchwork Tue Jun 2 15:26:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20118 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 465B8449383 for ; Tue, 2 Jun 2020 18:28:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2BCF968B2A6; Tue, 2 Jun 2020 18:28:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99B5A68B0A1 for ; Tue, 2 Jun 2020 18:28:44 +0300 (EEST) Received: by mail-pj1-f67.google.com with SMTP id s88so1620943pjb.5 for ; Tue, 02 Jun 2020 08:28:44 -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=9Q2SWRaMTWsEoa/sJUTz+Z9evdLpumpLmgOfT7xhIeU=; b=d6+TSUz82d/nbMmfy808GctD0e4dTTuElTD0q7QueBCMyAt1e9NG73XnWVAOBsCWbL +ZqYDgITT+b9zMBqLDHAnJ7xY6o196S7CaxwHQ6TUEYALDWEl49jFUWHpv+3SwRl8CWF tFzPOrdE0k8Z8kKh785K2lzxiDFKPjBW6gtyxp/YOfXFTJPKa8UFGv+sqN3wqr7Ngab4 CeroFoGpVKCB1C1HH1Wn8aCEIefDtY64qFqFdo3+2JMKzq42U2k2K4aOyoexC8UjOmNm B1+51m5LOuwwOu1YBroNDNGehEoDr0LbCm8bIF+Gtsby+jBUDOE5tL+zny0NC/Os4/jq WGmw== 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=9Q2SWRaMTWsEoa/sJUTz+Z9evdLpumpLmgOfT7xhIeU=; b=oQvFVgr4J3yFU1nGFHflNG4GvwOn5YqRj6WTxNaAF3aShA/8wuOQw80SnP2itEVEo3 yS+/angb4MH1Dy0GnIBryifNbRcJERafFbklCoK77QD8PEjmc53ldgRku5MQhkirLTzk 1p5LNL6R6tdFd5CM+Oa24C0N7W0yRBViziqHyUUBZgsxXkhzfES2PjCn2ju8d72WBK1A YOljuba7OqHQpvbcr2eSIKl+s5guEU1m6aT5S/jws2HJg1IugNlt4xVwUxak322tFpLd JQd+XGuDQtcvdgyjx0y38vWQ6fhA4tG1uz9WSh4x1JDxpLLYOn+YGbcwzoULbCMGHhsz HAQQ== X-Gm-Message-State: AOAM532rbN89iceB+rcora4KcRePlYF/mhVQoodBr/6XHkjodaEiD9WB r2mkr9C+gJIHvMKePfbL9AFPvZJu X-Google-Smtp-Source: ABdhPJyVfun3fIAQrp3Aaq4KkWUPZ7m/RDJvujXvH4vYqleKAjbs87NHHTS+uVxkXkMdm50h5ORHbQ== X-Received: by 2002:a17:90a:2ac2:: with SMTP id i2mr6054068pjg.80.1591111722815; Tue, 02 Jun 2020 08:28:42 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.28.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:28:42 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:49 +0800 Message-Id: <1591111618-15778-15-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 15/24] avcodec/ac3enc_template: remove FF_ALLOC_ARRAY_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/ac3enc_template.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index be65987..985b35e 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -41,19 +41,16 @@ int AC3_NAME(allocate_sample_buffers)(AC3EncodeContext *s) { int ch; - FF_ALLOC_OR_GOTO(s->avctx, s->windowed_samples, AC3_WINDOW_SIZE * - sizeof(*s->windowed_samples), alloc_fail); - FF_ALLOC_ARRAY_OR_GOTO(s->avctx, s->planar_samples, s->channels, sizeof(*s->planar_samples), - alloc_fail); + if (!FF_ALLOC_TYPED_ARRAY(s->windowed_samples, AC3_WINDOW_SIZE) || + !FF_ALLOC_TYPED_ARRAY(s->planar_samples, s->channels)) + return AVERROR(ENOMEM); + for (ch = 0; ch < s->channels; ch++) { - FF_ALLOCZ_OR_GOTO(s->avctx, s->planar_samples[ch], - (AC3_FRAME_SIZE+AC3_BLOCK_SIZE) * sizeof(**s->planar_samples), - alloc_fail); + if (!(s->planar_samples[ch] = av_mallocz((AC3_FRAME_SIZE + AC3_BLOCK_SIZE) * + sizeof(**s->planar_samples)))) + return AVERROR(ENOMEM); } - return 0; -alloc_fail: - return AVERROR(ENOMEM); }