From patchwork Tue Jun 2 15:16:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20093 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 67D5744A2A8 for ; Tue, 2 Jun 2020 18:20:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 070B668B063; Tue, 2 Jun 2020 18:17:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8AC368B037 for ; Tue, 2 Jun 2020 18:17:48 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id m1so5225707pgk.1 for ; Tue, 02 Jun 2020 08:17:48 -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=Ft92xiqP4LAlASrue+lwgWd9NCGAu0DJWJkdXVqF2ko=; b=QA9Dx6RL9KQMyjgzo6jmI4ieTMViNhCrzrfWk2nGmeF3zMdmGD/ACv8OvaO/VNGCzx NbXx98ch2ciM+yHco/7RSSVzYqf1Mzi5OFqsSP33UriZ9Sdng9Cu7nxfLkjw+6IkXjG4 l4BzKOojlPUJzIQ7xYWYvQ6bmUsNR0Z7dCab7lFAzGBKPQCxbX8sQ/fGJeerxVd6qEG7 RCMBrwZd1YK++mRl3STF1dO/oXwg8ru0223THlgIZZNdYYAM4x5WRvOQc0IXcu+vyiOP DQ0wAGiFTxDHqM8nsSaiCFZXKAfKll2myAPwUGtHHhB8JuGualoz4Q9A+uZcpXJrmVku ibGA== 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=Ft92xiqP4LAlASrue+lwgWd9NCGAu0DJWJkdXVqF2ko=; b=QEDist8qAuFOAY2jzP+YZ5AbN9zHI9359+22QdCfG3apQpOnWl7ZT+2/o/ZWj9dii2 aEomsmTY10RqCUQ9Fyt7p4LBkaW1A9YJjp3Kaa8PYC9FIexnGVxh+9p+/OkYIsCndJYI EcG3qS/AwEOGsqq18DztaqNdfkcAmN18O/3WjBmoclSolkK6zZvXG8Qbd3nFLll91bV8 OyYlJoLmyCDgG4Dko7ea4RoSL7D+bj6tHlaAkYSD5j9DiY8XIJs1gEv31ejfWGMXFD5/ MuAAhe8HmPuqjVZ9Jfivtf47kQZyAmuJ6+bmke07MVoF1CPqhNvNdSfNka4LREjmEyEw pQ1A== X-Gm-Message-State: AOAM530IVZ3x5cDFMjva8eKvPIBUGFXTYJzKv6LynV9Xlu9nGOj40eUl JoW6j6yd6T9JKM7jUpNQT0ayh7hK X-Google-Smtp-Source: ABdhPJxDkGQa8p0nARhq4bNAoahEQzeHoXksxXNRp5W8B2+sRWvVAkUUnCjM9FhaxbtGihnKEyOxOQ== X-Received: by 2002:a62:770d:: with SMTP id s13mr11971786pfc.266.1591111066782; Tue, 02 Jun 2020 08:17:46 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b15sm2958089pjb.18.2020.06.02.08.17.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:17:46 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:16:46 +0800 Message-Id: <1591111034-15499-18-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 09/22] avcodec/twinvq: remove FF_ALLOCZ_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/twinvq.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c index 34ca184..6dfaf06 100644 --- a/libavcodec/twinvq.c +++ b/libavcodec/twinvq.c @@ -538,6 +538,7 @@ static av_cold int init_mdct_win(TwinVQContext *tctx) int size_m = mtab->size / mtab->fmode[TWINVQ_FT_MEDIUM].sub; int channels = tctx->avctx->channels; float norm = channels == 1 ? 2.0 : 1.0; + int table_size = 2 * mtab->size * channels; for (i = 0; i < 3; i++) { int bsize = tctx->mtab->size / tctx->mtab->fmode[i].sub; @@ -546,25 +547,17 @@ static av_cold int init_mdct_win(TwinVQContext *tctx) return ret; } - FF_ALLOC_ARRAY_OR_GOTO(tctx->avctx, tctx->tmp_buf, - mtab->size, sizeof(*tctx->tmp_buf), alloc_fail); - - FF_ALLOC_ARRAY_OR_GOTO(tctx->avctx, tctx->spectrum, - 2 * mtab->size, channels * sizeof(*tctx->spectrum), - alloc_fail); - FF_ALLOC_ARRAY_OR_GOTO(tctx->avctx, tctx->curr_frame, - 2 * mtab->size, channels * sizeof(*tctx->curr_frame), - alloc_fail); - FF_ALLOC_ARRAY_OR_GOTO(tctx->avctx, tctx->prev_frame, - 2 * mtab->size, channels * sizeof(*tctx->prev_frame), - alloc_fail); + if (!FF_ALLOC_TYPED_ARRAY(tctx->tmp_buf, mtab->size) || + !FF_ALLOC_TYPED_ARRAY(tctx->spectrum, table_size) || + !FF_ALLOC_TYPED_ARRAY(tctx->curr_frame, table_size) || + !FF_ALLOC_TYPED_ARRAY(tctx->prev_frame, table_size)) + return AVERROR(ENOMEM); for (i = 0; i < 3; i++) { int m = 4 * mtab->size / mtab->fmode[i].sub; double freq = 2 * M_PI / m; - FF_ALLOC_ARRAY_OR_GOTO(tctx->avctx, tctx->cos_tabs[i], - (m / 4), sizeof(*tctx->cos_tabs[i]), alloc_fail); - + if (!FF_ALLOC_TYPED_ARRAY(tctx->cos_tabs[i], m / 4)) + return AVERROR(ENOMEM); for (j = 0; j <= m / 8; j++) tctx->cos_tabs[i][j] = cos((2 * j + 1) * freq); for (j = 1; j < m / 8; j++) @@ -576,9 +569,6 @@ static av_cold int init_mdct_win(TwinVQContext *tctx) ff_init_ff_sine_windows(av_log2(mtab->size)); return 0; - -alloc_fail: - return AVERROR(ENOMEM); } /**