From patchwork Tue Jun 2 15:26:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20123 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 17CEE449383 for ; Tue, 2 Jun 2020 18:29:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F290A68B336; Tue, 2 Jun 2020 18:28:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F03668B332 for ; Tue, 2 Jun 2020 18:28:58 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id p30so5215832pgl.11 for ; Tue, 02 Jun 2020 08:28:57 -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=m/KTdfuOBEsMWuu20bBE17VOlh1ttIE/5tqObwBJD8McIMj0dnzqI7ogIVUDuy3gMs 8iJr7L5AsnwIQ0xB28nbep6uBEubtYJkLletS5fjjY9f11m0dErdf8O2iOU52xFggSvh JO1TZw/+dB7ZvIHw8XzK3XQQJntvX5l4VJEYxk1lxP2nKIvcs5elROGlgsI2aHqUCKAC 7W390UjDxY9BJghPTkUJYCMUOU3anNf4Y2GqFFpedHIqGViKbjK6EJGC1WT7U5cCCld1 7RiNZNZTaRy2lG7vQBZkFRGkXP7IKApvZe5VkhTR8qKob9hjGwT76W4fODqduMdYkqFA lINw== 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=hS4oAuc7WbIfJSJi6v4zH+u3h/bLvqoLmPKQiZFJxElVSNdvA1ISe2AlzrlKcmi68k hgYPl6QMEztbLHW2IKw9ZVMG2yphcJktROmi74fNi/KCQHadr/LyMLwmsZzRzBhe5a7n EMVBNQyqZYi7mOs/YAaNYPTiI6ew55AAxckM3h6NsmEncIH9Wf69ETJ8E63NF+mV8rl8 2xbzbIiCf4hx92ycNuJzh4rkqvmUzoWURbcOt9GgD+KJ1Sa7as6O/iGxAzSdB757O6OU JMdiIlcfOODiymCONgFVv4rrY4OpNFvwwcJN0NIga87OtG3yP+Sz2hvSAKw3NccxXbGr YhyA== X-Gm-Message-State: AOAM530LBPp4AXwrp0nwNnR4zEJ8mjqvHUKzt7aG/y7SMNnRYcUkAQ8I mBol7+MDBNZekO8lT7PTrmbwJhrN X-Google-Smtp-Source: ABdhPJx1VQid8DKxEHleIy88rYcnZ1yt/o2Cuq/LIFrpxDc5YjQb+GEUiXEicm3/tP7yEWRKoV3vJw== X-Received: by 2002:aa7:9510:: with SMTP id b16mr26333111pfp.265.1591111736216; Tue, 02 Jun 2020 08:28:56 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.28.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:28:55 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:54 +0800 Message-Id: <1591111618-15778-20-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 20/24] 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); } /**