From patchwork Tue Jun 2 15:26:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20114 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 73BD5449383 for ; Tue, 2 Jun 2020 18:28:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5BC7168B1E1; Tue, 2 Jun 2020 18:28:35 +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 753B268B1D0 for ; Tue, 2 Jun 2020 18:28:33 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id 64so5190697pfg.8 for ; Tue, 02 Jun 2020 08:28:33 -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=NFmWYEtQ+aYcFgLy8LQwkwl0EgtNp9Pzp60gUHZnJWr8b8UKXs92KofTxW9iIP+1qI bHlOLyzRBJzApxcC3CwwrGlaAwechvE1PP/TWw93OUBcK1trmxe8Z/rPKkBwjyH411Gq BgASqrOJaS+AiK6KFS5abTbRlgqhmdJ7LGNuxFn3ylroJOTF+jbPIKYBj2jB/mzwNJXy SB6zD9bvVZ1bS9a42c93g3Nz04cpCRqGxbruuXAG8HV/b+OWElrE9NWEHcQFO6IXBdS8 /gYLTH4bQeBgn8rmKViXyC5bZc7q/eynXK9UbhYDBv4six4Y7XRHQfl+WYvg45DObNgy /+4g== 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=H6eG+Z86HRilLpoS6YlxZTTeYWVBBTb3r4AXaTCNPB4s37uKVgNv49c/ibjumwjL9d yRvGYG+vKPH1kiEN1HoYgn2NWY0TKjH2ylf9bdXz7F4OHVAh7oawrQwoR7KQ6ZcXiBHn GLyFa3UB8iHIII4lAet+MFY7STyUkW44JWLUHDcOl8ufLUdMuZ1/loFdogczBHWU9UWk SoKj4kU5gU3AaHDvSvOopu7irsM413ALuVfjBwY0DUHah15VYIT8e5zYqyhO1aI4biSw zKbLZvr2jGQw1nmnT8DpghdgH57pwnclHklKiBx8Q5iED7bjkh6ERaqA9ku9+oE+mCnZ Sa2w== X-Gm-Message-State: AOAM531lTv+qruzYrFowIMeSqxf35uNaDSnA/A7HOMvQGcaCO7QW8MXM MSKXXRyP5pn/JZIVZqMwZSe3iWwO X-Google-Smtp-Source: ABdhPJyPBiNTwomeG5Q3EKxmdyxWQvMry8qW+2QybR7ZRHD1Oq4g/8EaDSJ9LVSmtI3z08bk8wxYpA== X-Received: by 2002:a63:1617:: with SMTP id w23mr25087905pgl.248.1591111711378; Tue, 02 Jun 2020 08:28:31 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.28.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:28:30 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:45 +0800 Message-Id: <1591111618-15778-11-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 11/24] 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); } /**