From patchwork Mon May 11 15:52:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19630 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 172BA442952 for ; Mon, 11 May 2020 18:52:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F133D687F6A; Mon, 11 May 2020 18:52:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C392687FA0 for ; Mon, 11 May 2020 18:52:34 +0300 (EEST) Received: by mail-pj1-f67.google.com with SMTP id 7so7529756pjo.0 for ; Mon, 11 May 2020 08:52:34 -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=5DbeXtue0AG2XLhYcgshdGAoXZjbDw3Bxiv8UFbBcB8=; b=aOy2JDbRzU8qziZLMZP3EDwTsQ4v+c3l5pmch7EyoVOtfkv/h1wcXkB8OtFFpibFdl 1/pxXpmJW/2c5xNKw6X51vZO3FH/1HIDLpBjJL2OWK6jUcX+b7etwq+fIiR1O0xvT6hI cF9qecZJJ8YMyz3Y9KG0LbVBAsfVaKPc+MQ/qvIlNS29Ap3i2rsxolm2SblCsfzu6A8R PS48MvggSKB/OGtquAqzOaaWDtFTvowdaXtM+gedZqXtMJTtDHtP8a9+SK5IQ7hMFLXC yFuGh6Wjr9Pua9K+yXh8NtZ19feJXsGpqfo7ZFLGeqUFfb6rKNaSfoIzw9raZN4QrVGo 1smw== 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=5DbeXtue0AG2XLhYcgshdGAoXZjbDw3Bxiv8UFbBcB8=; b=HBifI3IZYrfxRX7sR7jLxoJ7H3Ni/dUvB//oTi03IPc/+unRLx9kvOg+emm3ORFZ+O i1LnaGLZOLmu9g0ys8GQcJRAoLCux5U51dZz6ngBXGy8QLfiipJxEwq726deI09vtoDq QKBx2y5buows27z6pKin2856CDfNdfDEETFO0UtuB2du92xHFlk571+Diwqudl4FqFyO QyLnVLKcIKRFFe7XcGvszYJw8HPO/6kOGdr0bgREJZMv/gPuQ97VovrX8rV+mXwD/9nV mFkiYKzzfzZ7fxmlMPLMTaoLeAweMYEqdx8cHCNWrI19TKudiZfwgC9UhxkD4S7Jaida R5dQ== X-Gm-Message-State: AGi0PuaQQLIJ7Xw2zWyVB1WclNgoqaUiNoUVqJrmzWEk/FkvGy4Bn07W apSvmJqFaNpV1MjGW0irLOrjmxnq X-Google-Smtp-Source: APiQypJXWGvxBXoAW8lerY9WHgpVelXouLuRdRoDIm8BeqDaaPYVZ26/7pvjhKyTIZz9Q8F3ciL8lg== X-Received: by 2002:a17:902:9002:: with SMTP id a2mr15825729plp.220.1589212352771; Mon, 11 May 2020 08:52:32 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i12sm744886pgi.21.2020.05.11.08.52.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2020 08:52:32 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 May 2020 23:52:22 +0800 Message-Id: <1589212343-8334-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589212343-8334-1-git-send-email-lance.lmwang@gmail.com> References: <1589212343-8334-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/4] avcodec/mpegvideo_enc: use FF_ALLOCZ_TYPED_ARRAY_OR_GOTO instead 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/mpegvideo_enc.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 50ae57e..81542b8 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -928,23 +928,20 @@ FF_ENABLE_DEPRECATION_WARNINGS 2 * 2 * (MAX_LEVEL + 1) * (MAX_RUN + 1) * 2 * sizeof(int), fail); } - FF_ALLOCZ_OR_GOTO(s->avctx, s->avctx->stats_out, 256, fail); + FF_ALLOCZ_TYPED_ARRAY_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); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->q_intra_matrix, 64 * 32, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->q_chroma_intra_matrix, 64 * 32, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->q_inter_matrix, 64 * 32, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->q_intra_matrix16, 64 * 32 * 2, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->q_chroma_intra_matrix16, 64 * 32 * 2, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->q_inter_matrix16, 64 * 32 * 2, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->input_picture, MAX_PICTURE_COUNT, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->reordered_input_picture, MAX_PICTURE_COUNT, fail); if (s->noise_reduction) { - FF_ALLOCZ_OR_GOTO(s->avctx, s->dct_offset, - 2 * 64 * sizeof(uint16_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->dct_offset, 2 * 64, fail); } ff_dct_encode_init(s);