From patchwork Tue Jun 2 15:16:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20101 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 77A3E449211 for ; Tue, 2 Jun 2020 18:23:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4226D68B131; Tue, 2 Jun 2020 18:18:17 +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 7060468B122 for ; Tue, 2 Jun 2020 18:18:09 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id 5so1620391pjd.0 for ; Tue, 02 Jun 2020 08:18:09 -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=RB4FWAvGTg9hY3MtiUYvCipg8BhDXVvsW+4zg1EpjJ0ZZRXTHgGMX/JSeoXUfcNWkA 1JLJobmMOsw36MaULQj0lJcudsJoJhz5yv/767eGUcR9Q8w4ot8F//Q6Y59+pStBtpa9 xvYVmi/SEx1H5Um3QYiYCAylxhAZIpE8/PT78H7PZhUxr1BTtcsa8iwBV9VWzdAtqDIb iB8B9khCKvtA8UAaJPkgAz0HQSWKLFMf3MBb8jL7oOrTi1/3VPwNLfUmCA9Hxe3uBZMW /KVvZ4R4+9+kAPNow4M63C8sY8CCjwQ333vvdVLT1eN4yRbzWqLcg6PK/k+T+/XCGD+m gmKQ== 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=szMR2uY+1rKuuR7rcVj6kDIICVat8DOwK2nYD2rt9KsZRCeAd9UpECeepI+p+qtBrZ nW1nDSwBIq70vvMg6h4+vGff93RrSR1BGUGMkto6Eia7oWfWOaQB7tlF7Y4Zu2zdUbEf KzUPkJLJQMtOqzmyFWoKKio1+wmmtp/KXtRNAqAqSbiFKBWX+L2wOMqL+uM7GByGfklN 5aMA3KzavztKNKAoZhb5vvmV6/oVNGLecU/avDbYlfiFKRFxYnoHWi4FuIyksU0Fj8X+ JiOxvki25A+yH+CmlKlRGb+2R63VdcgosfQPoXhiQiUvdk5wZzJqhOuAJN2JRpz/vw7N eL9w== X-Gm-Message-State: AOAM53234lRtNcBKY6j4UaMKX4xaIdGrVHc61hp4S/6vTkeDYKGcoM4U rwXyYZklnNf2PyG/V+DVDm35Dlxz X-Google-Smtp-Source: ABdhPJzwi9aPjlWMcsorzV8gOdet16aGq4trwb8GU+aNDu9xlkU217GIWxrXw/c0ibKgkUY+g4/GrQ== X-Received: by 2002:a17:90b:605:: with SMTP id gb5mr5613736pjb.167.1591111087705; Tue, 02 Jun 2020 08:18:07 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b15sm2958089pjb.18.2020.06.02.08.18.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:18:07 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:16:59 +0800 Message-Id: <1591111034-15499-31-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 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