From patchwork Mon May 11 15:52:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19628 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 E461544B641 for ; Mon, 11 May 2020 18:52:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD7EB687ED6; Mon, 11 May 2020 18:52:37 +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 29BFF680C96 for ; Mon, 11 May 2020 18:52:31 +0300 (EEST) Received: by mail-pj1-f67.google.com with SMTP id y6so8096151pjc.4 for ; Mon, 11 May 2020 08:52:31 -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; bh=1AvKpR02nbAmjkjXu2jnaVrF71xs76bnyC6J2k83meE=; b=aS/cY1huR2Hqkp/ZA9aDjLRB+rokLox7cRZnsJQ8EoRUD5/CP6gWYLPtkmxyNS1NeC uuYEszPveaVxiUUM3CnHVVk47J7P9xmDPO770OyJi8SdUoAUvaQxrujud7M7OSZECGMY ulczGb4ARhcLOvPXNoRwUiFUj1ktmn4qbMwGNBh98tOJ/fdai3//z4/QHaOsxcFqwWre oo6U/Fnzlq41ZWSHRzW8Fh63exRoYHoJZGAdSoT+UF9DIJNMv0uqFnqbN1sdX/ilS8A9 38MTaJaV0bgphaH5F2DPaH6Bm8qffKGZ+l4bK0Q22EAQOfiqZBgIRgJXs8y91CpLgDUr xavA== 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; bh=1AvKpR02nbAmjkjXu2jnaVrF71xs76bnyC6J2k83meE=; b=tidvmI1/LcTOAclhCuLph4+4amjsUrxUEOncHsr3qImSSTygQtPrHrpG18wDE4KaIS dJzna6RZ2Y3ouiY+3OEui+eLEk3K3/8KNam3IllSCVvXQrwYazHzaYaxYp5qfMV/fgWu H8KQE2Rv2gJ+j7bJSS+ooZBYJ1GY0i3RZt6DHn9XaRo8JD5xy93lq4ERG/iIhxHy8OFX j/x2uj6jkk36n5yGn/H/F0P70XsfgVe49egfafsbVqWyZVRrZlJMVUJb3sSqVR+MxMfu oRHtVI8YdeOrJsFAfQbJV7eKLhcDPZBUWdGDImpipwIXUB44e6lTikBkwqbIaJmVyEny tC0Q== X-Gm-Message-State: AGi0PuZWeUiz8Ym2X/6+5bWIm52iajEwcfYXdtTTKpVINNdXekxPOfb1 q7VuKpOM+yk4KraV7dCh27Xjjj/m X-Google-Smtp-Source: APiQypKfnBXqFC6+lU8o7iPQshs+y4wOeGPHZNucnyvZ/SIS5JCZa+hrIyFYtVLDdM98zEikb+Y9TA== X-Received: by 2002:a17:902:bc86:: with SMTP id bb6mr15474323plb.243.1589212349163; Mon, 11 May 2020 08:52:29 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i12sm744886pgi.21.2020.05.11.08.52.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2020 08:52:28 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 May 2020 23:52:20 +0800 Message-Id: <1589212343-8334-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH v2 1/4] avutil/internal: add FF_ALLOC_TYPED_ARRAY_OR_GOTO & FF_ALLOCZ_TYPED_ARRAY_OR_GOTO 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 These are similar to the existing FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTO, but the elsize is calcuated by sizeof(*p) Signed-off-by: Limin Wang --- libavutil/internal.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavutil/internal.h b/libavutil/internal.h index 4acbcf5..1be9001 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -173,6 +173,24 @@ }\ } +#define FF_ALLOC_TYPED_ARRAY_OR_GOTO(ctx, p, nelem, label)\ +{\ + p = av_malloc_array(nelem, sizeof(*p));\ + if (!p) {\ + av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ + goto label;\ + }\ +} + +#define FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(ctx, p, nelem, label)\ +{\ + p = av_mallocz_array(nelem, sizeof(*p));\ + if (!p) {\ + av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.\n");\ + goto label;\ + }\ +} + #include "libm.h" /** From patchwork Mon May 11 15:52:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19629 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 1572D44B641 for ; Mon, 11 May 2020 18:52:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8AFC687F36; Mon, 11 May 2020 18:52:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3C8F687F44 for ; Mon, 11 May 2020 18:52:32 +0300 (EEST) Received: by mail-pj1-f65.google.com with SMTP id t40so7985675pjb.3 for ; Mon, 11 May 2020 08:52:32 -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=nFwEdKTaCVIcm4NGKA7nAZVypTb4Y+O9T/x7bmLsU0M=; b=ZoLQXPWzezBimXV8l+37RVXr6Xni/0d8/Jg6KhmI7MwerX7njGLO6Sdcm8XXJU3eul GkKYQRbwtS5yysMyepvTF6zlsFt0oKD7SsTcKY0LFY92Q3nhd0JPDqkvLaVGOpnN2g2q q5e/kqkG7gzISvRcX8Q7kg0b2fftAzQBvaXKzGzYo8qB8d0irHiRr9AmK+x6B6h7ZQmk wYVZI1vJ5MW4L+9zF0v/PGZeofefADSCp5BBoXnp3Y8FW5nDUwPpV27Fr4T01CC5ixnP T5JwmiZT4asg14l7y4MMsbFGUQUyfNuYQZyaO4Whel3jGvvDlo1w8e43pvTGAjLbNtqq Qv6w== 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=nFwEdKTaCVIcm4NGKA7nAZVypTb4Y+O9T/x7bmLsU0M=; b=npQr4LACOSMAqwh/Rg+IGXI0ip200hYIk9kl6+JMDa9QKhgHDtmJ9TT0YSTJKievyn bl6pM79l6hqj38vWj3s1LmHJesMNZ6ZrukvnwFSzQ8S8b8UwXYYa1Xfn2G/SND0admrV i9PZaX68l0lZPJbNjZkdLIGcIp1mAqjpQRBsNTDNCA8MfsAyH2uQwEHi7JgN8m1W9GCt 4BVPmddXH21ZWGyd0L13jqYz5uurILUqYYCYLL0oiHRfKzyzN1NmxDGpEhd0Jns6uO/Y c2ZePUXJu5tjP5kYRBT0IyuaZ47le/tIYF/F/z3tnLv/F5cbpfIAMBNd52N/2BRBJ/39 Sfyw== X-Gm-Message-State: AGi0PuZVv2rMw7LmhQJGFi2exYqwTHaLUqFjrMxfdt4X+kAEOt7PRM++ Ty4z/uEsl6vTAylaOpEgVDPLfQjO X-Google-Smtp-Source: APiQypKuXL8XNNqKOqChDOauXUaopCM2mDlOEf31+eoI26z2R8+D0uBwwVWY3KGhKVaFeL2mUiM/Cw== X-Received: by 2002:a17:90a:8509:: with SMTP id l9mr22948523pjn.113.1589212351197; Mon, 11 May 2020 08:52:31 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i12sm744886pgi.21.2020.05.11.08.52.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2020 08:52:30 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 May 2020 23:52:21 +0800 Message-Id: <1589212343-8334-2-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 2/4] avcodec/mpegvideo: use FF_ALLOC{Z}_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.c | 60 ++++++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 49fd1c9..6f52e75 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -372,16 +372,13 @@ static int init_duplicate_context(MpegEncContext *s) s->sc.obmc_scratchpad = NULL; if (s->encoding) { - FF_ALLOCZ_OR_GOTO(s->avctx, s->me.map, - ME_MAP_SIZE * sizeof(uint32_t), fail) - FF_ALLOCZ_OR_GOTO(s->avctx, s->me.score_map, - ME_MAP_SIZE * sizeof(uint32_t), fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->me.map, ME_MAP_SIZE, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->me.score_map, ME_MAP_SIZE, fail) if (s->noise_reduction) { - FF_ALLOCZ_OR_GOTO(s->avctx, s->dct_error_sum, - 2 * 64 * sizeof(int), fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->dct_error_sum, 2 * 64, fail) } } - FF_ALLOCZ_OR_GOTO(s->avctx, s->blocks, 64 * 12 * 2 * sizeof(int16_t), fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->blocks, 64 * 12 * 2, fail) s->block = s->blocks[0]; for (i = 0; i < 12; i++) { @@ -399,8 +396,7 @@ static int init_duplicate_context(MpegEncContext *s) if (s->out_format == FMT_H263) { /* ac values */ - FF_ALLOCZ_OR_GOTO(s->avctx, s->ac_val_base, - yc_size * sizeof(int16_t) * 16, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->ac_val_base, yc_size * 16, fail); s->ac_val[0] = s->ac_val_base + s->b8_stride + 1; s->ac_val[1] = s->ac_val_base + y_size + s->mb_stride + 1; s->ac_val[2] = s->ac_val[1] + c_size; @@ -715,7 +711,7 @@ static int init_context_frame(MpegEncContext *s) if (s->mb_height & 1) yc_size += 2*s->b8_stride + 2*s->mb_stride; - FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_index2xy, (s->mb_num + 1) * sizeof(int), + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->mb_index2xy, s->mb_num + 1, fail); // error resilience code looks cleaner with this for (y = 0; y < s->mb_height; y++) for (x = 0; x < s->mb_width; x++) @@ -725,12 +721,12 @@ static int init_context_frame(MpegEncContext *s) if (s->encoding) { /* Allocate MV tables */ - FF_ALLOCZ_OR_GOTO(s->avctx, s->p_mv_table_base, mv_table_size * 2 * sizeof(int16_t), fail) - FF_ALLOCZ_OR_GOTO(s->avctx, s->b_forw_mv_table_base, mv_table_size * 2 * sizeof(int16_t), fail) - FF_ALLOCZ_OR_GOTO(s->avctx, s->b_back_mv_table_base, mv_table_size * 2 * sizeof(int16_t), fail) - FF_ALLOCZ_OR_GOTO(s->avctx, s->b_bidir_forw_mv_table_base, mv_table_size * 2 * sizeof(int16_t), fail) - FF_ALLOCZ_OR_GOTO(s->avctx, s->b_bidir_back_mv_table_base, mv_table_size * 2 * sizeof(int16_t), fail) - FF_ALLOCZ_OR_GOTO(s->avctx, s->b_direct_mv_table_base, mv_table_size * 2 * sizeof(int16_t), fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->p_mv_table_base, mv_table_size, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->b_forw_mv_table_base, mv_table_size, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->b_back_mv_table_base, mv_table_size, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->b_bidir_forw_mv_table_base, mv_table_size, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->b_bidir_back_mv_table_base, mv_table_size, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->b_direct_mv_table_base, mv_table_size, fail) s->p_mv_table = s->p_mv_table_base + s->mb_stride + 1; s->b_forw_mv_table = s->b_forw_mv_table_base + s->mb_stride + 1; s->b_back_mv_table = s->b_back_mv_table_base + s->mb_stride + 1; @@ -739,14 +735,12 @@ static int init_context_frame(MpegEncContext *s) s->b_direct_mv_table = s->b_direct_mv_table_base + s->mb_stride + 1; /* Allocate MB type table */ - FF_ALLOCZ_OR_GOTO(s->avctx, s->mb_type, mb_array_size * sizeof(uint16_t), fail) // needed for encoding + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->mb_type, mb_array_size, fail) // needed for encoding - FF_ALLOCZ_OR_GOTO(s->avctx, s->lambda_table, mb_array_size * sizeof(int), fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->lambda_table, mb_array_size, fail) - FF_ALLOC_OR_GOTO(s->avctx, s->cplx_tab, - mb_array_size * sizeof(float), fail); - FF_ALLOC_OR_GOTO(s->avctx, s->bits_tab, - mb_array_size * sizeof(float), fail); + FF_ALLOC_TYPED_ARRAY_OR_GOTO(s->avctx, s->cplx_tab, mb_array_size, fail); + FF_ALLOC_TYPED_ARRAY_OR_GOTO(s->avctx, s->bits_tab, mb_array_size, fail); } @@ -757,34 +751,33 @@ static int init_context_frame(MpegEncContext *s) int j, k; for (j = 0; j < 2; j++) { for (k = 0; k < 2; k++) { - FF_ALLOCZ_OR_GOTO(s->avctx, + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->b_field_mv_table_base[i][j][k], - mv_table_size * 2 * sizeof(int16_t), - fail); + mv_table_size * 2, fail); s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] + s->mb_stride + 1; } - FF_ALLOCZ_OR_GOTO(s->avctx, s->b_field_select_table [i][j], mb_array_size * 2 * sizeof(uint8_t), fail) - FF_ALLOCZ_OR_GOTO(s->avctx, s->p_field_mv_table_base[i][j], mv_table_size * 2 * sizeof(int16_t), fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->b_field_select_table [i][j], mb_array_size * 2, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->p_field_mv_table_base[i][j], mv_table_size * 2, fail) s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1; } - FF_ALLOCZ_OR_GOTO(s->avctx, s->p_field_select_table[i], mb_array_size * 2 * sizeof(uint8_t), fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->p_field_select_table[i], mb_array_size * 2, fail) } } if (s->out_format == FMT_H263) { /* cbp values */ - FF_ALLOCZ_OR_GOTO(s->avctx, s->coded_block_base, y_size + (s->mb_height&1)*2*s->b8_stride, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->coded_block_base, y_size + (s->mb_height&1)*2*s->b8_stride, fail); s->coded_block = s->coded_block_base + s->b8_stride + 1; /* cbp, ac_pred, pred_dir */ - FF_ALLOCZ_OR_GOTO(s->avctx, s->cbp_table , mb_array_size * sizeof(uint8_t), fail); - FF_ALLOCZ_OR_GOTO(s->avctx, s->pred_dir_table, mb_array_size * sizeof(uint8_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->cbp_table , mb_array_size, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->pred_dir_table, mb_array_size, fail); } if (s->h263_pred || s->h263_plus || !s->encoding) { /* dc values */ // MN: we need these for error resilience of intra-frames - FF_ALLOCZ_OR_GOTO(s->avctx, s->dc_val_base, yc_size * sizeof(int16_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->dc_val_base, yc_size, fail); s->dc_val[0] = s->dc_val_base + s->b8_stride + 1; s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1; s->dc_val[2] = s->dc_val[1] + c_size; @@ -934,8 +927,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if (ret) return ret; - FF_ALLOCZ_OR_GOTO(s->avctx, s->picture, - MAX_PICTURE_COUNT * sizeof(Picture), fail_nomem); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(s->avctx, s->picture, MAX_PICTURE_COUNT, fail_nomem); for (i = 0; i < MAX_PICTURE_COUNT; i++) { s->picture[i].f = av_frame_alloc(); if (!s->picture[i].f) 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); From patchwork Mon May 11 15:52:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19631 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 52D0B44A31A for ; Mon, 11 May 2020 18:52:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E45C687FAE; Mon, 11 May 2020 18:52:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6815368813D for ; Mon, 11 May 2020 18:52:36 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id 18so4927250pfx.6 for ; Mon, 11 May 2020 08:52:36 -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=BlXBGdi/jinE5ADsoGhsIvHyUrhD/CWYMjzVzI/Z7TQ=; b=BdWJNQ+e5Gf8AiyFpWg/ryJCZpr/qcmcvAu58KRG0MoIalUiLtkst2FsST5IChm4gf dQLT2PwiUT2AdFyWiJDYK6Z0vYf7/kKvgKsGgwoCEq+HeI1GE/5a0bnTqMRY5mq301c3 QkLApCcBq6RBDXvL9++kiuhV055evj2u6oGOj/ZlpXxAz3o8Yhapnvnb/0C5JIlvs9XF Lrc9T7N45y54K0t+/MBDN1f5uMYvRsC5b/6J+oeYHybV3Gop8TWs8n0oUXoMDNH2O4Fs 4JAl5SuHRIr67L0sewLgQIcSBBDQctZQeRiRYaC1uxRtOhuqJSuxm66TAqfDbBd/Ke1D 9vFQ== 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=BlXBGdi/jinE5ADsoGhsIvHyUrhD/CWYMjzVzI/Z7TQ=; b=Oqhe7bwYCHGlo4ULa+aPVHvl01bw8B1+rHkd8lwI/v9LlqZ6Q+IpJN7P8SyTew0fVE dzjOf5gF1TdS1UTJ77NVCNDBEhiAiubjLgDsWSEhLGPp0npH2ppe/j3JI4lRuPnu6CKs JxmmYwXC4XPvVJ3RhUF/cG6pJ7EY0eK/B+ymy7NxT7mf1P7/gr8OwmaNVZD6kS/jPYur MskeCGnjChq1Cyb7RU+BUgsFKsk7SUJwJrBjlDKGS1IvnRw3r9NCnD0B1ZNgaGQmqDj7 kvyyIGM67LXal2SPiD037RS4duPURFMKXIz3go+3XRFOthZ50B8ROvTgfgKPK4nSiUbm hS4Q== X-Gm-Message-State: AOAM530aOJFyO0PuVpnb6B4xwGPaeofPcySupm4MjlacAYJivuawwmas wvYUG6M/E0OL5GbBK91JLB/zKdj2 X-Google-Smtp-Source: ABdhPJzQrWOjULNl+gCPSB/8HNt618SZ8RzQcw1hq5VvItmF8nNbC1W2OiUY+1Uq7DTh/sGNddoj/g== X-Received: by 2002:aa7:8c0a:: with SMTP id c10mr6126531pfd.177.1589212354377; Mon, 11 May 2020 08:52:34 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i12sm744886pgi.21.2020.05.11.08.52.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2020 08:52:33 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 May 2020 23:52:23 +0800 Message-Id: <1589212343-8334-4-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 4/4] avcodec/h264dec: 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/h264dec.c | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 4c355fe..4e223c1 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -186,34 +186,32 @@ int ff_h264_alloc_tables(H264Context *h) row_mb_num, 8 * sizeof(uint8_t), fail) h->slice_ctx[0].intra4x4_pred_mode = h->intra4x4_pred_mode; - FF_ALLOCZ_OR_GOTO(h->avctx, h->non_zero_count, - big_mb_num * 48 * sizeof(uint8_t), fail) - FF_ALLOCZ_OR_GOTO(h->avctx, h->slice_table_base, - (big_mb_num + h->mb_stride) * sizeof(*h->slice_table_base), fail) - FF_ALLOCZ_OR_GOTO(h->avctx, h->cbp_table, - big_mb_num * sizeof(uint16_t), fail) - FF_ALLOCZ_OR_GOTO(h->avctx, h->chroma_pred_mode_table, - big_mb_num * sizeof(uint8_t), fail) - FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->mvd_table[0], - row_mb_num, 16 * sizeof(uint8_t), fail); - FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->mvd_table[1], - row_mb_num, 16 * sizeof(uint8_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->non_zero_count, + big_mb_num * 48, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->slice_table_base, + big_mb_num + h->mb_stride, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->cbp_table, + big_mb_num, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->chroma_pred_mode_table, + big_mb_num, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->mvd_table[0], + row_mb_num * 16, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->mvd_table[1], + row_mb_num * 16, fail); h->slice_ctx[0].mvd_table[0] = h->mvd_table[0]; h->slice_ctx[0].mvd_table[1] = h->mvd_table[1]; - FF_ALLOCZ_OR_GOTO(h->avctx, h->direct_table, - 4 * big_mb_num * sizeof(uint8_t), fail); - FF_ALLOCZ_OR_GOTO(h->avctx, h->list_counts, - big_mb_num * sizeof(uint8_t), fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->direct_table, + 4 * big_mb_num, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->list_counts, + big_mb_num, fail) memset(h->slice_table_base, -1, (big_mb_num + h->mb_stride) * sizeof(*h->slice_table_base)); h->slice_table = h->slice_table_base + h->mb_stride * 2 + 1; - FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2b_xy, - big_mb_num * sizeof(uint32_t), fail); - FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2br_xy, - big_mb_num * sizeof(uint32_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->mb2b_xy, big_mb_num, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->mb2br_xy, big_mb_num, fail); for (y = 0; y < h->mb_height; y++) for (x = 0; x < h->mb_width; x++) { const int mb_xy = x + y * h->mb_stride; @@ -268,8 +266,7 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl) er->b8_stride = h->mb_width * 2 + 1; // error resilience code looks cleaner with this - FF_ALLOCZ_OR_GOTO(h->avctx, er->mb_index2xy, - (h->mb_num + 1) * sizeof(int), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, er->mb_index2xy, h->mb_num + 1, fail); for (y = 0; y < h->mb_height; y++) for (x = 0; x < h->mb_width; x++) @@ -278,14 +275,13 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl) er->mb_index2xy[h->mb_height * h->mb_width] = (h->mb_height - 1) * h->mb_stride + h->mb_width; - FF_ALLOCZ_OR_GOTO(h->avctx, er->error_status_table, - mb_array_size * sizeof(uint8_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, er->error_status_table, + mb_array_size, fail); FF_ALLOC_OR_GOTO(h->avctx, er->er_temp_buffer, h->mb_height * h->mb_stride * (4*sizeof(int) + 1), fail); - FF_ALLOCZ_OR_GOTO(h->avctx, sl->dc_val_base, - yc_size * sizeof(int16_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, sl->dc_val_base, yc_size, fail); er->dc_val[0] = sl->dc_val_base + h->mb_width * 2 + 2; er->dc_val[1] = sl->dc_val_base + y_size + h->mb_stride + 1; er->dc_val[2] = er->dc_val[1] + c_size;