From patchwork Tue Jun 2 15:17:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20102 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 3A4B6449211 for ; Tue, 2 Jun 2020 18:23:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D802D68B151; Tue, 2 Jun 2020 18:18:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1BF168B11A for ; Tue, 2 Jun 2020 18:18:15 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id i12so1520827pju.3 for ; Tue, 02 Jun 2020 08:18:15 -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=UL3bkNjVAg1IryvVSyTEmPmXxbWN5wDw+TQMBZbxK7w=; b=MMrTT4/YcbRtjDYslmlJ+qDqauvSrflI03gqcOpzOdUaHwA29KpCfU31AAav4jQofF SfgD8JATXHeIxSSx6WlGWGYcH+hUmlFQZU921FhRaigmejJJKYreBp4p50QBLP8AAqe4 wk+lwW2sg2GH/lwsfneQB3ItVPKlTuKscVw5n+js8Z1hSPwS1R9RO9Cx3BrsXE0qkKvj SltvxLmkf//FjMzWqpS7XipZ7y+CJGHklb1/ToVPvxvrUTuTzo2Pmix4J9rghSkNWKEl m19BzbcQaLFUpSbP4IlcWNL1pWCm5+JKfXkSlCShQ3TH+6k3BkcEW8J6RYQvY/chwln/ G7XA== 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=UL3bkNjVAg1IryvVSyTEmPmXxbWN5wDw+TQMBZbxK7w=; b=T0DkV4/RUzbjeOeeb6jv6NeQDqHbMDYm1KG53cHeW6B992AHq5dmnusvNickCPNLRu qURr+YyHBH5oSVmPZzwCzp9ua+SnheL/Bx2qePh0jECYOugcX3n/JGI057eIv2TbBLfj 2IUml/GuNKEwYtps+r+zLUcbXw2FxH0r/u1co3PUJVv8e24P0LtyHPaPvYgqYeelXf1A AqM31XQ9s3Jtj+xZx4HmUXWoDjp4uUs4BAiyBAbbfgX7ssJViTIWIMFgWZbRPYDrM2AT p0uNqZRXMjyWVJDYtsHzR1+BskgRWjqiPF7aXn5cQMGUBAsGN7fggaHMtkwIeqUGIOYm o95A== X-Gm-Message-State: AOAM530SlrHLTmsZ10S6/nxi8sj7rSEJche0B41ZG0T6w5If/ZF6hoWu PWjU9QdHjJOCa0FLkjiTl+AjLF9u X-Google-Smtp-Source: ABdhPJwL8EbZNcmXqxxhNxFQTdwDVrcV8oaU+kbiJIZsocD6MhUx23+PaENjDOaZMod0rdYxyQgIog== X-Received: by 2002:a17:902:7403:: with SMTP id g3mr1765291pll.342.1591111093804; Tue, 02 Jun 2020 08:18:13 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b15sm2958089pjb.18.2020.06.02.08.18.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:18:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:17:03 +0800 Message-Id: <1591111034-15499-35-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 18/22] avcodec/mpegpicture: 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/mpegpicture.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index be90ece..83426bb 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -78,19 +78,15 @@ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me, // at uvlinesize. It supports only YUV420 so 24x24 is enough // linesize * interlaced * MBsize // we also use this buffer for encoding in encode_mb_internal() needig an additional 32 lines - FF_ALLOCZ_ARRAY_OR_GOTO(avctx, sc->edge_emu_buffer, alloc_size, EMU_EDGE_HEIGHT, - fail); - - FF_ALLOCZ_ARRAY_OR_GOTO(avctx, me->scratchpad, alloc_size, 4 * 16 * 2, - fail) + if (!FF_ALLOCZ_TYPED_ARRAY(sc->edge_emu_buffer, alloc_size * EMU_EDGE_HEIGHT) || + !FF_ALLOCZ_TYPED_ARRAY(me->scratchpad, alloc_size * 4 * 16 * 2)) + return AVERROR(ENOMEM); me->temp = me->scratchpad; sc->rd_scratchpad = me->scratchpad; sc->b_scratchpad = me->scratchpad; sc->obmc_scratchpad = me->scratchpad + 16; return 0; -fail: - return AVERROR(ENOMEM); } /**