From patchwork Tue Jun 2 15:26:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20126 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bac9:0:0:0:0:0 with SMTP id a9csp3784276ybk; Tue, 2 Jun 2020 08:32:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznTWSU/YRf7FeA2ssOvI+fMFOCrCPt6+6Asb+KQRi/HY+vjIjg790n7X3VuuyKd0H9HNfP X-Received: by 2002:adf:f812:: with SMTP id s18mr18105266wrp.28.1591111938740; Tue, 02 Jun 2020 08:32:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591111938; cv=none; d=google.com; s=arc-20160816; b=V+St9oPOJHqB0TxAjcLIp9af5ZZu3d2u2aSjTh5p8nUNZBaOWnvZQUlvYSWm4L4XTf KFrelYYtt/GTm67HafmxUEH6zZrFsvNgxqlOUr11iyTybKAPs8CA6QGuDY59bl6Ro+k6 yqfDC7rYp7NWv5ir1cxtMVgYZIKwDB6UB/s1yeK/1cC9nk4NuRtr7SxTtKfFG5ET2DJi gaNT6/EyfhT2P2BMA8dHyfiezru/8/DhZ9Fbh3jC1dqIfZApSt3P3l50RItarxUl0qlb 8L+hlk+jQ9D7FMNsPVogjaNeVg+d90IyVexKdxOwSaV1IiJ2dfTb0dk6yFUKHa7KWznL IbrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=DfIB+iSDeFi3KeYJK6vPsO/ZDd0tB4V3IeGuWJp7wXQ=; b=Z5xh+C2x5bnL1jEvo/dYF/446wWtV9nSbDpxNbUeupH5ZDD9nTyNjt5X20j46NG5cw pZXcxcQD3ZhmwqMq4U6lhlNEcgQFR2MRPhlC7AZ8CQIr2TbSV9/zYX23W6uRcSc8/vP4 R3vU+UMsY5BHiEiCxVeNuv103eco9uQxwU4vGuk0VfygToDff5a2YC01ALJzOTbPqstG T8ZqHXjeia1vyLprU5/PRZ6z+AuXPYgd8kEKMNLno154ahnHWP9iRbKaXfyNFzinTZgt 5sgmIba/MTO5Uds9q85iIUjdJUFo39YV2FPCXClVUNDZXwLcDV2G3Mt+HEmEF7QLHnfB 52Yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gGF9TGlF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l10si2679211wrc.212.2020.06.02.08.32.18; Tue, 02 Jun 2020 08:32:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gGF9TGlF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3AAD568B3C7; Tue, 2 Jun 2020 18:29:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0303B68B38E for ; Tue, 2 Jun 2020 18:29:03 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id 185so5220009pgb.10 for ; Tue, 02 Jun 2020 08:29:03 -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=1pG2D+PCD3AtixNJYXQ7HuLt5rtuax01qh1wrt4jmto=; b=gGF9TGlF52p74UrfVgT/ZiUaGFeSvofgv6yQJaDjCJdVHiaELKhP6fmuUiJc4Zbdfq BJ5g7IV/eD15B/msaOq63+mx/6SmG/pQpd2dZXmpO47ZiKAlFzEBu2acJTmDsmyoEFvx wgv003DMd57s8BmDqMGiA9k6JOtcaxMwUt96/UbxdMPM4DpMndVjjaAwE7iYc8cpYsM9 a8LE2yaj6YWHGzvLLEfFohi4DUIDx8rx7VckHBnh6RwhpnnLLcI2Jc8S/vViFRe5AzYz /UnnR7EqzoYzyFdH8cJrOvxKEHpcBBtssTsrQHehqszJ33ZJtKoydU3txGUeLRgw/eKQ rYFw== 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=1pG2D+PCD3AtixNJYXQ7HuLt5rtuax01qh1wrt4jmto=; b=k5BxvleqIiqKJKS/xIQqhfhSqOC75innLHHLL07b2sRkOnAbV4hek9epMwHnyLt7dk cVqIvxmaIMoBOEFxzC3eN0IwWHTvwcD29N4IR4cAtFJ6Cobr5jaotSBCdupXwVypEFvw JdG7jr8/NthBgs0OY20z3cKDsJSH3Ur29OQXH2n2KBA/v7aFPB7DrT8j1HhPwxbPE9XU 7O05kx9ducAnUUMRZSt+peAnxC7Dd0rueP00SNGB+BbY+suolfwwoGF1VBt1JXMxxTtV kQDpNP4rh67lJUDlcL3JUZ1LnATNdD4/V/9GxmCP2KGkYlIT0mvzlBmNXSWtBXdgeGfE Wnfg== X-Gm-Message-State: AOAM532R4HAkF01dy+x3HXfnR/15v8jgXX63iWazsJEU6a1vLKQLOHRH 0HZzxDMCUFAHAvsj0Oh+1aitNxxE X-Received: by 2002:a62:7707:: with SMTP id s7mr26658360pfc.90.1591111741852; Tue, 02 Jun 2020 08:29:01 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.29.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:29:01 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:56 +0800 Message-Id: <1591111618-15778-22-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 22/24] avcodec/alac: remove FF_ALLOC_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" X-TUID: WwsOlgHOI5RI Content-Length: 2744 From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/alac.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 3b41373..bf05406 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -489,6 +489,7 @@ static int allocate_buffers(ALACContext *alac) { int ch; unsigned buf_size = alac->max_samples_per_frame * sizeof(int32_t); + unsigned extra_buf_size = buf_size + AV_INPUT_BUFFER_PADDING_SIZE; for (ch = 0; ch < 2; ch++) { alac->predict_error_buffer[ch] = NULL; @@ -497,21 +498,19 @@ static int allocate_buffers(ALACContext *alac) } for (ch = 0; ch < FFMIN(alac->channels, 2); ch++) { - FF_ALLOC_OR_GOTO(alac->avctx, alac->predict_error_buffer[ch], - buf_size, buf_alloc_fail); + if (!(alac->predict_error_buffer[ch] = av_malloc(buf_size))) + return AVERROR(ENOMEM); alac->direct_output = alac->sample_size > 16; if (!alac->direct_output) { - FF_ALLOC_OR_GOTO(alac->avctx, alac->output_samples_buffer[ch], - buf_size + AV_INPUT_BUFFER_PADDING_SIZE, buf_alloc_fail); + if (!(alac->output_samples_buffer[ch] = av_malloc(extra_buf_size))) + return AVERROR(ENOMEM); } - FF_ALLOC_OR_GOTO(alac->avctx, alac->extra_bits_buffer[ch], - buf_size + AV_INPUT_BUFFER_PADDING_SIZE, buf_alloc_fail); + if (!(alac->extra_bits_buffer[ch] = av_malloc(extra_buf_size))) + return AVERROR(ENOMEM); } return 0; -buf_alloc_fail: - return AVERROR(ENOMEM); } static int alac_set_info(ALACContext *alac)