From patchwork Fri May 29 05:02:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19963 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 6D68A449F72 for ; Fri, 29 May 2020 08:03:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D3AB68AFA9; Fri, 29 May 2020 08:03:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D167D68AB98 for ; Fri, 29 May 2020 08:02:51 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id 124so798787pgi.9 for ; Thu, 28 May 2020 22:02:51 -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=6joJTp83X8MvclYrOHNTl7spiWDR1GsQhfJKIejuhfM=; b=JeyEnZibA7I7JmSBEuryDzo4H7SIJXohzQq8xWKaioTFMfRKCoLSEsc+iRGnakSgTw SrYFLFTYEjbFxrpxu4u2N6t0qJ44VN0gLYXzbbQEfXw/tDPNQWNocnHKpIqBBIh3jkHf Ocg4xb/3zzURydzSodzvTE8adhL5vSt5H3A09rHe0fMOIvVlz3KFpab9UrAqH1R39OnK ziFprZtBVZB4xibkUJSYqcJDNcIm++7+01ZoNOV/CZatxK/oqzT18fot+11efS/LYNIq Ay8AIsQ+hSpwMet8j78aW/FQ9uK/3sORviN8xXl4rNYeMLcRR49Nfzmzr/2x+va9pmu+ 722A== 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=6joJTp83X8MvclYrOHNTl7spiWDR1GsQhfJKIejuhfM=; b=FVveWj2pYYAc+a4BQBduVRUsTk8YVD9G3tI+zTq380/TiWkVAM/IoOo/fgJM1GRnlp BcymSPItC4WPzgXlK5UI5c4UMswQP/2CMB/Lq4dSpyleuXpMEPH+np3lWI5DSYOp+fEC YI4elJJQak6x7ttWkqxr5Xq6iBts5BRIn2gwS2wdS13apku15WTcSuOhZFACXzB8+X8l JYAhYLhA1IK+L2oAHNCmwwwYRaWD9+rAInc/HA+61qrOhZwSRjf1FR2gY3ybGerNxLsG YZ0mn6/v9u7fKHRRVnzoNjrWN5r+iYRBIYEu9QTmJiUIaX3m1Dp6sEfXOA69XbWCjhVT MeYg== X-Gm-Message-State: AOAM5317m9zTljhMbmk6rKcCuK3zzNrktkVealeVBWU219ziPM3B9cWl A9BvGnLLYkz2wVAOjdx4ZMWK72BV X-Google-Smtp-Source: ABdhPJzAMpC8ad8wlUnvMJMixBgpSQSof7vv3YaimRPcEeX+vXrQRJC8i0WfzBPbkqIId5c86JfR7A== X-Received: by 2002:a65:4487:: with SMTP id l7mr6662810pgq.221.1590728569930; Thu, 28 May 2020 22:02:49 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w73sm6351517pfd.113.2020.05.28.22.02.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 22:02:49 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 13:02:33 +0800 Message-Id: <1590728554-23471-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1590728554-23471-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> <1590728554-23471-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 6/7] avcodec/adpcmenc: remove FF_ALLOC_OR_GOTO macros for gotos will be removed 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/adpcmenc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index d5fbc0b9a7..bcb6783c0c 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -89,14 +89,11 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) if (avctx->trellis) { int frontier = 1 << avctx->trellis; int max_paths = frontier * FREEZE_INTERVAL; - FF_ALLOC_OR_GOTO(avctx, s->paths, - max_paths * sizeof(*s->paths), error); - FF_ALLOC_OR_GOTO(avctx, s->node_buf, - 2 * frontier * sizeof(*s->node_buf), error); - FF_ALLOC_OR_GOTO(avctx, s->nodep_buf, - 2 * frontier * sizeof(*s->nodep_buf), error); - FF_ALLOC_OR_GOTO(avctx, s->trellis_hash, - 65536 * sizeof(*s->trellis_hash), error); + if (!FF_ALLOC_TYPED_ARRAY(s->paths, max_paths) || + !FF_ALLOC_TYPED_ARRAY(s->node_buf, 2 * frontier) || + !FF_ALLOC_TYPED_ARRAY(s->nodep_buf, 2 * frontier) || + !FF_ALLOC_TYPED_ARRAY(s->trellis_hash, 65536)) + return AVERROR(ENOMEM); } avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id); @@ -523,7 +520,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, /* stereo: 4 bytes (8 samples) for left, 4 bytes for right */ if (avctx->trellis > 0) { - FF_ALLOC_ARRAY_OR_GOTO(avctx, buf, avctx->channels, blocks * 8, error); + if (!FF_ALLOC_TYPED_ARRAY(buf, avctx->channels * blocks * 8)) + return AVERROR(ENOMEM); for (ch = 0; ch < avctx->channels; ch++) { adpcm_compress_trellis(avctx, &samples_p[ch][1], buf + ch * blocks * 8, &c->status[ch], @@ -618,7 +616,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } if (avctx->trellis > 0) { - FF_ALLOC_OR_GOTO(avctx, buf, 2 * n, error); + if (!(buf = av_malloc(2 * n))) + return AVERROR(ENOMEM); adpcm_compress_trellis(avctx, samples + avctx->channels, buf, &c->status[0], n, avctx->channels); if (avctx->channels == 2) @@ -666,7 +665,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (avctx->trellis > 0) { n = avctx->block_align - 7 * avctx->channels; - FF_ALLOC_OR_GOTO(avctx, buf, 2 * n, error); + if (!(buf = av_malloc(2 * n))) + return AVERROR(ENOMEM); if (avctx->channels == 1) { adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n, avctx->channels); @@ -693,7 +693,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, case AV_CODEC_ID_ADPCM_YAMAHA: n = frame->nb_samples / 2; if (avctx->trellis > 0) { - FF_ALLOC_OR_GOTO(avctx, buf, 2 * n * 2, error); + if (!(buf = av_malloc(2 * n * 2))) + return AVERROR(ENOMEM); n *= 2; if (avctx->channels == 1) { adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n,