From patchwork Tue Jun 2 15:26:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20119 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 38824449383 for ; Tue, 2 Jun 2020 18:28:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C01B68B2C6; Tue, 2 Jun 2020 18:28:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53FCA68B08F for ; Tue, 2 Jun 2020 18:28:47 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id 5so1634726pjd.0 for ; Tue, 02 Jun 2020 08:28:47 -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=E/YZZq7uFXlKvWZj5nO03kobYCv3gRwAtFf/754B0wU=; b=JRMH6A5nkDuLQCG0O5UU/3Yxd/C62Mly8+YSi+nxMUEiZ6kk4xG93fA65PWKZaRJ+Q 63ZgB4hzsnQ7ADiyWvd/YLnJCH/274vmOJk/u5SyIHIuaC+AZmG69SHT+ONUyc/cKFUQ DKQKO8lZm4TDIDs3IfE8jtvQYwOgXEVIKaHqmhqErZjxh9UW3VqODaZroCxh57/m24oq 9NbEFjEndHTG0yxkGYiI6QRRSYD0WOUSbednYgc1dYw37dQQQly3Jdq4sxPuaxfT7min 4+cc5+dRN+4CUjuGeTv/AGLI4ZvB8UajsAQ0XKOdUrC0xAbh1LsqLyLBcAyO6PPqGPPR atqA== 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=E/YZZq7uFXlKvWZj5nO03kobYCv3gRwAtFf/754B0wU=; b=WHOE442xnb2xpB9YU9/rZ3namFbPrCWWEH/cPo5FR4OzX5LkqiTf2G93I30r62sLl+ SUBIgeiIcsrqaeEeK1dsenmoKw/5a0AUOTYkbREZXUf6JlFkoPdXnV3L12KyiatOQthP wfLdHcPLoGBRnb0xndZs8RzslbOI1otOFzd97vl3sk+3k092YC39ZvT3rtgCs8onUwG0 /XDwhFWzxBDK94x/DysvalHL4jb+IVdbQMLGT226qHr2Be5+kIXuFMi0yzDJdJvR6GKr L0/bP2vNq3M8chfXUBctnNl3F5yzvX1mAWVawjvU23m7+c4gQtch4S5PpiSQ+2krJP4L 2z7w== X-Gm-Message-State: AOAM531ee/PZB669XzCj7DQcYn0qiUvhwErOjOHQk7/kKY0ioTMXNEpR 2rLeI87uCA/PQnrrbzSeYJ33XwpZ X-Google-Smtp-Source: ABdhPJyILzdTY2PRvQl9XeLtNME+Yv++YhgeYU61EQx0ECKJ/xKO2/83v186U0RUuM1OGkH7pPzP+g== X-Received: by 2002:a17:90a:6546:: with SMTP id f6mr6115713pjs.55.1591111725518; Tue, 02 Jun 2020 08:28:45 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.28.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:28:45 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:50 +0800 Message-Id: <1591111618-15778-16-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 16/24] avcodec/aacenc: remove FF_ALLOCZ_ARRAY_OR_GOTO and failed 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/aacenc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 189f5e0..e65b76c 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -941,15 +941,14 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s) static av_cold int alloc_buffers(AVCodecContext *avctx, AACEncContext *s) { int ch; - FF_ALLOCZ_ARRAY_OR_GOTO(avctx, s->buffer.samples, s->channels, 3 * 1024 * sizeof(s->buffer.samples[0]), alloc_fail); - FF_ALLOCZ_ARRAY_OR_GOTO(avctx, s->cpe, s->chan_map[0], sizeof(ChannelElement), alloc_fail); + if (!FF_ALLOCZ_TYPED_ARRAY(s->buffer.samples, s->channels * 3 * 1024) || + !FF_ALLOCZ_TYPED_ARRAY(s->cpe, s->chan_map[0])) + return AVERROR(ENOMEM); for(ch = 0; ch < s->channels; ch++) s->planar_samples[ch] = s->buffer.samples + 3 * 1024 * ch; return 0; -alloc_fail: - return AVERROR(ENOMEM); } static av_cold void aac_encode_init_tables(void) @@ -1078,13 +1077,13 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) s->options.mid_side = 0; if ((ret = dsp_init(avctx, s)) < 0) - goto fail; + return ret; if ((ret = alloc_buffers(avctx, s)) < 0) - goto fail; + return ret; if ((ret = put_audio_specific_config(avctx))) - goto fail; + return ret; sizes[0] = ff_aac_swb_size_1024[s->samplerate_index]; sizes[1] = ff_aac_swb_size_128[s->samplerate_index]; @@ -1094,7 +1093,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) grouping[i] = s->chan_map[i + 1] == TYPE_CPE; if ((ret = ff_psy_init(&s->psy, avctx, 2, sizes, lengths, s->chan_map[0], grouping)) < 0) - goto fail; + return ret; s->psypp = ff_psy_preprocess_init(avctx); ff_lpc_init(&s->lpc, 2*avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON); s->random_state = 0x1f2e3d4c; @@ -1114,8 +1113,6 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) ff_af_queue_init(avctx, &s->afq); return 0; -fail: - return ret; } #define AACENC_FLAGS AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM