From patchwork Tue Jun 2 15:26:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20125 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bac9:0:0:0:0:0 with SMTP id a9csp3784148ybk; Tue, 2 Jun 2020 08:32:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEIgMytJmVVFF0Tf6sq/KQyzUUT0EWxfxlpixAHd2lORz95dzpv1sCVBQ2UvhxMF80BUol X-Received: by 2002:a1c:5a82:: with SMTP id o124mr4555423wmb.188.1591111925974; Tue, 02 Jun 2020 08:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591111925; cv=none; d=google.com; s=arc-20160816; b=eqIAMwD14N+AfKB2RX7I12EDOC9S0HFN+lC37j3yyT7WNOEwlnyPbCyPm2G+26y1VU yRsjZccF7DH/BbRMlyNsisxw7WdkABKG15lVF7FNCKKpq6yKKUoPghy9QulXMTU/n3St JeN4iEcOH4h++J0Q19M24Mob+nbcODJP9P34RXWniloAjJANXLj7mtJu/WTvd06dCDN2 GrOknD9JKxgXbJ+0sVXsnLxCo/9lBILZzGJsSfN6zh2TTZFqEXlw3wcQYapnZAMtK/7A 2K7dIo0hUcqMbBTyFzjTSSKt4a2HhC/3Um2KNmSWL317hcRo2mR5XvlPODHZjStpELe+ XD7w== 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=6V+fIBx5dNRxWcWpg3zMlaaPWlRc3Db5Wg0RWZglfIc=; b=VTyfie5uTYYmVyS6kQgVMsFr+Fy4S8pW2L6cHwYpTBUdSTYh+t4fxWH+xKyXVap2qp EE9T+O1ajkLSnnUa+clhFk8l0mlhE6guqusJXx+fUj/xzN30aRYd5djI/uOJ+JJnADhc QWBrZQm0gvCCuuHXdGjJgP05NKHJzDk3yAwSMnIA6t//YyNMav2D50eJ+fHRHFPKsirY T9U5ujpy765NRKVhEe9D1vOV3d7gKrXXq+p96JQivKrbj2U1giW7OHEZ5bLidNIauz42 /Mr7JgsTdrryVYqHQQr2nF1TLRNaC2uBmAwMVou2Xw32Dj6XSRvoSd89KZf4L2DGFseQ RAlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Uj9EP8fv; 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 d9si48379wmc.149.2020.06.02.08.32.05; Tue, 02 Jun 2020 08:32:05 -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=Uj9EP8fv; 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 5A3E468B2AB; Tue, 2 Jun 2020 18:29:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F75168B36D for ; Tue, 2 Jun 2020 18:29:01 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id 64so5191360pfg.8 for ; Tue, 02 Jun 2020 08:29:01 -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=YzfuJULoqnTA7AUQ0sWG4dqn/X14r9hIgXS9Xre02ng=; b=Uj9EP8fvnssfRllAW3zYR3pKD4fFktFVQMrdEnV6jIdUs52hbuWu27onW+sdbsGYNd mmbaf25ekHjt7zcbQFzZUh4HwwfuNWc9yKlNFr6f4oDkkcELyERr2Qu9/P7Km8FeR9n7 q2zUrL9+zcNdBy5GNLMEhAccmxMFvoAN7MQKVywB7c8/zSIviFcaFCcA78O2lFCM/LT/ HbHdw+OoOutyHLughCfHsUjFn0ce3EU1QFZXnK/U83YNm/62e+7zkjs5cO0nlRjBThY+ MDM2XaeW4bNS1lhI79FGIiLcCz3J62LNCwV+3XIdYKYIFCnofZp+k+TXbCs6P5JtCP4h 4wIw== 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=YzfuJULoqnTA7AUQ0sWG4dqn/X14r9hIgXS9Xre02ng=; b=rvoOJVfW1CRQAahyz/SnnsgnAyOLJ/fPalaM7Xzmf9Xy5dezDcpUGQDWGh83vkYF5e cvhlMRoZ9elNvmn7w9HxW8TM+5NRRuthL8FBQrygw48fppAVy1V8egvaL29L44ldj6+p TPYDfYpG+mo/mtRyAMidADcYu14tRR3uCn1prdXz+79oAIDtfCxpkVCJC1zPzwOtBfh0 a05CiR5kdvg6sRfWaruqz9Qioeip/rku6kfwO9SDlYvedO2COqADDEcbZoI1kF3L7Quy TPrTER58oTNsvSVfdJkO8mTDdYUaBpBDjr9MnteTmJCZH7Dk5dA2zehLlivwg5HZb7sB DIEw== X-Gm-Message-State: AOAM530pLnqb25ZnA48e0OWDJUOKZooKy+hmySPpWMxaNfOUyLew2Ut2 MQ25EkHBbd1Ug9kIEP7aEzxP1vhN X-Received: by 2002:aa7:8a4c:: with SMTP id n12mr11038180pfa.326.1591111739281; Tue, 02 Jun 2020 08:28:59 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.28.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:28:58 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:55 +0800 Message-Id: <1591111618-15778-21-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 21/24] avcodec/mpegvideo_enc: remove FF_ALLOCZ_ARRAY_OR_GOTO and gotos lable 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: W/kO22JPjlel Content-Length: 4341 From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/mpegvideo_enc.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5a499fb..eba041f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -924,27 +924,25 @@ FF_ENABLE_DEPRECATION_WARNINGS ff_qpeldsp_init(&s->qdsp); if (s->msmpeg4_version) { - FF_ALLOCZ_OR_GOTO(s->avctx, s->ac_stats, - 2 * 2 * (MAX_LEVEL + 1) * - (MAX_RUN + 1) * 2 * sizeof(int), fail); + int ac_stats_size = 2 * 2 * (MAX_LEVEL + 1) * (MAX_RUN + 1) * 2 * sizeof(int); + if (!(s->ac_stats = av_mallocz(ac_stats_size))) + return AVERROR(ENOMEM); } - FF_ALLOCZ_OR_GOTO(s->avctx, s->avctx->stats_out, 256, fail); - - FF_ALLOCZ_OR_GOTO(s->avctx, s->q_intra_matrix, 64 * 32 * sizeof(int), fail); - FF_ALLOCZ_OR_GOTO(s->avctx, s->q_chroma_intra_matrix, 64 * 32 * sizeof(int), fail); - FF_ALLOCZ_OR_GOTO(s->avctx, s->q_inter_matrix, 64 * 32 * sizeof(int), fail); - FF_ALLOCZ_OR_GOTO(s->avctx, s->q_intra_matrix16, 64 * 32 * 2 * sizeof(uint16_t), fail); - FF_ALLOCZ_OR_GOTO(s->avctx, s->q_chroma_intra_matrix16, 64 * 32 * 2 * sizeof(uint16_t), fail); - FF_ALLOCZ_OR_GOTO(s->avctx, s->q_inter_matrix16, 64 * 32 * 2 * sizeof(uint16_t), fail); - FF_ALLOCZ_OR_GOTO(s->avctx, s->input_picture, - MAX_PICTURE_COUNT * sizeof(Picture *), fail); - FF_ALLOCZ_OR_GOTO(s->avctx, s->reordered_input_picture, - MAX_PICTURE_COUNT * sizeof(Picture *), fail); + if (!(s->avctx->stats_out = av_mallocz(256)) || + !FF_ALLOCZ_TYPED_ARRAY(s->q_intra_matrix, 64 * 32) || + !FF_ALLOCZ_TYPED_ARRAY(s->q_chroma_intra_matrix, 64 * 32) || + !FF_ALLOCZ_TYPED_ARRAY(s->q_inter_matrix, 64 * 32) || + !FF_ALLOCZ_TYPED_ARRAY(s->q_intra_matrix16, 64 * 32 * 2) || + !FF_ALLOCZ_TYPED_ARRAY(s->q_chroma_intra_matrix16, 64 * 32 * 2) || + !FF_ALLOCZ_TYPED_ARRAY(s->q_inter_matrix16, 64 * 32 * 2) || + !FF_ALLOCZ_TYPED_ARRAY(s->input_picture, MAX_PICTURE_COUNT) || + !FF_ALLOCZ_TYPED_ARRAY(s->reordered_input_picture, MAX_PICTURE_COUNT)) + return AVERROR(ENOMEM); if (s->noise_reduction) { - FF_ALLOCZ_OR_GOTO(s->avctx, s->dct_offset, - 2 * 64 * sizeof(uint16_t), fail); + if (!FF_ALLOCZ_TYPED_ARRAY(s->dct_offset, 2 * 64)) + return AVERROR(ENOMEM); } ff_dct_encode_init(s); @@ -1059,8 +1057,6 @@ FF_ENABLE_DEPRECATION_WARNINGS cpb_props->buffer_size = avctx->rc_buffer_size; return 0; -fail: - return AVERROR_UNKNOWN; } av_cold int ff_mpv_encode_end(AVCodecContext *avctx)