From patchwork Tue Jun 2 15:16:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20096 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 D279944A310 for ; Tue, 2 Jun 2020 18:21:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 195F668B0C1; Tue, 2 Jun 2020 18:18:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97E1D68B08D for ; Tue, 2 Jun 2020 18:17:59 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id b201so1086576pfb.0 for ; Tue, 02 Jun 2020 08:17:59 -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=saVGyaKi83kJwpU3JPq4FPDHU3+F//2MtbsNzIaUvz/GHWuw35V5/WC+Qyf4kEt//n QjUCux89IMx3GtHY8tk0SdrPGmU5ylTvlINbdMz+msOm0k0tQnlx2ILcIGNXUb6GmRk2 VRHWoutQo4M9fqJ5Wkz4Vt6dHBqBB335Nvg9XWQVMdXuLSft/9iO5gGvk3Ch7HIYxpPf Cy6hl2bkTvqfBaOhjvuGhhkKUqBNcNIqQ6u85kZrHPmberrk5KZYcYvSX7Lr+0+4WBtJ p9LXWCrNlR6UPL0edH9Ga4xe/BijWlxmgsZ7uu4NSM7eYqg3iyauj2hGu5rXFT1jvEVX lITw== 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=YbBsgCqg44g8y2xbCChalX4WFmopNmir5+hWRBJfNriDe4e0bfIiDmG7myS9Jvh0kr iz4jf19Ij7IeCzWbaVA+CyLSdehI/0BdkiFPqadnciI681jZOKuCht2Yf4QA17NDnDej nlwiOLk5MOxGQnSXSx4U/R/tEkhahMBiXyoZR22uhbxcKcLYkgmpypKU9n9Iy63M/jcG OqkswVMDxya9Ar5N4SJlOZuhHIigdXdsdpmqlTYHjzF/3dEykFIbP1JI3VwECN1veu9T tjHW+Z8/RJ1JJxeWHurHpTG1CncUKAFVyBeNNkNIXoiJRKa9nd0z+W94dst5A+d8Nn3T dxDA== X-Gm-Message-State: AOAM533FnOkRUIcdwz5YZvBA7FQjHgHfMXxXCVRjhCB5hpkUIFRTtNHw Y65dcju3k6xb/sNYkjiD1acEhgL1 X-Google-Smtp-Source: ABdhPJwMKl0/FBBqdq2qWUhdFE7LapA5obi/tWV0gcJYp68aJkid/O7XhpEZIvPzFDH4V4vAGgssPw== X-Received: by 2002:a63:3449:: with SMTP id b70mr25395384pga.289.1591111077738; Tue, 02 Jun 2020 08:17:57 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b15sm2958089pjb.18.2020.06.02.08.17.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:17:57 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:16:53 +0800 Message-Id: <1591111034-15499-25-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591111034-15499-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> <1591111034-15499-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 13/22] 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); }