From patchwork Thu May 28 13:57:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19933 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 94F6144A156 for ; Thu, 28 May 2020 16:57:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 82DD568AF0D; Thu, 28 May 2020 16:57:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 162DF68AD9D for ; Thu, 28 May 2020 16:57:48 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id y18so13556209pfl.9 for ; Thu, 28 May 2020 06:57:47 -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=ynet0j1Tc87idiyqkVyqFFioOZYuS37yQO2TTNeFpEw=; b=pOao02UoKBJ9D+QGSdAdvAdLlUy8uUXmbbD4gDIofi049Y5IxNCgpXvJE5rXOzfyz8 w1otUjlku5c2jTAxzSNkkC9rJ6+V2QOqcJae4nSm94/GH30bBxghn9fZbRn9EJJx/mmU C+Irt7tZ/8X6quR7X4JYFyfCWgbUCZZWtPsOsv9MYaSm2qsxaIhXDM44z20VT15vZhK+ ESmQXocCI0ZQO+8pMDsD4gGoJFs32J/8E3J18nuTiTL/DMZr5IUjJ04Ram1pbQdX+Ym/ Ag+a+2k3M4RaVh/0pH7X5OnTt9AHgnuPkciYiXaP0jTQ42+bX1QN5R3XsDzm9RPZxofC 9KpQ== 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=ynet0j1Tc87idiyqkVyqFFioOZYuS37yQO2TTNeFpEw=; b=IdRMEZFtcKgyzMSfo7rVmRUgYQ9nNhPUuCqSkHbv+tRjMmRRUwWM99TbUC9S0XFhR3 sQKX0EV7Rz0gVwtUJEcV6v7U5U6s0IdQlg3yZMBGNGdUdtee3aBqlhdyNNsANVnM/SUM zS98uaWyDDcFtJ4Ui8IPhRDdtzRJMc0vYql4xOmXXMJQfDfdnP5ZTE3caoKJcaqYDwiD 7oNZJZs6bpNn3JWNpZxVfpn52EbgMvD+Bc6+YCxV7mzmUviFCMJZzGwLmDKwIpqifY/X ADdKRFtCfZtVKHc5uBdr0LweCj2AHzZ8vu9UYa2gRwEVe54h8yrG+uuL212TkzttspVp M6oQ== X-Gm-Message-State: AOAM5321pZVNlDbkKhXHwExK4Co3p7dKEdp8DoYxFJLM30PlkEbC/xF6 tZs3cOpat4JRPhtv49VT8uO0kwcV X-Google-Smtp-Source: ABdhPJw1fzi/8Yuk1l7kcrlib/F3EqISkbLJw3x0m3utATfUpxvvKIB4RHGzb5Eda2LtnpRV693nHA== X-Received: by 2002:a63:a363:: with SMTP id v35mr2852912pgn.95.1590674265816; Thu, 28 May 2020 06:57:45 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x11sm1412118pfm.196.2020.05.28.06.57.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 06:57:45 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 May 2020 21:57:29 +0800 Message-Id: <1590674250-32571-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 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 +++++++++++++------------ libavutil/internal.h | 1 + 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index d5fbc0b..bcb6783 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, diff --git a/libavutil/internal.h b/libavutil/internal.h index 9c4499e..485bc3c 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -137,6 +137,7 @@ # define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,)) #endif +#define FF_ALLOC_TYPED_ARRAY(p, nelem) (p = av_malloc_array(nelem, sizeof(*p))) #define FF_ALLOCZ_TYPED_ARRAY(p, nelem) (p = av_mallocz_array(nelem, sizeof(*p))) #define FF_ALLOC_OR_GOTO(ctx, p, size, label)\